mediagoblin:mediagoblin.git
3 years agoNow on v0.6.1, officially! v0.6.1
Christopher Allan Webber [Tue, 3 Dec 2013 18:19:48 +0000 (12:19 -0600)]
Now on v0.6.1, officially!

3 years agoRelease notes for v0.6.1, also instructions to check out a specific tag
Christopher Allan Webber [Tue, 3 Dec 2013 18:17:02 +0000 (12:17 -0600)]
Release notes for v0.6.1, also instructions to check out a specific tag

The instructions to check out a specific tag comes at the recommendation
of Mike Linksvayer.

It's only appropriate then that this sponsored commit go to Mike
Linksvayer then.  Thanks, Mike! :)

3 years agoTurning off the Terms of Service feature by default
Christopher Allan Webber [Tue, 3 Dec 2013 17:51:46 +0000 (11:51 -0600)]
Turning off the Terms of Service feature by default

This commit sponsored by Jessica Coates.  Thank you!

3 years agoWe're in the 0.6.1 dev zone! But we shouldn't stay here long ;)
Christopher Allan Webber [Tue, 3 Dec 2013 17:32:43 +0000 (11:32 -0600)]
We're in the 0.6.1 dev zone!  But we shouldn't stay here long ;)

3 years agoRemoving the assertion that this site is run by StatusNet (major oops) and adding...
Christopher Allan Webber [Tue, 3 Dec 2013 17:31:09 +0000 (11:31 -0600)]
Removing the assertion that this site is run by StatusNet (major oops) and adding <p> tags

The StatusNet one was a pretty goofy mistake.  But at least now it's fixed! :)

This commit sponsored by Jon Buckley.  Thank you!

3 years agoAt v0.6.0! Woohoo! v0.6.0
Christopher Allan Webber [Mon, 2 Dec 2013 19:55:07 +0000 (13:55 -0600)]
At v0.6.0!  Woohoo!

3 years agoAdding Asheesh Laroia to AUTHORS!
Christopher Allan Webber [Mon, 2 Dec 2013 19:54:50 +0000 (13:54 -0600)]
Adding Asheesh Laroia to AUTHORS!

3 years agoPrevious ordering seemed weird.
Christopher Allan Webber [Mon, 2 Dec 2013 19:38:45 +0000 (13:38 -0600)]
Previous ordering seemed weird.

3 years agoIncluding python-dateutil in our dependency list
Christopher Allan Webber [Mon, 2 Dec 2013 19:36:55 +0000 (13:36 -0600)]
Including python-dateutil in our dependency list

3 years agoIn the case of setuptools/sqlalchemy conflict, explain the issue
Asheesh Laroia [Mon, 2 Dec 2013 17:36:30 +0000 (12:36 -0500)]
In the case of setuptools/sqlalchemy conflict, explain the issue

This commit tri-licensed under:
  CC0 1.0, AGPLv3 or later (at your option), and Apache License 2.0

3 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Mon, 2 Dec 2013 15:29:05 +0000 (09:29 -0600)]
Committing extracted and compiled translations

3 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Mon, 2 Dec 2013 15:28:05 +0000 (09:28 -0600)]
Committing present MediaGoblin translations before pushing extracted messages

3 years agoAlso adding contributor "Josie". Not sure of full name!
Christopher Allan Webber [Mon, 2 Dec 2013 15:06:36 +0000 (09:06 -0600)]
Also adding contributor "Josie".  Not sure of full name!

3 years agomediagoblin/templates/mediagoblin/user_pages/collection.html: fix typo
Alon Levy [Sun, 1 Dec 2013 16:22:19 +0000 (10:22 -0600)]
mediagoblin/templates/mediagoblin/user_pages/collection.html: fix typo

3 years agoAdding Lenna Peterson to AUTHORS
Christopher Allan Webber [Sat, 30 Nov 2013 20:59:32 +0000 (14:59 -0600)]
Adding Lenna Peterson to AUTHORS

