aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db/models.py
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into merge-python3-portChristopher Allan Webber2014-09-161-19/+201
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Has some issues, will iteratively fix! Conflicts: mediagoblin/gmg_commands/__init__.py mediagoblin/gmg_commands/deletemedia.py mediagoblin/gmg_commands/users.py mediagoblin/oauth/views.py mediagoblin/plugins/api/views.py mediagoblin/tests/test_api.py mediagoblin/tests/test_edit.py mediagoblin/tests/test_oauth1.py mediagoblin/tests/test_util.py mediagoblin/tools/mail.py mediagoblin/webfinger/views.py setup.py
| * Add __repr__ for Collection and CollectionItemOdin Hørthe Omdal2014-09-071-1/+15
| |
| * Tidy up federation code and add tests to cover more of the APIsJessica Tallon2014-08-181-10/+3
| |
| * Add a new migration which removes/fixes the old migrationChristopher Allan Webber2014-08-071-1/+1
| | | | | | | | | | | | | | The previous migration, as it turns out, was not needed, and there were many inconsistencies put in place by adding it. See issue #920. This commit sponsored by Gergő Tisza. Thank you!
| * Fix #927 - Clean up federation code after Elrond's reviewJessica Tallon2014-07-301-1/+11
| | | | | | | | | | | | | | | | - Add json_error and use inplace of json_response where appropriate. - Add garbage_collection to config spec file. - Fix bugs in both garbage collection task and test - Handle /api/whoami when no user logged in and a test for such a case. - Validate ID is correct and user has comment privilege to comment.
| * Fix #923 - add allow_admin to user_has_privilege decoratorJessica Tallon2014-07-291-14/+15
| |
| * Add __unicode__ representation to Notification and MediaCommentMixinTryggvi Bjorgvinsson2014-07-251-0/+8
| | | | | | | | | | | | Instead of having __repr__ return a unicode object which it should not do, we use the __unicode__ method to allow use of Notification and MediaCommentMixin objects in unicode strings.
| * Switch from slug to ID and clean up style to conform to PEP-8Jessica Tallon2014-07-221-2/+2
| |
| * Add unseralize for API objectsJessica Tallon2014-07-221-0/+31
| |
| * Add test for API object endpointJessica Tallon2014-07-221-0/+11
| |
| * Add more tests for federation APIsJessica Tallon2014-07-221-3/+12
| |
| * Refactors api uploading to media managersxray72242014-07-221-12/+10
| |
| * Add basic comment support and flesh out some other endpointsJessica Tallon2014-07-221-8/+1
| |
| * Add static pump_io to API and fix problem where null appeared in profileJessica Tallon2014-07-221-2/+13
| |
| * Support some webfinger API's and real profile and /api/user/<user>/xray72242014-07-221-1/+1
| |
| * Support for the comments endpointxray72242014-07-221-2/+10
| |
| * Fixes problem where full URL was being used inplace of hostxray72242014-07-221-1/+1
| |
| * 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-221-0/+6
| |
| * 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-221-0/+4
| |
| * Adds migration on MediaEntry to add uuidJessica Tallon2014-07-221-1/+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-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-171-1/+1
| | | | | | | | This commit sponsored by Emily O'Leary. Thank you!
| * Explicitly set the column names to "user" and "privilege"Christopher Allan Webber2014-06-111-0/+2
| |
| * Switch "user_id" to "privilege" and "privilege_id" to "user".Christopher Allan Webber2014-06-101-2/+2
| | | | | | | | | | | | | | | | | | 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-101-4/+2
| |\ | | | | | | | | | | | | Conflicts: mediagoblin/db/migrations.py
| | * Made the columns properly referenced in models and migrations.tilly-Q2014-04-231-4/+2
| | |
| | * Renamed the columns on core__privileges_users table so that they are unique andtilly-Q2014-04-221-2/+2
| | | | | | | | | | | | will not cause any more problems.
| * | Set a default value to MediaEntry.media_metadatatilly-Q2014-05-141-1/+2
| | |
| * | Changed the name of the metadata columntilly-Q2014-04-211-1/+1
| | |
| * | Moved the metadata column to MediaEntry rather than MediaFiletilly-Q2014-04-211-1/+1
| | |
| * | In this commit, I added a new column which will be used for RDFa metadata oftilly-Q2014-04-211-0/+1
| |/ | | | | | | media.
* | Remove sqlalchemy-migrate imports from the codebase. Do not touch tests yet.Berker Peksag2014-06-271-8/+0
| |
* | Use six.text_type instead of unicode().Berker Peksag2014-06-021-2/+2
| | | | | | | | I will be switch to use ``from __future__ import unicode_literals`` later.
* | Use six.iteritems() instead of dict.iteritems().Berker Peksag2014-05-261-2/+4
| |
* | Fix some compat issues in mediagoblin/db/models.py.Berker Peksag2014-05-081-2/+4
|/
* I went through the code and just removed some blank spaces. I also looked ittilly-Q2013-11-191-1/+1
| | | | thru and it looked great.
* Addressed ticket number 630 by removing MediaEntry.collectedJosie2013-11-181-2/+1
|
* Merge remote-tracking branch 'refs/remotes/tilly-q/OPW-Moderation-Update'Christopher Allan Webber2013-10-071-12/+227
|\ | | | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/user.html mediagoblin/tests/test_auth.py mediagoblin/tests/test_submission.py
| * In this commit, I mostly did work on the migrations. Firstly, I droppped thetilly-Q2013-10-031-6/+0
| | | | | | | | | | | | | | | | | | 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.
| * At this point, I am very close to done with this code! I made one big change attilly-Q2013-09-231-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-121-0/+1
| |\ | | | | | | | | | | | | Conflicts: mediagoblin/db/migrations.py
| * | In this commit, I'm deleting the ArchivedReports object, at paroneyea's recom-tilly-Q2013-09-111-50/+28
| | | | | | | | | | | | -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-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ===============================================================================
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-06 23:44:01 +0000