aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db
Commit message (Collapse)AuthorAgeFilesLines
* Use the the slug as the UUID instead of a newly generated UUIDxray72242014-07-221-6/+1
|
* Add image URL's (thumb & full)Jessica Tallon2014-07-222-0/+17
|
* Fixes where User id in API would return url rather than hostJessica Tallon2014-07-221-1/+1
|
* Adds comments for the MediaEntry apiJessica Tallon2014-07-221-5/+16
|
* Changes serialization to .serialize method on object - MediaEntryJessica Tallon2014-07-221-0/+43
|
* Make sure new media has a new uuid added onJessica Tallon2014-07-222-7/+10
|
* Adds migration on MediaEntry to add uuidJessica Tallon2014-07-222-2/+1
|
* Starts the user (profile) endpoint and lays groundwork for inbox and feed ↵Jessica Tallon2014-07-221-1/+25
| | | | endpoint
* Adds seralize on userJessica Tallon2014-07-221-0/+10
|
* Use unicode for logging commentsTryggvi Bjorgvinsson2014-07-182-2/+2
| | | | | | | | | | | | | The comment problems detailed in issue 791 are related to logging of comments creation. The log tries to format unicode comments into an ascii string (that is the unicode comment content). This also creates problems with mark seen functionality since that also logs the comments which breaks and you end up with a lot of international comments in your message queue. This commit makes both log messages unicode as well as the representation of the comment.
* Fix #894 - index User.username fieldJessica Tallon2014-07-172-2/+16
| | | | This commit sponsored by Emily O'Leary. Thank you!
* Removing legacy mongo-related docstringChristopher Allan Webber2014-06-231-33/+0
|
* Adding comments in the migration explaining a bit what's going on.Christopher Allan Webber2014-06-111-0/+2
| | | | This commit sponsored by Philip Horger. Thank you!
* Explicitly set the column names to "user" and "privilege"Christopher Allan Webber2014-06-112-2/+6
|
* Switch "user_id" to "privilege" and "privilege_id" to "user".Christopher Allan Webber2014-06-102-19/+25
| | | | | | | | | This builds on the previous code Natalie wrote, but makes some changes: - More direct alterations for non-sqlite code - In both cases, I've made it so that we switched the field names from privilege_id and user_id to user and privilege respectively. This way we can do the name swap, but in one case it's "easy": just changing the name. (In the sqlite case it's still tricky though.)
* Merge remote-tracking branch 'refs/remotes/tilly-q/ticket-874' into mergetestChristopher Allan Webber2014-06-102-4/+48
|\ | | | | | | | | Conflicts: mediagoblin/db/migrations.py
| * Made the columns properly referenced in models and migrations.tilly-Q2014-04-232-14/+9
| |
| * Renamed the columns on core__privileges_users table so that they are unique andtilly-Q2014-04-222-2/+47
| | | | | | | | will not cause any more problems.
* | Set a default value to MediaEntry.media_metadatatilly-Q2014-05-142-2/+4
| |
* | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin into metadatatilly-Q2014-05-131-0/+6
|\| | | | | | | | | Conflicts: mediagoblin/gmg_commands/__init__.py
| * Issue #686: Create User.url_for_self() method.Berker Peksag2014-04-101-0/+6
| | | | | | | | | | *Note from cwebber on merge of this branch:* Thanks also to Sturm who provided an early version of this patch.
* | Changed the name of the metadata columntilly-Q2014-04-212-2/+2
| |
* | Moved the metadata column to MediaEntry rather than MediaFiletilly-Q2014-04-212-5/+5
| |
* | In this commit, I added a new column which will be used for RDFa metadata oftilly-Q2014-04-212-0/+13
|/ | | | media.
* Not only the web server starts MediaGoblin app! Better phrasing.Christopher Allan Webber2014-01-021-1/+1
|
* Merge remote-tracking branch 'refs/remotes/rodney757/dbupdate'Christopher Allan Webber2014-01-021-1/+17
|\ | | | | | | | | | | Conflicts: mediagoblin/db/util.py mediagoblin/gmg_commands/dbupdate.py
| * check if db is up to dateRodney Ewing2013-09-021-1/+16
| |
* | I went through the code and just removed some blank spaces. I also looked ittilly-Q2013-11-192-4/+3
| | | | | | | | thru and it looked great.
* | Addressed ticket number 630 by removing MediaEntry.collectedJosie2013-11-182-2/+15
| |
* | Renaming replace_table to replace_table_hack and documenting why it's a hackChristopher Allan Webber2013-10-102-6/+12
| | | | | | | | | | | | We'd still prefer people use other solutions when possible! This commit sponsored by Michał Masłowski. Thank you!
* | Actually rename the table back, or else we just lose the old table! ;)Christopher Allan Webber2013-10-101-1/+1
| |
* | Merge remote-tracking branch 'tilly-q/merge-tillyq-moderation' into ↵Christopher Allan Webber2013-10-102-21/+31
|\ \ | | | | | | | | | merge-tillyq-moderation
| * | I made some changes in this commit to help out with other people trying to worktilly-Q2013-10-092-21/+31
| | | | | | | | | | | | | | | | | | around the SQLite problems with Alter table. I added a new function to migration_tools (replace_table) which does all the work I did in my migration of core__users, but is now usable for other migrations.
* | | Fix the create_moderation_tables migration to work with postgresqlChristopher Allan Webber2013-10-101-3/+3
|/ / | | | | | | Was comparing/assigning to integers... but that's not how postgres rolls!
* | Fixing migration to account for new fields added to User modelChristopher Allan Webber2013-10-091-1/+5
| | | | | | | | | | Uploaded and upload_limit were added after this migration was first written. Tricky!
* | Merge remote-tracking branch 'tilly-q/OPW-Moderation-Update' into ↵Christopher Allan Webber2013-10-091-5/+9
|\ \ | | | | | | | | | merge-tillyq-moderation
| * | This was a quick update to clean up some of my templates and fix the formattingtilly-Q2013-10-081-5/+9
| | | | | | | | | | | | | | | | | | | | | in some of my other bits of code. In migrations.py, I clarified the comments & fixed the code to stay within 80 columns. In each of the templates, I fixed the spacing as well to stay within 80 columns and I also corrected my improper uses of the trans tag to ensure that these pages can be translated correctly.
* | | Adding a comment explaining what vR1 means.Christopher Allan Webber2013-10-081-0/+4
| | | | | | | | | | | | This commit sponsored by Kim Jin-hoon. Thank you!
* | | Just fixing the order of migrations and a bit of whitespace.Christopher Allan Webber2013-10-081-38/+48
| | | | | | | | | | | | This commit sponsored by Glenn McGrath. Thank you!
* | | Merge remote-tracking branch 'refs/remotes/tilly-q/OPW-Moderation-Update'Christopher Allan Webber2013-10-074-17/+426
|\| | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/user.html mediagoblin/tests/test_auth.py mediagoblin/tests/test_submission.py
| * | This was a very important update where I fixed a few small but fatal bugs in mytilly-Q2013-10-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | code. I had removed the import of Privilege in mediagoblin.db.migrations, and this was still necessary and was causing errors. I also made it so that media deletion by moderators, through reports, actually fully deleted the media, rather than just deleting the database representation of the media. Lastly, I fixed a bug in migration that caused a fatal error on login because the UserBan user_id column was improperly named in it's creation by migration.
| * | In this commit, I mostly did work on the migrations. Firstly, I droppped thetilly-Q2013-10-032-48/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | vestigial columns from the User table (ie. status, email_verified, is_admin). Otherwise, I did a lot of work converting my existing migrations from high- level ORM commands to low-level SQL commands to ensure that the migrating will work regardless of what stage their instance is working in. I also re-integrated my two registered migrations into one. Because the migration became very long, I also added a lot of clarifying documentation.
| * | This commit was solely to remove unused imports in the code that I have writtentilly-Q2013-09-232-4/+2
| | |
| * | At this point, I am very close to done with this code! I made one big change attilly-Q2013-09-232-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | paroneayea's request, which was to make to possible to turn off user's ability to file reports through a mediagoblin.ini setting. Aside from this, I had to make it possible for the Moderation User Panel to display more than 10 users. And aside from that, I just had to fix some errors which cropped up with my most recent additions. I also fixed some tests that were broken because I had changed the checks for whether or not a user is active. Nearing the end! =============================================================================== Made it possible to turn off reports through a mediagoblin.ini setting =============================================================================== --\ mediagoblin.ini --\ mediagoblin/config_spec.ini --\ mediagoblin/decorators.py --\ mediagoblin/moderation/views.py --\ mediagoblin/templates/mediagoblin/user_pages/media.html --\ mediagoblin/user_pages/views.py =============================================================================== Made User Panel capable of showing more than 1 page of users =============================================================================== --\ mediagoblin/moderation/forms.py --\ mediagoblin/moderation/views.py --\ mediagoblin/templates/mediagoblin/moderation/user_panel.html =============================================================================== Fixed Broken Tests =============================================================================== --\ mediagoblin/tests/test_notifications.py --\ mediagoblin/tests/test_openid.py --\ mediagoblin/tests/test_persona.py --\ mediagoblin/tests/test_reporting.py =============================================================================== Fixed errors in code =============================================================================== --\ mediagoblin/db/migrations.py --| Set nullable to True for MediaReports' and CommentReports' content foreign |keys --\ mediagoblin/db/models.py --| Got rid of cascading rules for MediaReports' and CommentReports' content |foreign keys. This makes it possible for the Reports to continue to exist |after the content is deleted. --\ mediagoblin/moderation/tools.py --| Fixed formatting of Report Resolution Methods --| Took out pieces of code used in debugging --\ mediagoblin/templates/mediagoblin/base.html --\ mediagoblin/templates/mediagoblin/moderation/report.html --| Made reports details page able to tell what is a deleted archived report. --\ mediagoblin/templates/mediagoblin/moderation/report_panel.html --\ mediagoblin/templates/mediagoblin/utils/report.html
| * | Merge branch 'master' into OPW-Moderation-Updatetilly-Q2013-09-122-4/+20
| |\| | | | | | | | | | | | | Conflicts: mediagoblin/db/migrations.py
| * | In this commit, I'm deleting the ArchivedReports object, at paroneyea's recom-tilly-Q2013-09-112-62/+31
| | | | | | | | | | | | -mendation. Instead, all of its functionality will be in the ReportBase object.
| * | This should be my final code update before I am ready for review! Basically, intilly-Q2013-09-102-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this update I finished the search/sort function on the Reports Panel. I also finished the Terms of Service and made the decision to remove the meta portion of the site I had planned to create. I decided that the features involved were just unnecessary at this point. I also dropped the User status column and added a migration to establish default privileges (and create the privilege foundat- -ions. I fixed a few small errors that were left over as well, in the implemen- tation and in the tests. Next, I just need to await code review and work on the documentation for these new features. I also need to supervise a new merge to master. =============================================================================== Dropped the vestigial 'status' column =============================================================================== --\ mediagoblin/db/migrations.py --\ mediagoblin/db/models.py --| Also added in comments describing the current situation with the `is_admin` | and `email_verified` columns, where they are 100% vestigial but cannot be | dropped. =============================================================================== Wrote necessary migrations to set up Privilege foundations and give users the necessary privileges on an older implementation of mediagoblin that is migrating into this update =============================================================================== --\ mediagoblin/db/migrations.py =============================================================================== Deleted the meta pages =============================================================================== --\ Deleted mediagoblin/meta/__init__.py --\ Deleted mediagoblin/meta/routing.py --\ Deleted mediagoblin/meta/views.py --\ Deleted mediagoblin/templates/mediagoblin/meta/code_of_conduct.html --\ Deleted mediagoblin/templates/mediagoblin/meta/reports_details.html --\ Deleted mediagoblin/templates/mediagoblin/meta/reports_panel.html ---------------------------------------------------------------- Moved the terms of service to /terms_of_service ---------------------------------------------------------------- --\ Moved mediagoblin/templates/mediagoblin/meta/terms_of_service.html -> mediagoblin/templates/mediagoblin/terms_of_service.html --| I decided that terms of service were really the only necessary part of my | planned "meta" pages, so I moved it instead to its own singular page --\ mediagoblin/routing.py --\ mediagoblin/static/css/base.css --\ mediagoblin/templates/mediagoblin/base.html --\ mediagoblin/views.py =============================================================================== Simplified & Finished the Reports Panel Searching =============================================================================== --\ mediagoblin/moderation/forms.py --\ mediagoblin/moderation/tools.py --\ mediagoblin/moderation/views.py --\ mediagoblin/templates/mediagoblin/moderation/report_panel.html --\ mediagoblin/templates/mediagoblin/moderation/user.html =============================================================================== Fixed Small Errors =============================================================================== --\ mediagoblin/templates/mediagoblin/user_pages/user.html --\ mediagoblin/tests/test_moderation.py --\ mediagoblin/tests/tools.py ===============================================================================
| * | This was a quick update, I mostly worked on the transition from using the oldtilly-Q2013-09-082-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User table columns (is_admin, status, email_verified) and making sure that their functionality is instead completely handled by privileges. I also worked on the meta pages which I hope to finish soon. I set up migrations to ensure the default privileges are given to users that should have them. Lastly, I made it so that banned users can log out. =============================================================================== Made Sure the Vestigial Columns of the User Table were not being Used =============================================================================== --\ mediagoblin/auth/views.py --\ mediagoblin/db/models.py --\ mediagoblin/templates/mediagoblin/base.html --\ mediagoblin/templates/mediagoblin/moderation/user.html --\ mediagoblin/templates/mediagoblin/user_pages/collection_lis$ --\ mediagoblin/templates/mediagoblin/user_pages/user.html --\ mediagoblin/tests/test_auth.py --\ mediagoblin/tests/test_persona.py --\ mediagoblin/user_pages/views.py =============================================================================== Wrote the Migrations to Set up the Default Privileges =============================================================================== --\ mediagoblin/db/migrations.py --\ mediagoblin/gmg_commands/users.py =============================================================================== Work on the Meta Pages =============================================================================== --\ mediagoblin/meta/routing.py --\ mediagoblin/meta/views.py --\ mediagoblin/static/css/base.css --\ mediagoblin/templates/mediagoblin/meta/terms_of_service.html =============================================================================== Small Changes =============================================================================== --\ mediagoblin/templates/mediagoblin/base.html --| Benevolently made it so that banned users can log out =============================================================================== X X X X X X X X X X X X X X X X X X X X ===============================================================================
| * | I did some more code-keeping in this commit. I added a lot of documentation, sotilly-Q2013-09-031-12/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that most of my functions do indeed have effective docstrings. I also changed the decorators so that they imply eachother in a logical way. I also modified the one decorator get_media_comment_by_id to be more usable with the variable urls of mediagoblin.user_pages.views:file_a_report. I also noticed a few tests had broken, so I went through them and fixed them up, finding that mostly there were problems in my actual writing of the tests. I also did a few other small tasks such as creating a new User method to check whether or not a User is ban- -ned. =============================================================================== Added in documentation =============================================================================== --\ mediagoblin/db/models.py --\ mediagoblin/decorators.py --\ mediagoblin/moderation/forms.py --\ mediagoblin/moderation/tools.py --\ mediagoblin/moderation/views.py --\ mediagoblin/user_pages/lib.py =============================================================================== Rearranged decorators to be more efficient =============================================================================== --\ mediagoblin/decorators.py --| Made it so that user_not_banned is encapsulated in require_active_login --| Made it so that require_active_login is encapsulated in user_has_privilege --| Changed get_media_comment_by_id into get_optional_media_comment_by_id. It | now returns valid code if the MediaComment id is absent. This makes it pos- | -sible to use this decorator for the function: | mediagoblin.user_pages.views:file_a_report --\ mediagoblin/user_pages/views.py --| Replaced the mediagoblin.user_pages.views:file_a_comment_report with the | decorator mentioned above --\ mediagoblin/user_pages/routing.py ----------------------------------------------------------- | took out unnecessary @user_not_banned decorators | ----------------------------------------------------------- --\ mediagoblin/submit/views.py --\ mediagoblin/user_pages/views.py =============================================================================== Fixed broken tests =============================================================================== --\ mediagoblin/tests/test_auth.py --\ mediagoblin/tests/test_privileges.py --\ mediagoblin/tests/test_submission.py =============================================================================== Fixed broken code =============================================================================== --\ mediagoblin/tools/response.py =============================================================================== Other Tasks =============================================================================== --\ mediagoblin/db/models.py --| Added in User.is_banned() method --\ mediagoblin/decorators.py --| Utitilized User.is_banned() method in the user_not_banned decorator --\ mediagoblin/moderation/views.py --| Made it impossible for an admin to ban themself. --| Got rid of a vestigial print statement --\ mediagoblin/templates/mediagoblin/base.html --| Made it so the top panel does not show up for users that are banned. --\ mediagoblin/templates/mediagoblin/moderation/user.html --| Rearranged the javascript slightly ===============================================================================
| * | This is a quick commit. I gave admins the ability to ban or unban userstilly-Q2013-08-292-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | straight from the moderation.users_detail page. I also changed the UserBan.expiration_date type from DateTime into Date. I also began work on the Terms of Service, pulled from another website (which will be cited clearly before I'm done). I added new tests as well for the ban/unbanning. Lastly, I added a few `user_not_banned` decorators to relevant views, so banned users cannot access any pages.
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-08 18:23:37 +0000