3 years agoLDAP readme link
Christopher Allan Webber [Sat, 30 Nov 2013 20:46:06 +0000 (14:46 -0600)]
LDAP readme link

3 years ago0.6.0 release notes
Christopher Allan Webber [Sat, 30 Nov 2013 20:45:53 +0000 (14:45 -0600)]
0.6.0 release notes

3 years agoProvide an easy option to turn off the terms of service
Christopher Allan Webber [Sat, 30 Nov 2013 20:25:29 +0000 (14:25 -0600)]
Provide an easy option to turn off the terms of service

3 years agoAdding Devan to AUTHORS
Christopher Allan Webber [Sat, 30 Nov 2013 02:27:30 +0000 (20:27 -0600)]
Adding Devan to AUTHORS

3 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Tue, 26 Nov 2013 20:00:09 +0000 (14:00 -0600)]
Committing extracted and compiled translations

3 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Tue, 26 Nov 2013 19:58:49 +0000 (13:58 -0600)]
Committing present MediaGoblin translations before pushing extracted messages

3 years agoNo need to translate a variable name alone
Christopher Allan Webber [Tue, 26 Nov 2013 19:52:08 +0000 (13:52 -0600)]
No need to translate a variable name alone

3 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Mon, 25 Nov 2013 15:38:43 +0000 (09:38 -0600)]
Committing extracted and compiled translations

3 years agoRemoving the "logging is debug by default in dbupdate"
Christopher Allan Webber [Mon, 25 Nov 2013 15:30:59 +0000 (09:30 -0600)]
Removing the "logging is debug by default in dbupdate"

This commit sponsored by David Neudorfer.  Thank you!

3 years agoMerge branch 'fix-foundations-warn'
tilly-Q [Sun, 24 Nov 2013 18:16:27 +0000 (13:16 -0500)]
Merge branch 'fix-foundations-warn'

3 years agoThis is a tiny change. I took out the warnings that were displayed when a plugin
tilly-Q [Thu, 21 Nov 2013 20:20:43 +0000 (15:20 -0500)]
This is a tiny change. I took out the warnings that were displayed when a plugin
didn't have a FOUNDATIONS dictionary because people found them annoying.

3 years agoI went through the code and just removed some blank spaces. I also looked it
tilly-Q [Tue, 19 Nov 2013 20:14:14 +0000 (15:14 -0500)]
I went through the code and just removed some blank spaces. I also looked it
thru and it looked great.

3 years agoAddressed ticket number 630 by removing MediaEntry.collected
Josie [Tue, 19 Nov 2013 01:05:15 +0000 (20:05 -0500)]
Addressed ticket number 630 by removing MediaEntry.collected

3 years agoDocumenting the command-line uploading tooling.
Christopher Allan Webber [Thu, 14 Nov 2013 20:17:18 +0000 (14:17 -0600)]
Documenting the command-line uploading tooling.

This commit sponsored by Libby Reinish.  Thank you! :)

3 years agoMaking the API make use of the new submit tooling.
Christopher Allan Webber [Thu, 14 Nov 2013 20:04:32 +0000 (14:04 -0600)]
Making the API make use of the new submit tooling.

This commit sponsored by Zakkai Kauffman-Rogoff.  Thanks! :)

3 years agoPass in request.urlgen to submit_media so it can update the feed_url stuff
Christopher Allan Webber [Thu, 14 Nov 2013 19:53:07 +0000 (13:53 -0600)]
Pass in request.urlgen to submit_media so it can update the feed_url stuff

This commit sponsored by Jesus Alberto Rodriguez Chavez.  Thank you!

3 years agoAlso switching piwigo integration of submit_media over to kwargs.
Christopher Allan Webber [Thu, 14 Nov 2013 19:47:18 +0000 (13:47 -0600)]
Also switching piwigo integration of submit_media over to kwargs.

This commit sponsored by Roberto Capone.  Thanks!

