3583 Commits

Author SHA1 Message Date
Christopher Allan Webber
27fcf946d0 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!
2013-10-08 15:30:12 -05:00
Christopher Allan Webber
6180e3a915 Fixing up the email verified stuff to reflect the email_verified stuff!
This commit sponsored by Derek Holdaway.  Thanks!
2013-10-08 13:58:02 -05:00
Christopher Allan Webber
fce8e96979 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! :)
2013-10-08 11:36:18 -05:00
Christopher Allan Webber
8ac7859369 Adding a comment explaining what vR1 means.
This commit sponsored by Kim Jin-hoon.  Thank you!
2013-10-08 10:33:00 -05:00
Christopher Allan Webber
63866d806a Just fixing the order of migrations and a bit of whitespace.
This commit sponsored by Glenn McGrath.  Thank you!
2013-10-08 10:30:55 -05:00
Christopher Allan Webber
56c4ad89eb 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
2013-10-07 15:48:33 -05:00
Christopher Allan Webber
345b958871 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!
2013-10-07 14:45:50 -05:00
Christopher Allan Webber
ae51a0f0bd Fix by lennax: Fix the AC_MSG_ERROR undefined macro error.
Thanks Lennax! :)
2013-10-07 14:43:53 -05:00
tilly-Q
0a24db84c5 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.
2013-10-03 17:07:11 -04:00
tilly-Q
9519c0a91f 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.
2013-10-03 16:13:12 -04:00
Christopher Allan Webber
cfb7a4953d Okay, making the theme of video.js consistent with the theme we had previous
This commit sponsored by Christian Sasso.  Thank you!
2013-09-29 11:57:26 -05:00
Christopher Allan Webber
515e3bd9af 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!
2013-09-29 10:41:43 -05:00
Christopher Allan Webber
16ef14ba41 Merge remote-tracking branch 'spaetz/master' 2013-09-28 13:32:11 -05:00
Christopher Allan Webber
d4edbfd570 v0.5.1 release notes 2013-09-27 10:16:00 -05:00
Christopher Allan Webber
a0a31ddff7 Actually link to the script 2013-09-25 09:24:04 -05:00
tilly-Q
a523ffce3c This commit was solely to remove unused imports in the code that I have written 2013-09-23 14:10:11 -04:00
tilly-Q
6483b37060 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
2013-09-23 13:20:18 -04:00
Christopher Allan Webber
692e22d10b 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!
2013-09-20 09:51:24 -05:00
Christopher Allan Webber
d33a954cad Merge remote-tracking branch 'refs/remotes/rodney757/new_ldap'
Conflicts:
	docs/source/index.rst
	mediagoblin/templates/mediagoblin/auth/login.html
2013-09-20 07:32:52 -05:00
Christopher Allan Webber
81008d25a2 Adding the .xcf file of the MediaGoblin goblin.
This commit sponsored by Alexandre Hannud Abdo.  Thank you!
2013-09-19 18:46:46 -05:00
Christopher Allan Webber
4851fd9d15 We're no longer using this image, as awesome as it is 2013-09-19 18:43:05 -05:00
Christopher Allan Webber
201ac38895 Fixing import error after merge of basic_auth branch.
This commit sponsored by geoffrey jost.  Thank you!
2013-09-19 18:02:43 -05:00
Christopher Allan Webber
63856d4f56 Fixing error caused by merge (failure to build password editing url)
This commit sponsored by Kim Lindberger.  Thank you!
2013-09-19 18:01:49 -05:00
Christopher Allan Webber
74ae6fb0b6 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
2013-09-19 16:04:23 -05:00
Rodney Ewing
3dc6184167 remove a blank line 2013-09-19 08:18:02 -07:00
Rodney Ewing
42dbb26a13 not all JSONEncoded fields should be mutable dicts 2013-09-19 08:12:11 -07:00
Rodney Ewing
4c617543c5 skip video processing if necessary 2013-09-19 08:12:10 -07:00
Rodney Ewing
b08d2c3643 skip stl processing if necessary 2013-09-19 08:12:10 -07:00
Rodney Ewing
be49edba05 skip pdf processing if necessary 2013-09-19 08:12:10 -07:00
Rodney Ewing
2e22cefdd9 skip audio reprocessing if necessary 2013-09-19 08:12:10 -07:00
Rodney Ewing
f4f84297ef make all JSONEncoded columns mutable 2013-09-19 08:12:10 -07:00
Rodney Ewing
7f9d3ca7c9 need to use mutation tracking to detect changes in JSONEncoded types 2013-09-19 08:12:09 -07:00
Rodney Ewing
755b6a86b6 skip ascii thumb resizing if necessary 2013-09-19 08:12:09 -07:00
Rodney Ewing
b643a9cd80 skip image resizing if possible 2013-09-19 08:11:39 -07:00
Rodney Ewing
4502dfca89 get and set metadata for a MediaFile 2013-09-19 08:11:06 -07:00
Christopher Allan Webber
529eb17b38 Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing'
Conflicts:
	mediagoblin/db/migrations.py
