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! :)
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!
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.
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.
- 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!
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
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!
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
===============================================================================
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
===============================================================================