3 years agoSwitching use of submit_media to be keyword arguments in views.py.
Christopher Allan Webber [Thu, 14 Nov 2013 19:41:09 +0000 (13:41 -0600)]
Switching use of submit_media to be keyword arguments in views.py.

This should make things a bit easier for me to fiddle with argument
ordering.

This commit sponsored by Maira Sutton.  Thanks!

3 years agoSwitching the addmedia tool over to using the get_upload_file_limits tool also.
Christopher Allan Webber [Thu, 14 Nov 2013 17:09:18 +0000 (11:09 -0600)]
Switching the addmedia tool over to using the get_upload_file_limits tool also.

This commit sponsored by Damien Radtke.  Thanks!

3 years agoPorting the piwigo submit system over to using the new submit utility.
Christopher Allan Webber [Thu, 14 Nov 2013 17:07:12 +0000 (11:07 -0600)]
Porting the piwigo submit system over to using the new submit utility.

This also adds upload limit checks to the piwigo plugin!

This commit sponsored by Sam Black.  Thank you!

3 years agoBreaking out get_upload_file_limits into its own utility.
Christopher Allan Webber [Thu, 14 Nov 2013 17:06:10 +0000 (11:06 -0600)]
Breaking out get_upload_file_limits into its own utility.

This commit sponsored by Mikael Nordfeldth.  Thank you!

3 years ago--license doesn't use the user default so correct that. It does use a URL though.
Christopher Allan Webber [Thu, 14 Nov 2013 16:25:31 +0000 (10:25 -0600)]
--license doesn't use the user default so correct that.  It does use a URL though.

This commit sponsored by Benjamin Williams.  Thank you!

3 years agoA couple more adjustments for unicode'ification of some arguments.
Christopher Allan Webber [Thu, 14 Nov 2013 16:01:41 +0000 (10:01 -0600)]
A couple more adjustments for unicode'ification of some arguments.

This commit sponsored by Bruno Girin.  Thank you!

3 years agoHacks to get past unicode barriers
Christopher Allan Webber [Thu, 14 Nov 2013 15:51:29 +0000 (09:51 -0600)]
Hacks to get past unicode barriers

The methods we're using here aren't ideal but they mirror those used
in the submit views...

This commit sponsored by Alexander Couper.  Thanks!

3 years agoGeneric'ifying the submit code to not rely on the werkzeug FileStorage datastructure
Christopher Allan Webber [Thu, 14 Nov 2013 01:39:18 +0000 (19:39 -0600)]
Generic'ifying the submit code to not rely on the werkzeug FileStorage datastructure

Important, because that only makes sense for wsgi! :)

This commit sponsored by Geoff Lehr.  Thank you!

3 years agoDocstring for submit_media()
Christopher Allan Webber [Wed, 13 Nov 2013 23:25:33 +0000 (17:25 -0600)]
Docstring for submit_media()

This commit sponsored by Benjamin Prager.  Thank you!

3 years agoStart of addmedia command. Kinda close to working ;)
Christopher Allan Webber [Wed, 13 Nov 2013 19:59:16 +0000 (13:59 -0600)]
Start of addmedia command.  Kinda close to working ;)

3 years agoWeird indentation issue, fixing!
Christopher Allan Webber [Wed, 13 Nov 2013 17:53:58 +0000 (11:53 -0600)]
Weird indentation issue, fixing!

This commit sponsored by Iain Nicol.  Thank you!

3 years agoRefactoring submission utility to make it more generic! Reusable!
Christopher Allan Webber [Wed, 13 Nov 2013 16:22:46 +0000 (10:22 -0600)]
Refactoring submission utility to make it more generic!  Reusable!

This commit sponsored by Joar Wandborg.  Joar, thanks for the many
things you've done for MediaGoblin!

3 years agoStarting to split out a submit_media utility
Christopher Allan Webber [Tue, 12 Nov 2013 20:03:17 +0000 (14:03 -0600)]
Starting to split out a submit_media utility