2013-09-18 14:45:23 -05:00
Christopher Allan Webber
28eab59ace Merge remote-tracking branch 'refs/remotes/rodney757/file_limits'
Conflicts:
	mediagoblin/db/migrations.py
2013-09-18 11:21:57 -05:00
Christopher Allan Webber
81e536e1a2 Also add a bit of color to the theme's base color
This commit sponsored by Marc Lijour.  Thanks!
2013-09-15 09:54:28 -05:00
Christopher Allan Webber
a7fc4ecf40 Updating the video.js that we use to avoid an XSS attack. Yikes! ;\
This commit sponsored by Daniel Valentine.  Thank you!
2013-09-15 09:46:01 -05:00
Christopher Allan Webber
1fef79f4f8 Fix pagination for certain request.GET data
This didn't work at all nicely with MultiDict objects in various
circumstances and could possibly break pagination.  This fix handles
that!

This commit sponsored by Alessandro Francolini.  Thank you!
2013-09-13 10:16:07 -05:00
tilly-Q
045fe0ee9d Merge branch 'master' into OPW-Moderation-Update
Conflicts:
	mediagoblin/db/migrations.py
2013-09-12 18:58:04 -04:00
tilly-Q
a02831687a In this next small update, I made a few changes to protect against XXS attacks
in the moderation panel.
2013-09-12 18:16:25 -04:00
tilly-Q
c906887025 In this commit, I'm deleting the ArchivedReports object, at paroneyea's recom-
-mendation. Instead, all of its functionality will be in the ReportBase object.
2013-09-11 17:09:21 -04:00
tilly-Q
6acf4ee60e This should be my final code update before I am ready for review! Basically, in
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

===============================================================================
2013-09-10 13:17:07 -04:00
Christopher Allan Webber
66cafc3b74 Support python 2.6 again! Thanks to julianoliver for catching this.
This commit sponsored by Sam Clegg.  Thank you!
2013-09-09 10:06:59 -05:00
tilly-Q
25625107b6 This was a quick update, I mostly worked on the transition from using the old
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
===============================================================================
2013-09-08 18:26:37 -04:00
Rodney Ewing
0485e9c892 typo. conversions not convirsions
thanks to saul for pointing this out.
2013-09-06 14:28:40 -07:00
Rodney Ewing
85cf52f865 reword persona edit link 2013-09-05 09:04:23 -07:00
Christopher Allan Webber
5a756fb819 Revert "Temporarily switching git:// to http://"
This reverts commit 18922af5830f4a7686ec3b3ff11dc309a5a9cca6.
2013-09-05 09:51:22 -05:00
Christopher Allan Webber
18922af583 Temporarily switching git:// to http:// 2013-09-05 09:37:08 -05:00