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
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
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
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