3 years agoOh god how did I leave a pdb.set_trace() in here
Christopher Allan Webber [Sun, 10 Nov 2013 23:35:56 +0000 (17:35 -0600)]
Oh god how did I leave a pdb.set_trace() in here

Well, cleaning that up :)

This commit sponsored by Enrico Zini.  Thanks!

3 years agoApparently kombu is fine again
Christopher Allan Webber [Sun, 10 Nov 2013 18:38:49 +0000 (12:38 -0600)]
Apparently kombu is fine again

3 years agoFixing the ascii art media type. There was an ordering issue in the code.
Christopher Allan Webber [Fri, 8 Nov 2013 17:22:48 +0000 (11:22 -0600)]
Fixing the ascii art media type.  There was an ordering issue in the code.

Moved set_file_metadata till after the thumb file was created!

This commit sponsored by Samat Jain.  Thank you!

3 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Tue, 5 Nov 2013 20:45:34 +0000 (14:45 -0600)]
Committing extracted and compiled translations

3 years agoRemoving strings that should not have been translated
Christopher Allan Webber [Tue, 5 Nov 2013 20:43:01 +0000 (14:43 -0600)]
Removing strings that should not have been translated

3 years agoJust made it so the "okay to wipe your database" echo doesn't add a newline
Christopher Allan Webber [Tue, 5 Nov 2013 19:41:13 +0000 (13:41 -0600)]
Just made it so the "okay to wipe your database" echo doesn't add a newline

3 years agoMerge remote-tracking branch 'refs/remotes/tilly-q/dev_tools_environment_update'...
Christopher Allan Webber [Tue, 5 Nov 2013 19:29:40 +0000 (13:29 -0600)]
Merge remote-tracking branch 'refs/remotes/tilly-q/dev_tools_environment_update' into mergetest

3 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Mon, 4 Nov 2013 21:34:21 +0000 (15:34 -0600)]
Committing extracted and compiled translations

3 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Mon, 4 Nov 2013 21:33:28 +0000 (15:33 -0600)]
Committing present MediaGoblin translations before pushing extracted messages

3 years agoaccoutn -> account. Typo fix caught by Laura Arjona! Thanks!
Christopher Allan Webber [Mon, 4 Nov 2013 21:05:40 +0000 (15:05 -0600)]
accoutn -> account.  Typo fix caught by Laura Arjona!  Thanks!

This commit sponsored by Nick Adams!  Thank you!

3 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Mon, 4 Nov 2013 19:24:16 +0000 (13:24 -0600)]
Committing extracted and compiled translations

3 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Mon, 4 Nov 2013 19:23:17 +0000 (13:23 -0600)]
Committing present MediaGoblin translations before pushing extracted messages

3 years agoApparently we need a version of Kombu less than 3.0 for now.
Christopher Allan Webber [Mon, 4 Nov 2013 02:22:57 +0000 (20:22 -0600)]
Apparently we need a version of Kombu less than 3.0 for now.

This commit sponsored by Andrés Muñiz Piniella.  Thank you!

3 years agoRemoving duplicate views from views.py
Christopher Allan Webber [Fri, 1 Nov 2013 15:08:12 +0000 (10:08 -0500)]
Removing duplicate views from views.py

3 years agoThis commit made it so that the script now extracts two different archive. One 60
tilly-Q [Thu, 31 Oct 2013 21:10:03 +0000 (17:10 -0400)]
This commit made it so that the script now extracts two different archive. One
for the chosen database, and one for the media to go in the UserDev directory.
This will make the mg-dev-example-environments branch more efficient.

3 years agoThis was a very minor update. In the mg-dev-example-environment branch I changed
tilly-Q [Thu, 31 Oct 2013 20:19:49 +0000 (16:19 -0400)]
This was a very minor update. In the mg-dev-example-environment branch I changed
the naming system for the databases, and in this branch I just changed the
default name to the new default. The new naming system is based on migrations
not milestones.

3 years agoRemoving duplicate terms of service link in the header.
Christopher Allan Webber [Fri, 25 Oct 2013 03:42:40 +0000 (22:42 -0500)]
Removing duplicate terms of service link in the header.

