aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
Commit message (Collapse)AuthorAgeFilesLines
* This was a very important update where I fixed a few small but fatal bugs in mytilly-Q2013-10-032-4/+4
| | | | | | | | | 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-2310-25/+11
|
* At this point, I am very close to done with this code! I made one big change attilly-Q2013-09-2318-122/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-12123-6899/+22830
|\ | | | | | | | | Conflicts: mediagoblin/db/migrations.py
| * Support python 2.6 again! Thanks to julianoliver for catching this.Christopher Allan Webber2013-09-091-2/+11
| | | | | | | | This commit sponsored by Sam Clegg. Thank you!
| * typo. conversions not convirsionsRodney Ewing2013-09-062-2/+2
| | | | | | | | thanks to saul for pointing this out.
| * reword persona edit linkRodney Ewing2013-09-051-5/+4
| |
| * In the v0.6.0 cycle nowChristopher Allan Webber2013-09-051-1/+1
| |
| * MediaGoblin v0.5.0!Christopher Allan Webber2013-09-041-1/+1
| |
| * Committing extracted and compiled translationsChristopher Allan Webber2013-09-042-1/+1
| |
| * Committing present MediaGoblin translations before pushing extracted messagesChristopher Allan Webber2013-09-041-4/+4
| |
| * Committing extracted and compiled translationsChristopher Allan Webber2013-09-0467-798/+798
| |
| * Committing present MediaGoblin translations before pushing extracted messagesChristopher Allan Webber2013-09-048-496/+499
| |
| * Fixing tyop. Thanks for catching, tryggvib :)Christopher Allan Webber2013-09-041-1/+1
| |
| * need to send the users email to persona if the user logged in with persona.Rodney Ewing2013-09-043-1/+12
| | | | | | | | Thanks callahad for pointing this out.
| * Improve checkbox descriptionSebastian Spaeth2013-09-041-1/+1
| | | | | | | | Do not Enable/Disable next to a checkbox. So what does an enabled checkbox do then?
| * Merge remote-tracking branch 'refs/remotes/spaetz/fix_docs'Christopher Allan Webber2013-09-041-1/+1
| |\
| | * 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.
| * | Add site name, logo, and background for PersonaDan Callahan2013-09-031-2/+8
| |/
| * should use public_store.file_exists to check if the file copied correctlyRodney Ewing2013-09-021-2/+1
| |
| * didn't remove form.new_email when change email was moved to its own viewRodney Ewing2013-08-311-11/+7
| |
| * pdf media_type now have their own config_spec.iniRodney Ewing2013-08-293-5/+6
| |
| * ascii media_type now have their own config_spec.iniRodney Ewing2013-08-293-5/+6
| |
| * audio media_type now have their own config_spec.iniRodney Ewing2013-08-293-8/+9
| |
| * video media_type now have their own config_spec.iniRodney Ewing2013-08-295-24/+25
| |
| * image media_type now have their own config_spec.iniRodney Ewing2013-08-293-8/+9
| |
| * Fix failing to build docsChristopher Allan Webber2013-08-281-12/+14
| |
| * Should fix Beuc's bug with video thumbnail width... I think!Christopher Allan Webber2013-08-281-1/+1
| |
| * Committing extracted and compiled translationsChristopher Allan Webber2013-08-2667-499/+1113
| |
| * Committing present MediaGoblin translations before pushing extracted messagesChristopher Allan Webber2013-08-263-124/+124
| |
| * Fixing another typo, thanks to Laura Arjona (again!)Christopher Allan Webber2013-08-261-1/+1
| |
| * Fixing typo. Thanks larjona!Christopher Allan Webber2013-08-261-1/+1
| |
| * Committing extracted and compiled translationsChristopher Allan Webber2013-08-2665-6186/+16015
| |
| * Committing present MediaGoblin translations before pushing extracted messagesChristopher Allan Webber2013-08-264-59/+3813
| |
| * Removing unnecessary "setup_plugin()" calls, as pointed out by Velmont.Christopher Allan Webber2013-08-255-30/+4
| |
| * Merge remote-tracking branch 'refs/remotes/rodney757/email'Christopher Allan Webber2013-08-257-48/+127
| |\
| | * move links to the bottom of the page until we have a tabbed UIRodney Ewing2013-08-202-18/+15
| | |
| | * fix tests to use new change_email viewRodney Ewing2013-08-201-4/+4
| | |
| | * check for form.password in the off chance that a user is logged in and the ↵Rodney Ewing2013-08-201-1/+1
| | | | | | | | | | | | server switches the authentication method from basic_auth to openid.
| | * maybe have change password and email on same pageRodney Ewing2013-08-205-31/+113
| | |
| * | Not sure why there wasn't a .commit() at the end of ↵Christopher Allan Webber2013-08-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | add_new_notification_tables() ... but it seems like there should be and it wouldn't hurt. This commit sponsored by Julio Claudio Matus Ramirez. Thank you!
| * | Merge remote-tracking branch 'refs/remotes/rodney757/notifications'Christopher Allan Webber2013-08-2111-14/+133
| |\ \
| | * | request object no longer contains notification functionsRodney Ewing2013-08-201-3/+4
| | | |
| | * | add user prefrence for insite notificationsRodney Ewing2013-08-205-5/+36
| | | |
| | * | use urlgen and store it in a variableRodney Ewing2013-08-202-1/+4
| | | |
| | * | added test for mark all comment notifications seenRodney Ewing2013-08-201-0/+53
| | | |
| | * | Pep 8Rodney Ewing2013-08-201-8/+4
| | | |
| | * | add the ability to mark all notifications read.Rodney Ewing2013-08-204-1/+36
| | |/
| * | only use the width for video thumbnails to keep the correct scalingRodney Ewing2013-08-211-4/+3
| | |