4173 Commits

Author SHA1 Message Date
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
Aditi Mittal
bca32cd474 Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin 2013-09-18 22:23:36 +05:30
Aditi Mittal
4346331c2a Write template to render blog about page. 2013-09-18 22:20:58 +05:30
Aditi Mittal
9d0627e068 Change the text of url to blogs on user profile page. 2013-09-18 22:19:58 +05:30
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
Aditi Mittal
c3218c0574 Url mapping for blog about page. 2013-09-18 21:05:41 +05:30
Aditi Mittal
52042905e2 Add view button and create blog button on blogs dashboard. 2013-09-18 21:04:16 +05:30
Aditi Mittal
f793af647a Add url to blog post listing page on blog dashboard of a blog. 2013-09-18 21:02:30 +05:30
Aditi Mittal
310c3073b8 Write view for blog about page. 2013-09-18 20:59:27 +05:30
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
Aditi Mittal
5e055893ba Separate Create Blog and Blog Dashboard links on the home page. 2013-09-15 18:00:13 +05:30
Aditi Mittal
092938741e Introduce new generic header_actions template_hook. 2013-09-15 17:24:26 +05:30
Aditi Mittal
bb96b7d4a3 Replace tabs with spaces in blog.__init__. 2013-09-15 17:23:06 +05:30
Aditi Mittal
0b7c64c8c8 Change blogs query object to list object by .all() function in blog_dashboard view. 2013-09-15 14:49:56 +05:30
Aditi Mittal
a46c23e042 Capitalize blog title. 2013-09-15 14:48:56 +05:30
Aditi Mittal
291ae79833 Add buton to create a blog. 2013-09-15 14:24:44 +05:30
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
Aditi Mittal
728516261a Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin 2013-09-09 21:53:56 +05:30
Aditi Mittal
5d9ecb05dd Add ConfirmDeleteForm and URL mapping for blog_delete view 2013-09-09 21:52:00 +05:30
Aditi Mittal
4aa7058e48 Write view function for blog deletion 2013-09-09 21:49:44 +05:30
Aditi Mittal
caeab88f88 Write code for deleting a blog 2013-09-09 21:48:02 +05:30
Aditi Mittal
3357b8a3b5 Write template for confirmation for blog deletion and add blog delete button on blog dashboard. 2013-09-09 21:46:23 +05:30
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
Aditi Mittal
125d7d1a85 Get max_blog_count variable from config_spec.ini file using pluginapi config. 2013-09-08 02:28:48 +05:30
Aditi Mittal
ae71a3a1d6 Reindentation 2013-09-07 13:45:27 +05:30
Aditi Mittal
414c25c5a4 Add user to invidual blog dashboard context. 2013-09-07 13:44:27 +05:30
Aditi Mittal
5278c6dd80 Correct template syntax error. 2013-09-07 13:13:08 +05:30