My bad!  Since I moved it to the footer ;)

This commit sponsored by Sebastian Tennant.  Thanks!

3 years agoFix error in collection templates.
Devan Goodwin [Sun, 20 Oct 2013 20:06:56 +0000 (17:06 -0300)]
Fix error in collection templates.

Removed unicode strings from some recently added has_privilege calls.
Appears this is not valid syntax as it would be in the python code
itself. Causes an error showing the template:

Error - <class 'jinja2.exceptions.TemplateSyntaxError?'>: expected token
',', got 'string'

4 years agoMake showing the Terms of Service a user option, and move it to the footer.
Christopher Allan Webber [Fri, 11 Oct 2013 16:48:22 +0000 (11:48 -0500)]
Make showing the Terms of Service a user option, and move it to the footer.

This commit sponsored by Gjalt-Jorn Peters.  Thank you!

4 years agoRenaming replace_table to replace_table_hack and documenting why it's a hack
Christopher Allan Webber [Thu, 10 Oct 2013 19:22:38 +0000 (14:22 -0500)]
Renaming replace_table to replace_table_hack and documenting why it's a hack

We'd still prefer people use other solutions when possible!

This commit sponsored by Michał Masłowski.  Thank you!

4 years agoActually rename the table back, or else we just lose the old table! ;)
Christopher Allan Webber [Thu, 10 Oct 2013 19:14:32 +0000 (14:14 -0500)]
Actually rename the table back, or else we just lose the old table! ;)

4 years agoMerge remote-tracking branch 'tilly-q/merge-tillyq-moderation' into merge-tillyq...
Christopher Allan Webber [Thu, 10 Oct 2013 19:06:07 +0000 (14:06 -0500)]
Merge remote-tracking branch 'tilly-q/merge-tillyq-moderation' into merge-tillyq-moderation

4 years agoFix the create_moderation_tables migration to work with postgresql
Christopher Allan Webber [Thu, 10 Oct 2013 16:28:59 +0000 (11:28 -0500)]
Fix the create_moderation_tables migration to work with postgresql

Was comparing/assigning to integers... but that's not how postgres rolls!

4 years agoI made some changes in this commit to help out with other people trying to work
tilly-Q [Wed, 9 Oct 2013 21:11:41 +0000 (17:11 -0400)]
I made some changes in this commit to help out with other people trying to work
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.

4 years ago"Intellectual property" being a problematic term, replacing it in this document.
Christopher Allan Webber [Wed, 9 Oct 2013 19:17:13 +0000 (14:17 -0500)]
"Intellectual property" being a problematic term, replacing it in this document.

4 years agoFixing migration to account for new fields added to User model
Christopher Allan Webber [Wed, 9 Oct 2013 18:32:02 +0000 (13:32 -0500)]
Fixing migration to account for new fields added to User model

Uploaded and upload_limit were added after this migration was first written.
Tricky!

4 years agoImproving the whitespace around the {% trans %} adjustments from tilly-q
Christopher Allan Webber [Wed, 9 Oct 2013 15:37:30 +0000 (10:37 -0500)]
Improving the whitespace around the {% trans %} adjustments from tilly-q

4 years agoMerge remote-tracking branch 'tilly-q/OPW-Moderation-Update' into merge-tillyq-moderation
Christopher Allan Webber [Wed, 9 Oct 2013 15:30:19 +0000 (10:30 -0500)]
Merge remote-tracking branch 'tilly-q/OPW-Moderation-Update' into merge-tillyq-moderation

4 years agoThis was a quick update to clean up some of my templates and fix the formatting
tilly-Q [Tue, 8 Oct 2013 22:42:59 +0000 (18:42 -0400)]
This was a quick update to clean up some of my templates and fix the formatting
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.

4 years agoFixing the test_change_password test. Needed a privilege!
Christopher Allan Webber [Tue, 8 Oct 2013 20:30:12 +0000 (15:30 -0500)]
Fixing the test_change_password test.  Needed a privilege!

