Commit Graph

  • 97b9b98c1e Merge branch 'persona_resquash' Christopher Allan Webber 2013-08-15 17:07:14 -05:00
  • cd612ee689 Removing the whitespace betwetween action= and its value Christopher Allan Webber 2013-08-15 15:17:02 -05:00
  • 4834ef8ec2 Merge remote-tracking branch 'refs/remotes/tsyesika/master' Christopher Allan Webber 2013-08-15 10:34:20 -05:00
  • 29cd702e47 Fix notifications, which I broke. Christopher Allan Webber 2013-08-14 15:57:58 -05:00
  • 7949d88a75 Avoiding the celery warnings that we seem to be confusing people lately. Christopher Allan Webber 2013-08-14 15:08:49 -05:00
  • 8394febbe1 This has been an update to clean out the code a little bit. The primary change I made was I added the method has_privilege (which takes a variable amount of unicode privilege names as an argument) to the User model. This method allowed for much cleaner checks as to whether or not a user has a privilege. Other- wise, I also made it impossible for moderators to punish admins. I created a new url path and three new pages for Users to look at filed reports and the code of conduct for the mg instance. tilly-Q 2013-08-13 18:38:00 -04:00
  • 89909bd692 Fix import errors when running tests Jessica Tallon 2013-08-13 10:45:09 +01:00
  • e018b2120a Change path for tinymce. Aditi 2013-08-10 16:18:30 +05:30
  • db600404a4 Change button names to Save and Blog. Aditi 2013-08-10 16:17:09 +05:30
  • e5c7e10f02 Create symbolic link for tinymce. Aditi 2013-08-10 16:14:04 +05:30
  • fca6624203 Remove extlib/tinymce submodule. Aditi 2013-08-10 07:50:21 +05:30
  • 135dd5296b change dropdown button to <a> from <div> so that it is tabbable Rodney Ewing 2013-08-09 11:38:55 -07:00
  • 18fd3a272b Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin Aditi 2013-08-09 16:38:55 +05:30
  • 97ce2563ed Add delete error for failed type. Aditi 2013-08-09 15:05:20 +05:30
  • dee425d26c Replace edit blogpost url from default media_edit url to blogpost edit url. Aditi 2013-08-09 14:45:06 +05:30
  • a590e0ba17 Write function get_blog_by_blogpost Aditi 2013-08-09 14:43:05 +05:30
  • 382d2b4bd8 Delete initial blog folder from plugin directory. Aditi 2013-08-09 11:07:09 +05:30
  • d7ecae5a4e Revert "slugs are now generated during processing" Rodney Ewing 2013-08-08 15:49:51 -07:00
  • b26edfb944 Revert "Leave slug empty until we are sure media processing was successful." Rodney Ewing 2013-08-08 15:49:33 -07:00
  • 4de7db6fef Switching the MediaGoblin homepage image over to using the "official" gavroche style Christopher Allan Webber 2013-08-08 14:15:23 -05:00
  • 8fc57eaaa6 Add ?next= when trying to add a comment when not logged in Rodney Ewing 2013-08-08 11:07:12 -07:00
  • d0ba136f55 Make media_confirm_delete to work for failed media entries too. Aditi 2013-08-08 20:47:43 +05:30
  • 202d951c3d Render 404 if not ajax request Rodney Ewing 2013-08-07 17:13:38 -07:00
  • b2d6c45850 change interval to 1000ms Rodney Ewing 2013-08-07 16:58:06 -07:00
  • 3bd62dc4ca Changed how the comment was encoded/read. Fixed CSRF + Post with comment preview. Merged with latest master Emily O'Leary 2013-08-06 18:22:51 -04:00
  • 3cf4ae0c41 Changed the target of the markdown links for opening in a new tab as suggested by joar. Emily O'Leary 2013-03-25 14:13:09 -04:00
  • bb3299ce21 Added i18n to my javascript changes as per trac #417 Emily O'Leary 2013-03-24 22:16:12 -04:00
  • 5ab6029961 Added comment preview functionality to user pages. It works by passing the comment's value as a JSON string to a new handler that lives at /ajax/comment/preview. The query string is decoded, unquoted, and has its leading and trailing quotes removed to match the input that cleaned_markdown_conversion expects. Emily O'Leary 2013-03-24 21:42:42 -04:00
  • 9da4e8049f slugs are now generated during processing Rodney Ewing 2013-08-07 16:19:57 -07:00
  • f67611fb48 Leave slug empty until we are sure media processing was successful. Rodney Ewing 2013-08-07 16:15:27 -07:00
  • 155d234d95 * create config option for optional jinja2 extensions * add comments & clarify code for jinja2 extensions Kenneth Dombrowski 2013-05-11 17:30:43 -04:00
  • 2ed6afb048 Use the workbench for video processing. Patch submitted by Kushal Rodney Ewing 2013-08-07 15:31:40 -07:00
  • 316ede4705 autoplay is now by default False for videos. Christopher Allan Webber 2013-08-07 15:03:37 -05:00
  • 24e6c34e88 Merge branch 'merge-pyconfigure' Christopher Allan Webber 2013-08-07 11:57:12 -05:00
  • 64a6e7fc49 Move templates to blog plugin from all mediagoblin/templates. Aditi 2013-08-07 20:47:42 +05:30
  • 549bc3449e Eliminate url mapping using mediagoblin/routing.py and have plugin type url mapping. Aditi 2013-08-07 20:35:11 +05:30
  • 45384c6dce Add url mapping to it, to have a complete media_type plugin. Aditi 2013-08-07 20:31:34 +05:30
  • 2e9f60d264 show all blogposts. Aditi 2013-08-07 19:44:36 +05:30
  • d6a456b5b4 Specify the status of blog post. Aditi 2013-08-07 18:00:55 +05:30
  • 7ffe783d0e URL mapping blog post draft view. Aditi 2013-08-07 17:58:57 +05:30
  • 8c040f7780 write a function to extract blog post state from create/edit form. Aditi 2013-08-07 17:58:01 +05:30
  • 4cf5b010a5 Code for blog post view when it is in draft state. Aditi 2013-08-07 17:56:39 +05:30
  • 3922463dd1 Write template for draft view of a blog post. Aditi 2013-08-07 17:55:29 +05:30
  • bd71103e92 Change message when user tries to create multiple blogs. Aditi 2013-08-07 14:13:42 +05:30
  • 842b1bf6cb Display date of creation of the blog post. Aditi 2013-08-07 14:10:36 +05:30
  • 13af16070a button to start with blogging. Aditi 2013-08-06 20:20:23 +05:30
  • e70fcc0040 remove underline from the urls. Aditi 2013-08-06 03:48:00 +05:30
  • b4188c485a Configure tinymce with various plugins. Aditi 2013-08-06 03:42:14 +05:30
  • 4af4aec1bf Change font color. Aditi 2013-08-05 19:20:47 +05:30
  • 09d39fc17a Add new css elememts for blog post listing template. Aditi 2013-08-05 17:40:12 +05:30
  • 21ac4966d8 clean description of blog and blogposts. Aditi 2013-08-05 17:37:04 +05:30
  • 241950e983 safe pipelline for blog description. Aditi 2013-08-05 17:33:16 +05:30
  • 2a5f269032 Add url for delete blogpost button. Aditi 2013-08-05 17:31:08 +05:30
  • 46d9e44ace New elements added for the styling of blog post listing view. Aditi 2013-08-05 17:29:12 +05:30
  • 43d143cd66 Add safe pipe for proper rendering of cleaned html. Aditi 2013-08-05 17:26:55 +05:30
  • 359cd2a29b media template for blog to get blogpost.html template from it. Aditi 2013-08-05 17:05:43 +05:30
  • a857954148 Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin Aditi 2013-08-04 22:01:21 +05:30
  • ec85d24dfe Write temporary template for blog_post_listing view. Aditi 2013-08-04 21:53:48 +05:30
  • 63dee1b337 Add icon for the blogpost. Aditi 2013-08-04 21:37:13 +05:30
  • f4e7f652d9 Add tinymce code. Aditi 2013-08-04 20:41:38 +05:30
  • 31de493e41 typo fix in foundations branch Rodney Ewing 2013-08-02 07:31:09 -07:00
  • bf5a8e5452 Merge remote-tracking branch 'tilly-q/ticket-679' Rodney Ewing 2013-08-02 07:28:35 -07:00
  • 84c1cd7c52 I added a few more unitests in this commit. It now confirms that even after mi- -gration, there is only one of each Foundation object. tilly-Q 2013-07-31 20:50:38 -04:00
  • 07e61ef13a Merge branch 'ticket-679' of gitorious.org:~npigeon/mediagoblin/npigeons-mediagoblin tilly-Q 2013-07-31 20:49:07 -04:00
  • 860fa806ee In this commit I added a few unittests to account for Foundations. There were only a few tests I had to add to mediagoblin/tests/test_sql_migrations.py beca- -use the foundation creation only happens at database initialization. tilly-Q 2013-07-30 19:42:26 -04:00
  • 9d6e453f8f This commit was the work I did fixing errors that cropped up from the merge. There were a few errors because of the switch from sqlalchemy 0.7 to 0.8 but I cleared them up. tilly-Q 2013-07-30 17:09:01 -04:00
  • 2119ee3b90 Merge commit 'refs/merge-requests/55' of git://gitorious.org/mediagoblin/mediagoblin into 55 Rodney Ewing 2013-07-31 15:27:22 -07:00
  • 9b60486894 minor styling updates to docs Rodney Ewing 2013-07-31 15:16:52 -07:00
  • bc23c8b9b6 Merge commit 'refs/merge-requests/59' of git://gitorious.org/mediagoblin/mediagoblin into merge-requests/59 Rodney Ewing 2013-07-31 15:07:44 -07:00
  • af2f28033b Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin Aditi 2013-07-31 19:15:20 +05:30
  • ef010b6453 Update version on tinymce. Aditi 2013-07-31 16:14:26 +05:30
  • 5955e619c0 Change field name to description. Aditi 2013-07-31 14:38:00 +05:30
  • ed46df89aa Add elements for blog system. Aditi 2013-07-31 14:37:00 +05:30
  • 3e32941299 Add Draft feature and add view blog_post_listing. Aditi 2013-07-31 14:33:56 +05:30
  • f506419c89 Add Url for blog post listing. Aditi 2013-07-31 14:10:50 +05:30
  • 36c7c13185 Fix size and selector for tinymce. Aditi 2013-07-31 14:09:47 +05:30
  • fc52268fbe Integrate tinymce, Draft status. Aditi 2013-07-31 14:08:12 +05:30
  • 2867663d87 Change div class for wider firm fields. Aditi 2013-07-31 14:06:31 +05:30
  • ec1d5a4e8e Add blog post state field to blog dashboard. Aditi 2013-07-31 14:04:16 +05:30
  • 63c3ca28ab Starting to write unit tests... tilly-Q 2013-07-30 19:06:26 -04:00
  • 46e0bba3da Remove ID of the blog post. Aditi 2013-07-30 19:01:17 +05:30
  • 59e5c448e9 Reverse order of blog posts on blog dashboard. Aditi 2013-07-30 18:58:17 +05:30
  • d59a4b2da0 Manually render form fields for the integration of tinymce. Aditi 2013-07-30 18:49:55 +05:30
  • f2a17ed6a7 Add tinymce in head for description field of blog, blogpost edit and create templates. Aditi 2013-07-30 18:48:41 +05:30
  • 7b23b1e58b Change blogpost_create redirect url. Aditi 2013-07-30 15:56:57 +05:30
  • 0a2da087e7 Add temporary blogpost display template. Aditi 2013-07-30 15:32:21 +05:30
  • b5ae96851c Add feature: redirect to 404 error if blog or blog post slug do not exist. Aditi 2013-07-30 15:26:11 +05:30
  • 52a355b275 Merge branch 'ticket-679' into OPW-Moderation-Update tilly-Q 2013-07-29 18:40:19 -04:00
  • a1e299d60e Why isn't .ogg in this list? A comment explains... it's detected by sniffing! Christopher Allan Webber 2013-07-29 16:50:29 -05:00
  • 08cd10d84f I actually had to do a bit more work than I thought, because I needed to account for plugins. In this commit I changed the MigrationManager and DatabaseData ob- jects to account for FOUNDATIONS in any plugin's (or main program's) models.py file. tilly-Q 2013-07-29 17:15:29 -04:00
  • f2b2008da5 This was a very simple ticket actually. I created a list called FOUNDATIONS in mediagoblin/db/models.py. This list holds all of the information about rows that should be created at database initialization. Read the documentation near the FOUNDATIONS list to understand the proper format for this list. tilly-Q 2013-07-29 16:36:06 -04:00
  • f26c21cd5b This is a very small commit. All that I have done here is to clean up my code a bit. I made it so that mediagoblin.user_pages.report recieves the report form as part of it's context. I also made sure I used {% trans %} tags effect- -ively. tilly-Q 2013-07-29 15:14:39 -04:00
  • 130b85f81a babel 1.0 doesn't have a localedata.list() method, so updated setup.py. Rodney Ewing 2013-07-29 11:25:34 -07:00
  • cae55705b1 Fix problem causing exception when invalid Authentication header provided xray7224 2013-07-29 17:48:53 +01:00
  • 4554d6e014 Fix problem with routing to oauth xray7224 2013-07-29 17:28:50 +01:00
  • 0ec89cb29f Fixes problem with headers pointing to old federation dir xray7224 2013-07-29 17:25:10 +01:00
  • 47b0c3160e Add Blog Edit button. Aditi 2013-07-29 18:00:02 +05:30
  • 72514eb272 Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin Aditi 2013-07-29 13:31:35 +05:30
  • 221cde5711 Fix error in blog edit view. Aditi 2013-07-29 13:27:30 +05:30
  • 8f6a0bf44e Change Redirect url to blog dashboard in blog_edit view. Aditi 2013-07-29 11:08:03 +05:30