4173 Commits

Author SHA1 Message Date
Rodney Ewing
517eb8b443 - fixed typo with unbinding code
- added the ability to get the user's email from the ldap server upon registration
2013-08-15 15:57:59 -07:00
Rodney Ewing
11782c0061 - changed host and port to just a server uri
- added an option to connect with TLS
- unbind after when done
2013-08-15 15:57:44 -07:00
Rodney Ewing
c4513740bf ldap uses it own views 2013-08-15 15:56:20 -07:00
Rodney Ewing
daf29c011a starting ldap plugin 2013-08-15 15:56:03 -07:00
Christopher Allan Webber
97b9b98c1e Merge branch 'persona_resquash' 2013-08-15 17:07:14 -05:00
Christopher Allan Webber
cd612ee689 Removing the whitespace betwetween action= and its value 2013-08-15 15:17:02 -05:00
Christopher Allan Webber
4834ef8ec2 Merge remote-tracking branch 'refs/remotes/tsyesika/master'
New oauth tools!  Heck yeah!
2013-08-15 10:34:20 -05:00
Christopher Allan Webber
29cd702e47 Fix notifications, which I broke.
This commit sponsored by Denver Gingerich.  Thank you!
2013-08-14 15:57:58 -05:00
Christopher Allan Webber
7949d88a75 Avoiding the celery warnings that we seem to be confusing people lately.
Basically, it's shuffling around the notifications stuff.

This commit sponsored by Günter Kraft.  Thank you!
2013-08-14 15:08:49 -05:00
tilly-Q
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.

=== Made reports on admins not resolvable by moderators:
--\   mediagoblin/moderation/views.py
--\   mediagoblin/templates/mediagoblin/moderation/report.html

=== Created new files for the new pages:
--\   mediagoblin/meta/__init__.py
--\   mediagoblin/meta/routing.py
--\   mediagoblin/meta/views.py
--\   mediagoblin/templates/mediagoblin/meta/code_of_conduct.html
--\   mediagoblin/templates/mediagoblin/meta/reports_details.html
--\   mediagoblin/templates/mediagoblin/meta/reports_panel.html
--\   mediagoblin/routing.py
--\   mediagoblin/static/css/base.css

=== Replaced vestigial methods of checking a user's privilege with the more
====== effective method has_privilege(u'privilege_name'):
--\   mediagoblin/db/models.py
--|   Added in the has_privilege method to the User class

--\   mediagoblin/db/migrations.py
--\   mediagoblin/db/models.py
--\   mediagoblin/decorators.py
--\   mediagoblin/edit/lib.py
--\   mediagoblin/edit/views.py
--\   mediagoblin/gmg_commands/users.py
--\   mediagoblin/moderation/views.py
--\   mediagoblin/templates/mediagoblin/base.html
--\   mediagoblin/templates/mediagoblin/user_pages/collection.html
--\   mediagoblin/templates/mediagoblin/user_pages/media.html
--\   mediagoblin/templates/mediagoblin/user_pages/user.html
--\   mediagoblin/templates/mediagoblin/utils/collection_gallery.html
--\   mediagoblin/user_pages/views.py

=== Minor UI changes
--\   mediagoblin/templates/mediagoblin/moderation/report_panel.html
--\   mediagoblin/templates/mediagoblin/moderation/user.html

=== Other Bugs:
--\   mediagoblin/tools/response.py
--\   mediagoblin/db/migrations.py
2013-08-13 18:38:00 -04:00
Jessica Tallon
89909bd692 Fix import errors when running tests 2013-08-13 11:25:40 +01:00
Aditi
e018b2120a Change path for tinymce. 2013-08-10 16:18:30 +05:30
Aditi
db600404a4 Change button names to Save and Blog. 2013-08-10 16:17:09 +05:30
Aditi
e5c7e10f02 Create symbolic link for tinymce. 2013-08-10 16:14:04 +05:30
Aditi
fca6624203 Remove extlib/tinymce submodule. 2013-08-10 07:50:21 +05:30
Rodney Ewing
135dd5296b change dropdown button to <a> from <div> so that it is tabbable 2013-08-09 11:38:55 -07:00
Aditi
18fd3a272b Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin 2013-08-09 16:38:55 +05:30
Aditi
97ce2563ed Add delete error for failed type. 2013-08-09 15:05:20 +05:30
Aditi
dee425d26c Replace edit blogpost url from default media_edit url to blogpost edit url. 2013-08-09 14:45:06 +05:30
Aditi
a590e0ba17 Write function get_blog_by_blogpost 2013-08-09 14:43:05 +05:30
Aditi
382d2b4bd8 Delete initial blog folder from plugin directory. 2013-08-09 11:07:09 +05:30
Rodney Ewing
d7ecae5a4e Revert "slugs are now generated during processing"
This reverts commit 9da4e8049f2de900f7aa12f2fed8c60d6749ff0b.
2013-08-08 15:49:51 -07:00
Rodney Ewing
b26edfb944 Revert "Leave slug empty until we are sure media processing was successful."
This reverts commit f67611fb485b5a84cedc62b73beb1e551e8cb934.