I'm pretty sure this should work correctly now.

This commit sponsored by Michał Masłowski.  Thanks!

4 years agoFixing up the email verified stuff to reflect the email_verified stuff!
Christopher Allan Webber [Tue, 8 Oct 2013 18:58:02 +0000 (13:58 -0500)]
Fixing up the email verified stuff to reflect the email_verified stuff!

This commit sponsored by Derek Holdaway.  Thanks!

4 years agoFixing issues in the tests caused by the OPW-Moderation-Update merge
Christopher Allan Webber [Tue, 8 Oct 2013 16:36:18 +0000 (11:36 -0500)]
Fixing issues in the tests caused by the OPW-Moderation-Update merge

Not that branch's fault!  Just both that branch and master had both done
a lot of changes to overlapping code.

self.test_user switched to self.our_user().  Updating everywhere.

This commit sponsored by Sam Kleinman.  Thank you! :)

4 years agoAdding a comment explaining what vR1 means.
Christopher Allan Webber [Tue, 8 Oct 2013 15:33:00 +0000 (10:33 -0500)]
Adding a comment explaining what vR1 means.

This commit sponsored by Kim Jin-hoon.  Thank you!

4 years agoJust fixing the order of migrations and a bit of whitespace.
Christopher Allan Webber [Tue, 8 Oct 2013 15:30:55 +0000 (10:30 -0500)]
Just fixing the order of migrations and a bit of whitespace.

This commit sponsored by Glenn McGrath.  Thank you!

4 years agoMerge remote-tracking branch 'refs/remotes/tilly-q/OPW-Moderation-Update'
Christopher Allan Webber [Mon, 7 Oct 2013 20:48:33 +0000 (15:48 -0500)]
Merge remote-tracking branch 'refs/remotes/tilly-q/OPW-Moderation-Update'

Conflicts:
mediagoblin/templates/mediagoblin/user_pages/user.html
mediagoblin/tests/test_auth.py
mediagoblin/tests/test_submission.py

4 years agoMake the develop makefile target the default.
Christopher Allan Webber [Mon, 7 Oct 2013 19:45:50 +0000 (14:45 -0500)]
Make the develop makefile target the default.

Why do ./configure && make && sudo make install if the second one make
installs, amirite? ;)

Generally I just think install should not be a default make target.

This commit sponsored by Ron Ursem.  Thank you!

4 years agoFix by lennax: Fix the AC_MSG_ERROR undefined macro error.
Christopher Allan Webber [Mon, 7 Oct 2013 19:43:53 +0000 (14:43 -0500)]
Fix by lennax: Fix the AC_MSG_ERROR undefined macro error.

Thanks Lennax! :)

4 years agoThis was a very important update where I fixed a few small but fatal bugs in my
tilly-Q [Thu, 3 Oct 2013 21:07:11 +0000 (17:07 -0400)]
This was a very important update where I fixed a few small but fatal bugs in my
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.

4 years agoIn this commit, I mostly did work on the migrations. Firstly, I droppped the
tilly-Q [Thu, 3 Oct 2013 20:13:12 +0000 (16:13 -0400)]
In this commit, I mostly did work on the migrations. Firstly, I droppped the
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.

4 years agoOkay, making the theme of video.js consistent with the theme we had previous
Christopher Allan Webber [Sun, 29 Sep 2013 16:56:48 +0000 (11:56 -0500)]
Okay, making the theme of video.js consistent with the theme we had previous

This commit sponsored by Christian Sasso.  Thank you!

4 years agoFixing ALL THE BROKEN TESTS. I probably broke most of them.
Christopher Allan Webber [Sun, 29 Sep 2013 15:41:43 +0000 (10:41 -0500)]
Fixing ALL THE BROKEN TESTS.  I probably broke most of them.

 - We've now broken out user.html and user_nonactive.html but the
   tests didn't reflect it
 - the location of one of the module imports broke, but I didn't
   notice because of .pyc files ;)

