aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tools
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | This has been an update to clean out the code a little bit. The primary changetilly-Q2013-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge branch 'ticket-679' into OPW-Moderation-Updatetilly-Q2013-07-294-4/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/auth/tools.py mediagoblin/auth/views.py mediagoblin/db/migration_tools.py mediagoblin/db/migrations.py mediagoblin/db/models.py mediagoblin/decorators.py mediagoblin/user_pages/views.py
| * | | | | This commit had some important milestones in it. The major update is that now Itilly-Q2013-07-271-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have mostly completed the moderator punishment and resolution of reports. Along with this, I have also added one last table to the database: one that holds ar- -chived (or resolved) reports. This is some of the primary functionality of my whole update, so this is a big step! The other changes I made this update are primarily organizational. I refactored some of my code into functions and I cl- eaned up many of my templates. --\ mediagoblin/db/models.py --| Created the new ArchivedReport table --| Removed columns from BaseReport table that are only necessary for Archived | reports --\ mediagoblin/db/migrations.py --| Created the new ArchivedReport table --| Removed columns from BaseReport table that are only necessary for Archived | reports --\ mediagoblin/db/util.py --| Created the user_privileges_to_dictionary function. This is useful for | accessing a user's permissions from within a template. --\ mediagoblin/moderation/forms.py --| Expanded the disciplinary actions a moderator can take --| Allowed the moderator to choose more than one disciplinary action at a time | (It's now managed with a list of checkboxes rather than radio buttons) ----| Pulled a MultiCheckBox class from a wtforms tutorial --| Added various other form inputs for details of the moderator's disciplinary | actions --| Tried to ensure that every string is unicode and translated --\ mediagoblin/moderation/tools.py --| Created this file for holding useful moderation tools --| Moved the penalizing code from views to the function take_punitive_actions --| Added many more types of punitive actions --| Added the archiving of old reports --\ mediagoblin/moderation/views.py --| Used the privileges_to_dictionary function for the Users Detail view to | allow for different actions available to a moderator and an admin. --| Added in functionality for ArchivedReports to the reports_detail and | reports_panel views --| Moved the punishments of repots_detail to tools.py (as mentioned above) --\ mediagoblin/static/css/base.css --| Added new styling for the User Detail page --\ mediagoblin/static/images/icon_clipboard_alert.png --| Added this image to represent unresolved reports --\ mediagoblin/templates/mediagoblin/moderation/report.html --| Added 'Return to Reports Panel' button --| Fixed the spacing to be less that 80 columns wide --| Added in display for Archived Reports --\ mediagoblin/templates/mediagoblin/moderation/reports_panel.html --| Changed the placement and columns of the tables --| Fixed the spacing to be less that 80 columns wide --| Added in display for Archived Reports --\ mediagoblin/templates/mediagoblin/moderation/user.html --| Fixed the spacing to be less that 80 columns wide --| Took away the moderator's ability to add and remove privileges at will. | Only the admin has this power now. --\ mediagoblin/templates/mediagoblin/moderation/users_panel.html --| Fixed the spacing to be less that 80 columns wide --\ mediagoblin/tools/response.py --| Added in code to remove a UserBan from a User if that user logs in after | the expiration date
| * | | | | Whew. This is a big update. I did some significant keeping work. I moved all oftilly-Q2013-07-171-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the folders and enpoints labeled 'admin' to the more accurate term of 'moderat- ion.' I also created the ability for admins and moderators to add or remove pr- ivileges or to ban a user in response to a report. This also meant implementing the UserBan class in various places. I also had to add a column called result to the ReportBase table. This allows the moderator/admin to leave comments when they respond to a report, allowing for archiving of what responses they do/n't take. --\ mediagoblin/db/migrations.py --| Added result column to ReportBase --\ mediagoblin/db/models.py --| Added result column to ReportBase --| Added documentation to tables I had made previously --\ mediagoblin/decorators.py --| Editted the user_has_privilege decorator to check whether a user has been | banned or not --| Created a seperate user_not_banned decorator to prevent banned users from | accessing any pages --| Changed require_admin_login into require_admin_or_moderator login --\ mediagoblin/gmg_commands/users.py --| Made the gmg command `adduser` create a user w/ the appropriate privileges --\ mediagoblin/moderation/routing.py << formerly mediagoblin/admin/routing.py --| Renamed all of the routes from admin -> moderation --\ mediagoblin/routing.py --| Renamed all of the routes from admin -> moderation --\ mediagoblin/moderation/views.py << formerly mediagoblin/admin/views.py --| Renamed all of the routes & functions from admin -> moderation --| Expanded greatly on the moderation_reports_detail view and functionality --| Added in the give_or_take_away_privilege form, however this might be a use- | -less function which I could remove (because privilege changes should happe- | n in response to a report so they can be archived and visible) --\ mediagoblin/static/css/base.css --| Added in a style for the reports_detail page --\ mediagoblin/templates/mediagoblin/base.html --| Renamed all of the routes from admin -> moderation --\ mediagoblin/templates/mediagoblin/moderation/report.html --| Added form to allow moderators and admins to respond to reports. --\ mediagoblin/templates/mediagoblin/moderation/reports_panel.html --| Fixed the table for closed reports --\ mediagoblin/templates/mediagoblin/moderation/user.html --| Added in a table w/ all of the user's privileges and the option to add or | remove them. Again, this is probably vestigial --| Renamed all of the routes from admin -> moderation --\ mediagoblin/templates/mediagoblin/moderation/user_panel.html --| Renamed all of the routes from admin -> moderation --\ mediagoblin/tools/response.py --| Added function render_user_banned, this is the view function for the redir- | -ect that happens when a user tries to access the site whilst banned --\ mediagoblin/user_pages/forms.py --| Added important translate function where I had text --\ mediagoblin/user_pages/lib.py --| Renamed functiion for clarity --\ mediagoblin/user_pages/views.py --| Added the user_not_banned decorator to every view --\ mediagoblin/views.py --| Added the user_not_banned decorator --\ mediagoblin/moderation/forms.py --| Created this new file --\ mediagoblin/templates/mediagoblin/banned.html --| Created this new file --| This is the page which people are redirected to when they access the site | while banned
* | | | | | Fix pagination for certain request.GET dataChristopher Allan Webber2013-09-131-2/+6
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This didn't work at all nicely with MultiDict objects in various circumstances and could possibly break pagination. This fix handles that! This commit sponsored by Alessandro Francolini. Thank you!
* | | | | Fix plugin documentationSebastian Spaeth2013-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The docs suggest to use {% template_hook "media_sidebar" %}. This will break Mediagoblin in mysterious ways, and the docs need a fix.
* | | | | Fix failing to build docsChristopher Allan Webber2013-08-281-12/+14
| |_|/ / |/| | |
* | | | Merge remote-tracking branch 'refs/remotes/tsyesika/master'Christopher Allan Webber2013-08-154-1/+131
|\ \ \ \ | | | | | | | | | | | | | | | New oauth tools! Heck yeah!
| * \ \ \ Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblinxray72242013-07-141-1/+8
| |\ \ \ \
| * | | | | Cleans up some of the OAuth codexray72242013-07-111-9/+0
| | | | | |
| * | | | | Finishes most of oauth, just decorator to completexray72242013-07-112-0/+29
| | | | | |
| * | | | | Adds more support for oauth - access_token & decorators still to doxray72242013-07-111-1/+1
| | | | | |
| * | | | | Adds oauth support up until authorizationxray72242013-07-112-0/+26
| | | | | |
| * | | | | Client registration now supports application/x-www-form-urlencoded nowxray72242013-07-111-0/+46
| | | | | |
| * | | | | Working client registrationxray72242013-07-113-43/+40
| | | | | |
| * | | | | Moves json_response into tools/json.pyxray72242013-07-111-0/+41
| | | | | |
* | | | | | Fix notifications, which I broke.Christopher Allan Webber2013-08-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This commit sponsored by Denver Gingerich. Thank you!
* | | | | | Avoiding the celery warnings that we seem to be confusing people lately.Christopher Allan Webber2013-08-141-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically, it's shuffling around the notifications stuff. This commit sponsored by Günter Kraft. Thank you!
* | | | | | * create config option for optional jinja2 extensionsKenneth Dombrowski2013-08-071-1/+7
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add comments & clarify code for jinja2 extensions Conflicts: mediagoblin/config_spec.ini
* | | | | babel 1.0 doesn't have a localedata.list() method, so updated setup.py.Rodney Ewing2013-07-291-1/+1
| |/ / / |/| | | | | | | | | | | made "import crypto" fully qualified
* | | | save “stay_logged_in” in the sessionJakob Kramer2013-07-111-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Since sessions are rebuilt, e.g. when you try to post a blank comment and therefore receive an error message, the session will be overwritten without the old max_age.
* | | | add login option: stay_logged_inJakob Kramer2013-07-111-1/+2
|/ / / | | | | | | | | | | | | | | | | | | As proposed in issue #354; it adds an attribute max_age to mediagoblin.tools.session.Session that is passed to response.set_cookie; max_age is set to 30 days if the checkbox is selected
* | | Merge remote-tracking branch 'upstream/master' into authRodney Ewing2013-06-252-2/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/app.py mediagoblin/auth/forms.py mediagoblin/auth/tools.py mediagoblin/db/migrations.py mediagoblin/db/models.py mediagoblin/edit/views.py mediagoblin/plugins/basic_auth/tools.py mediagoblin/tests/test_edit.py
| * \ \ Merge remote-tracking branch 'refs/remotes/joar/notifications'Christopher Allan Webber2013-06-221-1/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/db/migrations.py
| | * | | New notificationsJoar Wandborg2013-06-091-1/+6
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added request.notifications - Email configuration fixes - Set config_spec default SMTP port to `0` and switch to SSL/non-SSL default if `port == 0` - Added email_smtp_use_ssl configuration setting - Added migrations for notification tables - Added __repr__ to MediaComment(Mixin) - Added MediaComment.get_entry => MediaEntry - Added CommentSubscription, CommentNotification, Notification, ProcessingNotification tables - Added notifications.task to celery init - Fixed a bug in the video transcoder where pygst would hijack the --help argument. - Added notifications - views - silence - subscribe - routes - utility methods - celery task - Added half-hearted .active comment CSS style - Added quick JS to show header_dropdown - Added fragment template to show notifications in header_dropdown - Added fragment template to show subscribe/unsubscribe buttons on media/comment pages - Updated celery setup tests with notifications.task - Tried to fix test_misc tests that I broke - Added notification tests - Added and extended tests.tools fixtures - Integrated new notifications into media_home, media_post_comment views - Bumped SQLAlchemy dependency to >= 0.8.0 since we need polymorphic for the notifications to work
| * / / Fix by Rodney Ewing so render_http_exception works with newer Werkzeug versions.Christopher Allan Webber2013-06-221-1/+1
| |/ /
| * | moved email_debug_message to gmg/tools/mailRodney Ewing2013-05-271-1/+14
| | |
* | | Merge branch 'pre-auth' into basic_authRodney Ewing2013-05-271-1/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/auth/tools.py mediagoblin/auth/views.py mediagoblin/db/migrations.py mediagoblin/plugins/basic_auth/lib.py mediagoblin/plugins/httpapiauth/__init__.py mediagoblin/plugins/piwigo/views.py
| * | | moved email_debug_message to gmg/tools/mailRodney Ewing2013-05-241-1/+14
| |/ /
* / / add a check for authentication plugin on startup and respond according to ↵Rodney Ewing2013-05-241-0/+1
|/ / | | | | | | no_auth config option. allows instance to be run w/o authentication
* | Start of ability to have plugins provide static resources!Christopher Allan Webber2013-05-231-0/+38
| | | | | | | | | | | | | | | | | | | | Note I have not tested any of this yet ;) But we're already on our way: - We've got docs - The hook is there Lots to do still though. But, progress! :) This commit sponsored by Laura Arjona Reina. Thanks larjona!
* | Changes to display all EXIF informationGabriel Saldana2013-05-201-1/+1
| |
* | Oh right, actually add that hook we just documented, ↵Christopher Allan Webber2013-05-151-0/+7
| | | | | | | | | | | | "template_context_prerender" :) This commit sponsored by William Goudie. Thanks Bill! :)
* | Fully working context hooks, both template/view and global level, with testsChristopher Allan Webber2013-05-141-5/+8
| | | | | | | | | | | | Needs documentation though... that's coming next :) This commit sponsored by Luca Tius. Thanks Luca!
* | Use the controller's symbolic/lookup name as part of the key for context hooksChristopher Allan Webber2013-05-101-1/+1
| | | | | | | | This commit sponsored by David Collins. Thank you!
* | The beginning of context hooks.Christopher Allan Webber2013-05-081-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not the working solution, but getting there conceptually. Basically we'll have a key with the view and the template as a tuple which is the context hook that anyone can attach to. However, some changes have still to be made: - The unit test doesn't work yet and contains a set_trace ;) - We'll probably switch the "view" component from being the callable to the "urlgen"'able name per Elrond's suggestion - Found a bug in unit tests related to running custom apps for different configs... hm. I need to fix this! Nonetheless, making progress. This commit sponsored by... wait a minute... Christopher Webber?!
* | Create redir_obj and use it around.Elrond2013-04-281-0/+7
|/ | | | | | | | This is a shortcut function to redirect to the main page for an object. Objects currently supported: media entries and collections. And go around and replace various places to use this.
* Removed an unused importRodney Ewing2013-04-261-2/+0
|
* No lazy_* needed here; Add ReallyLazyProxy.__repr__.Elrond2013-04-251-0/+7
| | | | | | | | | | | | One should use lazy_* only if you have a good reason. This one found by our unit tests! For example add_message adds the message to the session, the session needs to be serialized (with json) and well, LazyProxy is not serializable. To aid in debugging, gave our ReallyLazyProxy a __repr__.
* Adding ReallyLazyProxy, a proxy that does what we expect :)Christopher Allan Webber2013-04-241-4/+13
|
* Switching non-forms back to using normal pass_to_ugettextChristopher Allan Webber2013-04-241-1/+1
|
* Fix-bug-667-Use-lazy_pass_to_ugettext-for-forms.Aditi Mittal2013-04-241-1/+1
|
* Create set_thread_locale and use it.Elrond2013-04-242-3/+7
| | | | | | Setting up a new template env should not directly touch the translation tools, but go through a function in translations.py.
* removing old callable utilities and porting stuff over.Christopher Allan Webber2013-04-191-67/+1
|
* we should be returning the result, not None!Christopher Allan Webber2013-04-191-1/+1
|
* fixing hook_handle for when result is never assigned, avoid reference ↵Christopher Allan Webber2013-04-191-0/+2
| | | | without assignent
* As Elrond points out, we might as well .pop() default_handlerChristopher Allan Webber2013-04-191-1/+1
|
* Hooks: the Next Generation!Christopher Allan Webber2013-04-191-0/+90
| | | | I have not tested any of this but it looks right ;)
* And... pyblosxom code removed again :)Christopher Allan Webber2013-04-191-114/+0
| | | | We agreed on a new direction on IRC last night...
* pyblosxom run_callback hoistedChristopher Allan Webber2013-04-181-0/+114
|
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-06 22:11:37 +0000