aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Whew. This is a big update. I did some significant keeping work. I moved all oftilly-Q2013-07-1723-189/+509
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* I just added the attribution for the clipboard image to the code.tilly-Q2013-07-081-1/+2
|
* This update I mostly did work on the templates for the admin pages. I did a co-tilly-Q2013-07-0817-144/+470
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -uple other small changes. I changed the information around the media processi- ng panel to be more specific, since it was written when it was the only admin page. Git didn't catch this, but I renamed the templates, so mediagoblin/templ- ates/admin/user.html now referrs to the page which shows the details of a spec- ific user. The list view pages are now named ELEMENT_panel.html(ie. user_panel) I also added a column reported_user_id to the ReportBase table, and had to add to Report filing to make sure that column gets created. Also I moved the report media button (on a media page) to the sidebar, though it still needs some form- atting --\ mediagoblin/static/images/icon_clipboard.png --| Added this image for use in template mediagoblin/admin/report.html. --| Distributed by the GNOME project http://www.gnome.org --| Under a GNU LGPL v.3 or Creative Commons BY-SA 3.0 license. --| I'm still trying to figure out the appropriate way to attribute this in | the code --\ mediagoblin/templates/mediagoblin/admin/media_panel.html --| This template is actually the template formerly know as media.html. I | renamed it for clarity --\ mediagoblin/templates/mediagoblin/admin/report_panel.html --| This template is actually the template formerly know as report.html. I | renamed it for clarity --\ mediagoblin/templates/mediagoblin/admin/user_panel.html --| This template is actually the template formerly know as user.html. I renam- | -ed it for clarity --\ mediagoblin/templates/mediagoblin/utils/report.html --| This template is included in the media_home page. It is the report media | button. I figured I'd write it like this in case it got more complicated. --\ mediagoblin/admin/routing.py --| I changed the routing path /a/panel to /a/media for specificity --\ mediagoblin/admin/views.py --| I renamed admin_processing_panel to admin_media_processing_panel --| I wrote a new view function admin_reports_detail --| I wrote a new view function admin_users_detail --\ mediagoblin/db/migrations.py --| I added in the column reported_user_id to the ReportBase_v0 class --\ mediagoblin/db/models.py --| I added in the column reported_user_id to the ReportBase class --\ mediagoblin/static/css/base.css --| I added in css classes to display a report. Right now, they are just echo- | -ing the ways comments are displayed, but with the link in another color --\ mediagoblin/templates/mediagoblin/admin/report.html --| Created this new template (although git doesn't realize it) to show the de- | -tails of a specific report, indicated in the URL --\ mediagoblin/templates/mediagoblin/admin/user.html --| Created this new template (although git doesn't realize it) to show the de- | -tails of a specific user, indicated in the URL --\ mediagoblin/templates/mediagoblin/base.html --| Redirected the link from /a/panel to /a/media --\ mediagoblin/templates/mediagoblin/user_pages/media.html --| Moved the media report button to the sidebar --\ mediagoblin/user_pages/lib.py --| Changed the creation of reports, so that they also assign a column for rep- | -orted_user_id.
* This was a simple commit. I changed all references to Groups into Privileges sotilly-Q2013-07-038-44/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as to not conflict with the new federated groups which are also being written. I also fixed up some of the code in the user_in_group/user_has_privilege decor- ator. Users are now assigned the default privileges when they sign up, and ass- iged active once they are activated. I updated the gmg command makeadmin to use my groups as well. Lastly, I added the decorator to various views, requiring th- at users belong to appropriate groups to access pages. --\ mediagoblin/auth/tools.py --| Added code to assign new users to default privileges --\ mediagoblin/auth/views.py --| Added code to assign users to u'active' privilege once the email | verification is complete --\ mediagoblin/db/migrations.py --| Renamed Group class to Privilege class --\ mediagoblin/db/models.py --| Renamed Group class to Privilege class --\ mediagoblin/decorators.py --| Renamed function based on the Group->Privilege change --| Rewrote the function to be, ya know, functional --\ mediagoblin/gmg_commands/users.py --| Changed the 'makeadmin' command to add the target user to the admin | privilege group as well as affecting 'is_admin' column --\ mediagoblin/submit/views.py --| Added the requirement that a user has the 'uploader' privilege in order | to submit new media. --\ mediagoblin/user_pages/views.py --| Added the requirement that a user has the 'commenter' privilege in order | to make a comment. --| Added the requirement that a user has the 'reporter' privilege in order | to submit new reports. --| Got rid of some vestigial code in the file_a_report function.
* In this commit, I have made a few changes and tightened up some of my modelstilly-Q2013-06-278-87/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code. I added in two major pieces of functionality: table foundations and a decorator to confirm whether or not a user is a member of a certain group. Table Foundations are default rows that should be present in a given table as soon as the database is initialized. For example, I am using these to populate the core__groups table with all of the necessary groups ('moderator', 'com- menter', etc). Right now, this is achieved by adding a dictionary of parameters (with the parameters as lists) to the constant FOUNDATIONS in mediagoblin.db.models. The keys to this dictionary are uninstantiated classes. The classes which require foundations also have must have a constructor so that the list of parameters can be passed appropriately like so: Model(*parameters) In order to implement these foundations, I added the method populate_table_fou- -ndations to MigrationManager in mediagoblin.db.migration_tools. The decorator, called user_in_group, accepts as a parameter a unicode string, and then decides whether to redirect to 403 or let the user access the page. The identifier is the Group.group_name string, because I believe that will allow for the most readable code. I also added in the simple decorator require_admin_login. In terms of tightening up my code, I made many minor changes to my use of white space and made a few small documentation additions. I removed a vestigial class (ReportForm) from mediagoblin.user_pages.forms. I moved all of my migrations in- to one registered Migration. Setting up Foundations ============================== --\ mediagoblin/db/migration_tools.py --| created: MigrationManager.populate_table_foundations --| modified: MigrationManager.init_or_migrate to run | self.populate_table_foundations on init --\ mediagoblin/db/models.py --| created: FOUNDATIONS ----| created: group_foundations Working With Permissions ============================== --\ mediagoblin/decorators.py --| created: user_in_group --| created: require_admin_login --\ mediagoblin/user_pages/views.py --| modified: added decorator user_in_group to file_a_report --\ mediagoblin/admin/views.py --| modified: added decorator require_admin_login to all views functions General Code Tidying ============================= --/ mediagoblin/admin/views.py --/ mediagoblin/user_pages/forms.py --/ mediagoblin/db/models.py --/ mediagoblin/user_pages/lib.py --/ mediagoblin/user_pages/views.py --/ mediagoblin/db/migrations.py
* This is the first stage of my project of implenting admin/moderator functiona-tilly-Q2013-06-2413-10/+548
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lity. At this point, I have finished all the of basic work with the models! I still need to do some tightening of their documentation, but they seem to be working well. Working with Models ======================================== --\ mediagoblin/db/models.py --| Added in the Report model and table. This model is strictly a parent ----| Added in the CommentReport model which holds information about a report | filed against a comment. This class inherits from Report. ----| Added in the MediaReport model which holds information about a report f- | -iled against a media entry. This class inherits from Report. --| Added in a UserBan model and table. This model is in a one to one relatio- | -nship with User. This object acts as a marker for whether a user is banned | or not. --| Added in a Group model. These objects are in a many-to-many relationship | with User to explain which privileges a User has. ----| Added in GroupUserAssociation which is a table used to hold this many to | many relationship between Group & User. --\ mediagoblin/db/migrations.py --| Added in the migrations for all of the additions to models --| Added UserBan_v0 --| Added Report_v0 ----| Added CommentReport_v0 ----| Added MediaReport_v0 --| Added Group_v0 ----| Added GroupUserAssociation_v0 Working with Templates, Views, and Routing =============================================== >>> Reporting a Comment or a MediaEntry --\ mediagoblin/user_pages/views.py --| Added in the function file_a_report to allow user to file reports against | MediaEntries or Comments. Handles GET and POST requests. --| Added in the function file_a_comment_report which uses file_a_report but | also catches appropriate information for comment_ids. I may be able to do | this more eloquently with decorators. --\ mediagoblin/user_pages/routing.py --| Added in route 'mediagoblin.user_pages.media_home.report_media' | (linked to address /u/<user>/m/<media>/report/ ) --| Added in route ''mediagoblin.user_pages.media_home.report_comment' | (linked to address /u/<user>/m/<media>/c/<comment>/report/ ) --\ mediagoblin/templates/mediagoblin/user_pages/report.html --| I created this file to handle the filing of a report. --\ mediagoblin/templates/mediagoblin/user_pages/media.html --| Modified this file to add in links allowing users to report either media | or comments. --\ mediagoblin/user_pages/lib.py --| Added in build_report_form which processes data as either a CommentReport or | a MediaReport depending on which parameters are present --\ mediagoblin/user_pages/forms.py --| Added in CommentReportForm --| Added in MediaReportForm --| note: ReportForm is vestigial to an earlier strategy I used and I'll remove it | promptly --\ mediagoblin/decorators.py --| Added in 'get_media_comment_by_id' for use in mediagoblin/user_pages/views.py >>> New Admin Panels --\ mediagoblin/admin/views.py --| Added in the function admin_users_panel --| Added in the function admin_reports_panel --\ mediagoblin/admin/routing.py --| Added in route 'mediagoblin.admin.users' | (linked to address '/a/users') --| Added in route 'mediagoblin.admin.reports' | (linked to address '/a/reports/') --\ mediagoblin/templates/admin/user.html --| Created this file as a template for monitoring users --\ mediagoblin/templates/admin/report.html --| Created this file as a template for monitoring reports filed against media or | comments
* Added some test-writing docs for plugins, but not sure if they're good. ;)Christopher Allan Webber2013-06-072-0/+65
| | | | This commit sponsored by Joe Lee. Thank you!
* ./bin/gmg dbupdate, not ./bin/dbupdateChristopher Allan Webber2013-06-061-1/+1
| | | | Thanks to Tsyesica for catching this :)
* CloudFiles: Default to SSL URIsJoar Wandborg2013-06-071-1/+1
|
* Make sure that the pytest revision is at least at 2.3.Christopher Allan Webber2013-06-031-1/+1
|
* Commenting out the max-height restriction on thumbnails.Christopher Allan Webber2013-05-301-3/+6
|
* Explained more clearly why it's okay for interface classes to be keys.Christopher Allan Webber2013-05-291-1/+3
| | | | This commit sponsored by Nick Glynn. Thank you!
* Provide a tip on how to do interfaces via our plugin API.Christopher Allan Webber2013-05-291-0/+66
| | | | | | | Uses a frogputer science approach to frobbing as an example (which is total nonsense, but fun). This commit sponsored by Ryan Kelln. Thank you!
* Actually use the right underlining for the wtforms hooks sectionChristopher Allan Webber2013-05-291-1/+1
|
* Additional hook tips! Documentation on how to modify a wtforms form.Christopher Allan Webber2013-05-291-0/+33
| | | | This commit sponsored by Gian-Maria Daffré. Thank you!
* Where do you find hooks? How do you add them? An explaination!Christopher Allan Webber2013-05-291-0/+20
| | | | | This commit about talking to community members sponsored by community member Aeva Palecek. Thanks!
* Actually link to the release notes when we say "see the release notes".Christopher Allan Webber2013-05-292-1/+3
| | | | This commit sponsored by Brian Kemp. Thank you!
* Link to the plugin api stuff and the database plugin sections from the ↵Christopher Allan Webber2013-05-293-5/+11
| | | | | | quickstart. This commit sponsored by Nathan Stephenson. Thank you!
* The pdf.js iframe view is awesome so I'm making it the default. So there! ;)Christopher Allan Webber2013-05-281-1/+1
| | | | This commit sponsored by Jay Turley. Thank you!
* Fixing bug where non-image types might break if ↵Christopher Allan Webber2013-05-282-13/+19
| | | | | | | | | | app_config['original_date_visible'] is true Not all media managers have the .get_original_date attribute, so of course break. This is fixed by making a new space where individual media types can define this if they like. This commit sponsored by Matthieu Dupont de Dinechin. Thank you!
* added a register_user functionRodney Ewing2013-05-282-33/+53
| | | | | cherry picked from rodney757 and fixed for out of order picking.
* created a check_login_simple functionRodney Ewing2013-05-285-33/+34
| | | | | | cherry-picked from rodney757, fixed few conflicts due to out of order cherry-picking. Thanks to rodney757 for making my idea even better.
* moved email_debug_message to gmg/tools/mailRodney Ewing2013-05-272-13/+15
|
* moved send_verification_email to auth/toolsRodney Ewing2013-05-273-39/+41
|
* removed unused importRodney Ewing2013-05-271-1/+0
|
* Committing extracted and compiled translationsChristopher Allan Webber2013-05-2757-5127/+7482
|
* Extract footer into bits/base_footer.html.Elrond2013-05-262-10/+29
|
* No more of this find_packages nonsense.Christopher Allan Webber2013-05-241-2/+2
| | | | | | | Explicitly declare mediagoblin as the only package. find_packages has caused messes in the past :) This commit sponsored by Pedro Ângelo. Thanks!
* Improved docsJoar Wandborg2013-05-241-25/+39
| | | | | | | - Fixed an outdated URL - Rewrote "Separate Celery" section - Changed literal blocks to bash code-blocks - Changed wording when referring to the MediaGoblin WSGI application
* moved normalize_user_or_email_field to auth/tools.py from auth/forms.pyRodney Ewing2013-05-232-27/+51
|
* Moving statcdirect automodule doc reference to autoclass per Elrond's ↵Christopher Allan Webber2013-05-231-2/+1
| | | | | | suggestion. Cleaner!
* Cleaned up EXIF viewJoar Wandborg2013-05-233-57/+53
| | | | | | The last update made the assumption that EXIF metadata is in some way consistent between camera models, images, manufacturers. This update takes into account that nothing is certain whenever EXIF is involved.
* Documentation changes to reflect new plugin assetlink stuffChristopher Allan Webber2013-05-234-4/+24
| | | | | | | | | | | - updated old theme assetlink section to reflect new location of ./bin/gmg assetlink and removed comment about the plugin command being temporary. - Added a new section to the standard config file on where to put the plugin_static section - Added release notes about said section This commit sponsored by Thomas Webber. Thanks, Dad!
* Full unit test for the plugin assetlink command.Christopher Allan Webber2013-05-231-1/+73
| | | | | | | | | | Tests: - if the link doesn't exist yet - if the link already exists - if it is a symlink to something else - if it exists but is not a symlink This commit sponsored by Lon Koenig. Thank you!
* Cleaning a bit: os.path.sep.join -> os.path.joinChristopher Allan Webber2013-05-231-2/+2
|
* docstring update: link theme... and plugins!Christopher Allan Webber2013-05-231-1/+1
|
* Generalize "gmg theme assetlink" -> "gmg assetlink" and cover both theme and ↵Christopher Allan Webber2013-05-232-52/+29
| | | | | | | | | plugins We've moved the module... probably I'll re-add theme just to give a warning that this is deprecated. This commit sponsored by Kevin Williams. Thank you!
* test_plugin_staticdirect now works and passes.Christopher Allan Webber2013-05-232-1/+35
| | | | This commit sponsored by Samuel Vale. Thank you!
* Simple "staticstuff" plugin for writing unit tests on plugin static asset ↵Christopher Allan Webber2013-05-234-0/+94
| | | | | | | | | | | | | | | | linking. It doesn't do much... it just has a static directory with a "bunnify" CSS file and has a unit test that returns a json encoded set of a staticdirect with both this plugin enabled and also with (theoretically) a file distributed with MediaGoblin (it isn't really, but in our case that doesn't matter.) Also set up the static_setup hook / PluginStatic object for this plugin; testing that with `./bin/gmg theme assetlink` seemed to work. (And argh, need to update that command name, I know.) This commit sponsored by Bradley Kuhn. Thanks bkuhn!
* Various fixes to plugin assetlinking command.Christopher Allan Webber2013-05-232-7/+7
| | | | | | | Actually trying to run the command helps figure out what needs to be fixed :) This commit sponsored by Justin Nichol. Thank you!
* Moving test_user_dev->user_dev in plugin app configs & adding plugin static ↵Christopher Allan Webber2013-05-235-26/+25
| | | | | | | | | | | | | | | | serving The test_user_dev (as opposed to user_dev) was a legacy before we had each application running in its own directory (as they now do in pytest). Move that name to just user_dev... this is more consistent with the rest of our naming and will make writing these config files easier. (If we want to test that changing these still works, that should be a separate unit test with special config files.) Additionally, add plugin static serving to the common test paste config file. This commit sponsored by Juan Jose Marin Martinez. Thank you!
* Document assetlink and staticdirect usage for plugins.Christopher Allan Webber2013-05-231-0/+31
| | | | | | | Still a bit to clean up around what the command to be run actually is, since that will likely change. This commit sponsored by David Decker. Thank you!
* Oh right, actually mount /plugin_static/ :)Christopher Allan Webber2013-05-231-0/+1
|
* Work towards getting plugin static linking/serving to workChristopher Allan Webber2013-05-234-8/+73
| | | | | | | | | - add link_plugin_assets. For now, incorrectly running from ./bin/gmg theme assetlink... uh, will fix ;) - Update paste and config_spec.ini configs to handle the locations and serving of the plugins' static resources This commit sponsored by Marko Dimjašević. Thank you!
* Start of ability to have plugins provide static resources!Christopher Allan Webber2013-05-233-0/+64
| | | | | | | | | | 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!
* Move "bits" templates with dashes in them to underscoresChristopher Allan Webber2013-05-225-3/+19
| | | | | | Moved all references and also added a note to our release notes. This commit sponsored by Juan Rodriguez. Thank you!
* Moved frontpage "welcome" stuff into its own bits file.Christopher Allan Webber2013-05-222-17/+37
| | | | | | This should make it easier to override just that part of the page. This commit sponsored by David Rylander. Thank you!
* Piwigo minor fix in categories_getList.Mats Sjöberg2013-05-211-3/+3
|
* Piwigo: some sanity checks before adding to collection as per Elrond's ↵Mats Sjöberg2013-05-211-1/+2
| | | | suggestions.
* Piwigo: return collections list only to logged in users.Mats Sjöberg2013-05-211-6/+7
|