This commit sponsored by Tiberiu C. Turbureanu (ceata.org).
Thank you!

4 years agoMerge remote-tracking branch 'spaetz/master'
Christopher Allan Webber [Sat, 28 Sep 2013 18:32:11 +0000 (13:32 -0500)]
Merge remote-tracking branch 'spaetz/master'

4 years agov0.5.1 release notes
Christopher Allan Webber [Fri, 27 Sep 2013 15:16:00 +0000 (10:16 -0500)]
v0.5.1 release notes

4 years agoActually link to the script
Christopher Allan Webber [Wed, 25 Sep 2013 14:24:04 +0000 (09:24 -0500)]
Actually link to the script

4 years agoThis commit was solely to remove unused imports in the code that I have written
tilly-Q [Mon, 23 Sep 2013 18:10:11 +0000 (14:10 -0400)]
This commit was solely to remove unused imports in the code that I have written

4 years agoAt this point, I am very close to done with this code! I made one big change at
tilly-Q [Mon, 23 Sep 2013 17:20:18 +0000 (13:20 -0400)]
At this point, I am very close to done with this code! I made one big change at
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

4 years agoFixing one test post-merge. We got rid of the mongo stuff, so... consistency!
Christopher Allan Webber [Fri, 20 Sep 2013 14:51:24 +0000 (09:51 -0500)]
Fixing one test post-merge.  We got rid of the mongo stuff, so... consistency!

Now we can merge LDAP support!  Woohoo!

This commit sponsored by the ever-awesome GMG contributor, Sebastian
Spaeth.  Thanks!

4 years agoMerge remote-tracking branch 'refs/remotes/rodney757/new_ldap'
Christopher Allan Webber [Fri, 20 Sep 2013 12:32:52 +0000 (07:32 -0500)]
Merge remote-tracking branch 'refs/remotes/rodney757/new_ldap'

Conflicts:
docs/source/index.rst
mediagoblin/templates/mediagoblin/auth/login.html

4 years agoAdding the .xcf file of the MediaGoblin goblin.
Christopher Allan Webber [Thu, 19 Sep 2013 23:46:46 +0000 (18:46 -0500)]
Adding the .xcf file of the MediaGoblin goblin.

This commit sponsored by Alexandre Hannud Abdo.  Thank you!

4 years agoWe're no longer using this image, as awesome as it is
Christopher Allan Webber [Thu, 19 Sep 2013 23:43:05 +0000 (18:43 -0500)]
We're no longer using this image, as awesome as it is

4 years agoFixing import error after merge of basic_auth branch.
Christopher Allan Webber [Thu, 19 Sep 2013 23:02:43 +0000 (18:02 -0500)]
Fixing import error after merge of basic_auth branch.

This commit sponsored by geoffrey jost.  Thank you!

4 years agoFixing error caused by merge (failure to build password editing url)
Christopher Allan Webber [Thu, 19 Sep 2013 23:01:49 +0000 (18:01 -0500)]
Fixing error caused by merge (failure to build password editing url)

This commit sponsored by Kim Lindberger.  Thank you!

4 years agoMerge remote-tracking branch 'refs/remotes/rodney757/auth_refactor'
Christopher Allan Webber [Thu, 19 Sep 2013 21:04:23 +0000 (16:04 -0500)]
Merge remote-tracking branch 'refs/remotes/rodney757/auth_refactor'

Conflicts:
mediagoblin/auth/views.py
mediagoblin/edit/forms.py
mediagoblin/templates/mediagoblin/edit/edit_account.html

4 years agoremove a blank line
Rodney Ewing [Thu, 19 Sep 2013 15:18:02 +0000 (08:18 -0700)]
remove a blank line

4 years agonot all JSONEncoded fields should be mutable dicts
Rodney Ewing [Thu, 19 Sep 2013 15:02:30 +0000 (08:02 -0700)]
not all JSONEncoded fields should be mutable dicts