For some reason, generating a slug here throws an integrity error during
a query when there is a duplicate slug.
2013-08-08 15:49:33 -07:00
Christopher Allan Webber
4de7db6fef Switching the MediaGoblin homepage image over to using the "official" gavroche style 2013-08-08 14:15:47 -05:00
Rodney Ewing
8fc57eaaa6 Add ?next= when trying to add a comment when not logged in 2013-08-08 11:07:12 -07:00
Aditi
d0ba136f55 Make media_confirm_delete to work for failed media entries too. 2013-08-08 20:47:43 +05:30
Rodney Ewing
202d951c3d Render 404 if not ajax request 2013-08-07 17:13:38 -07:00
Rodney Ewing
b2d6c45850 change interval to 1000ms 2013-08-07 16:58:06 -07:00
Emily O'Leary
3bd62dc4ca Changed how the comment was encoded/read.
Fixed CSRF + Post with comment preview.
Merged with latest master
2013-08-07 16:33:58 -07:00
Emily O'Leary
3cf4ae0c41 Changed the target of the markdown links for opening in a new tab as suggested by joar. 2013-08-07 16:33:10 -07:00
Emily O'Leary
bb3299ce21 Added i18n to my javascript changes as per trac #417 2013-08-07 16:33:09 -07:00
Emily O'Leary
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.
It does this in real time with a 500ms lag by using a timer. Initially I tried the onChange handler but you need to lose focus for that to process. The javascript timer is only invoked if the add comment button is pressed. A request is only sent if the comment box is not empty and the current value is not the same as the last value.
2013-08-07 16:33:09 -07:00
Rodney Ewing
9da4e8049f slugs are now generated during processing 2013-08-07 16:19:57 -07:00
Rodney Ewing
f67611fb48 Leave slug empty until we are sure media processing was successful.
Patch submitted by LotusEcho
2013-08-07 16:15:27 -07:00
Kenneth Dombrowski
155d234d95 * create config option for optional jinja2 extensions
* add comments & clarify code for jinja2 extensions

Conflicts:
	mediagoblin/config_spec.ini
2013-08-07 16:02:09 -07:00
Rodney Ewing
2ed6afb048 Use the workbench for video processing.
Patch submitted by Kushal
2013-08-07 15:31:40 -07:00
Christopher Allan Webber
316ede4705 autoplay is now by default False for videos.
This commit sponsored by Vasili Sviridov.  Thank you!
2013-08-07 15:03:37 -05:00
Christopher Allan Webber
24e6c34e88 Merge branch 'merge-pyconfigure'
Conflicts:
	docs/source/siteadmin/deploying.rst
2013-08-07 11:57:12 -05:00
Aditi
64a6e7fc49 Move templates to blog plugin from all mediagoblin/templates. 2013-08-07 20:47:42 +05:30
Aditi
549bc3449e Eliminate url mapping using mediagoblin/routing.py and have plugin type url mapping. 2013-08-07 20:35:11 +05:30
Aditi
45384c6dce Add url mapping to it, to have a complete media_type plugin. 2013-08-07 20:31:34 +05:30
Aditi
2e9f60d264 show all blogposts. 2013-08-07 19:44:36 +05:30
Aditi
d6a456b5b4 Specify the status of blog post. 2013-08-07 18:00:55 +05:30
Aditi
7ffe783d0e URL mapping blog post draft view. 2013-08-07 17:58:57 +05:30
Aditi
8c040f7780 write a function to extract blog post state from create/edit form. 2013-08-07 17:58:01 +05:30
Aditi
4cf5b010a5 Code for blog post view when it is in draft state. 2013-08-07 17:56:39 +05:30
Aditi
3922463dd1 Write template for draft view of a blog post. 2013-08-07 17:55:29 +05:30
Aditi
bd71103e92 Change message when user tries to create multiple blogs. 2013-08-07 14:13:42 +05:30
Aditi
842b1bf6cb Display date of creation of the blog post. 2013-08-07 14:10:36 +05:30
Aditi
13af16070a button to start with blogging. 2013-08-06 20:20:23 +05:30