aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | fix virtualenv python interpreter and fix update targetBrandon Invergo2013-05-191-12/+19
| | | | | | | |
| | | * | | | | fix testing for db programBrandon Invergo2013-05-192-5/+6
| | | | | | | |
| | | * | | | | add Makefile.inBrandon Invergo2013-05-191-0/+186
| | | | | | | |
| | | * | | | | add configure scriptBrandon Invergo2013-05-191-0/+3919
| | | | | | | |
| | | * | | | | add pyconfigure stuffBrandon Invergo2013-05-1910-0/+12609
| | | | | | | |
| | | * | | | | add configure.acBrandon Invergo2013-05-191-0/+197
| | | | | | | |
| | | * | | | | move setup.py to setup.py.in and add macrosBrandon Invergo2013-05-191-2/+2
| | | | | | | |
| | | * | | | | Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblinBrandon Invergo2013-05-19339-16866/+31510
| | | |\ \ \ \ \
| | | * | | | | | clean upBrandon Invergo2013-05-196-8210/+0
| | | | | | | | |
| | | * | | | | | add pyconfigure stuffBrandon Invergo2012-11-127-0/+8540
| | | | | | | | |
| * | | | | | | | typo fix in foundations branchRodney Ewing2013-08-021-2/+2
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'tilly-q/ticket-679'Rodney Ewing2013-08-024-15/+86
| |\ \ \ \ \ \ \ \
| | * | | | | | | | I added a few more unitests in this commit. It now confirms that even after mi-tilly-Q2013-07-311-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -gration, there is only one of each Foundation object.
| | * | | | | | | | Merge branch 'ticket-679' of ↵tilly-Q2013-07-314-15/+76
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitorious.org:~npigeon/mediagoblin/npigeons-mediagoblin
| | | * | | | | | | | In this commit I added a few unittests to account for Foundations. There weretilly-Q2013-07-311-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only a few tests I had to add to mediagoblin/tests/test_sql_migrations.py beca- -use the foundation creation only happens at database initialization.
| | | * | | | | | | | Starting to write unit tests...tilly-Q2013-07-302-9/+12
| | | | | | | | | | |
| * | | | | | | | | | Merge commit 'refs/merge-requests/55' of ↵Rodney Ewing2013-07-313-4/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/mediagoblin/mediagoblin into 55 Conflicts: docs/source/siteadmin/relnotes.rst
| | * | | | | | | | | | Fix sphinx warnsing in docs.Sam Clegg2013-03-173-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add -W to sphinx options to avoid warnings in the future.
| * | | | | | | | | | | minor styling updates to docsRodney Ewing2013-07-311-8/+8
| | | | | | | | | | | |
| * | | | | | | | | | | Merge commit 'refs/merge-requests/59' of ↵Rodney Ewing2013-07-311-21/+62
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/mediagoblin/mediagoblin into merge-requests/59
| | * | | | | | | | | | docs: started refactoring of the deployment docs. several updates to make ↵Jim Campbell2013-05-131-21/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the configuration steps more explicit.
| * | | | | | | | | | | Why isn't .ogg in this list? A comment explains... it's detected by sniffing!Christopher Allan Webber2013-07-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit sponsored by Tom Marble. Thanks Tom!
* | | | | | | | | | | | This was a very small update, I'm hoping to rebase after this to solve sometilly-Q2013-08-2010-49/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | other problems. I started looking at the tests in this update. This update I spent fixing the tests to work with my new code. --\ mediagoblin/db/migration_tools.py --| Merging from ticket 679 --\ mediagoblin/db/migrations.py --| Added unique constraint to Privilege.privilege_name --\ mediagoblin/db/models.py --| Deleted vestigial Privilege.is_admin_or_moderator method --\ mediagoblin/templates/mediagoblin/moderation/user.html --| Add a `Ban User` / `UnBan User` for admin --\ mediagoblin/test/test_api.py --| Fixed test with my new changes --\ mediagoblin/test/test_auth.py --| Try to fix test, still having problems --\ mediagoblin/test/test_modelmethods.py --| Wrote my first test for the User.has_privilege method --\ mediagoblin/test/test_modelmethods.py --| Fixed test with my new changes --\ mediagoblin/test/test_sqlmigrations.py --| Merging from ticket 679 --\ mediagoblin/test/tools.py --| Editted add_fixture_user to allow for privileges rather than active column
* | | | | | | | | | | | This has been an update to clean out the code a little bit. The primary changetilly-Q2013-08-1325-63/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I made was I added the method has_privilege (which takes a variable amount of unicode privilege names as an argument) to the User model. This method allowed for much cleaner checks as to whether or not a user has a privilege. Other- wise, I also made it impossible for moderators to punish admins. I created a new url path and three new pages for Users to look at filed reports and the code of conduct for the mg instance. === Made reports on admins not resolvable by moderators: --\ mediagoblin/moderation/views.py --\ mediagoblin/templates/mediagoblin/moderation/report.html === Created new files for the new pages: --\ mediagoblin/meta/__init__.py --\ mediagoblin/meta/routing.py --\ mediagoblin/meta/views.py --\ mediagoblin/templates/mediagoblin/meta/code_of_conduct.html --\ mediagoblin/templates/mediagoblin/meta/reports_details.html --\ mediagoblin/templates/mediagoblin/meta/reports_panel.html --\ mediagoblin/routing.py --\ mediagoblin/static/css/base.css === Replaced vestigial methods of checking a user's privilege with the more ====== effective method has_privilege(u'privilege_name'): --\ mediagoblin/db/models.py --| Added in the has_privilege method to the User class --\ mediagoblin/db/migrations.py --\ mediagoblin/db/models.py --\ mediagoblin/decorators.py --\ mediagoblin/edit/lib.py --\ mediagoblin/edit/views.py --\ mediagoblin/gmg_commands/users.py --\ mediagoblin/moderation/views.py --\ mediagoblin/templates/mediagoblin/base.html --\ mediagoblin/templates/mediagoblin/user_pages/collection.html --\ mediagoblin/templates/mediagoblin/user_pages/media.html --\ mediagoblin/templates/mediagoblin/user_pages/user.html --\ mediagoblin/templates/mediagoblin/utils/collection_gallery.html --\ mediagoblin/user_pages/views.py === Minor UI changes --\ mediagoblin/templates/mediagoblin/moderation/report_panel.html --\ mediagoblin/templates/mediagoblin/moderation/user.html === Other Bugs: --\ mediagoblin/tools/response.py --\ mediagoblin/db/migrations.py
* | | | | | | | | | | | This commit was the work I did fixing errors that cropped up from the merge.tilly-Q2013-07-318-20/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a few errors because of the switch from sqlalchemy 0.7 to 0.8 but I cleared them up.
* | | | | | | | | | | | Merge branch 'ticket-679' into OPW-Moderation-Updatetilly-Q2013-07-29140-6033/+6689
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/auth/tools.py mediagoblin/auth/views.py mediagoblin/db/migration_tools.py mediagoblin/db/migrations.py mediagoblin/db/models.py mediagoblin/decorators.py mediagoblin/user_pages/views.py
| * | | | | | | | | | | I actually had to do a bit more work than I thought, because I needed to accounttilly-Q2013-07-292-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for plugins. In this commit I changed the MigrationManager and DatabaseData ob- jects to account for FOUNDATIONS in any plugin's (or main program's) models.py file.
| * | | | | | | | | | | This was a very simple ticket actually. I created a list called FOUNDATIONS intilly-Q2013-07-292-1/+30
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mediagoblin/db/models.py. This list holds all of the information about rows that should be created at database initialization. Read the documentation near the FOUNDATIONS list to understand the proper format for this list. All of the work is done through a new method on MigrationManager in mediagoblin/db/migrations_tools.py. This method, `populate_table_foundations` parses the FOUNDATIONS list and creates the foundations based on the data incl- uded. This only ever happens when the database is initialized. Migrations to releases with new Foundations should be very easy just using the basic database functionality.
| * | | / / / / / / / babel 1.0 doesn't have a localedata.list() method, so updated setup.py.Rodney Ewing2013-07-292-2/+2
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | made "import crypto" fully qualified
| * | | | | | | | | More up to date READMEChristopher Allan Webber2013-07-251-7/+7
| | | | | | | | | |
| * | | | | | | | | Move the "cd mediagoblin" to the right line. Thanks usrnix!Christopher Allan Webber2013-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit sponsored by Kenneth Dombrowski. Thanks!
| * | | | | | | | | Fixing docs: git submodule update, not git submodule fetch!Christopher Allan Webber2013-07-142-2/+2
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | This commit sponsored by Charles Combs. Thank you!
| * | | | | | | | Skip the openid tests if the openid module is not installed.Christopher Allan Webber2013-07-141-3/+4
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | This commit sponsored by Brandon Smith. Thank you!
| * | | | | | | Documenting the media_manager fetching hookChristopher Allan Webber2013-07-121-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit sponsored by Christian Corrodi. Thank you!
| * | | | | | | Switching the hook 'get_media_manager' to a more "directed" tuple-hookChristopher Allan Webber2013-07-128-38/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By switching this to a tuple that includes the media type in the key itself, this requires iteration and execution of functions that "check" that they are the right type. This commit sponsored by Greg Grossmeier. Thanks buddy! :)
| * | | | | | | documenting the new media_type plugins and available hooksRodney Ewing2013-07-123-19/+46
| | | | | | | |
| * | | | | | | Merge branch 'rodney757-media_plugins'Christopher Allan Webber2013-07-1224-144/+237
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin.ini mediagoblin/tests/test_mgoblin_app.ini
| | * | | | | | | Fix the last bit preventing all the unit tests from passing in media ↵Christopher Allan Webber2013-07-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types->plugins The last commit was also small, so Jeff Moe gets... two! Two sponsored commits! Ah ah ah. </count_voice>
| | * | | | | | | Switch the import of the image media manager over to the new classChristopher Allan Webber2013-07-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps resolve one of the remaining issues with the tests for the media type pluginification. This commit sponsored by Jeffrey Moe. Thanks Jeff! Lulzbot rocks!
| | * | | | | | | Changing the information spat out while printing from media types->pluginsChristopher Allan Webber2013-07-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it called even plugins media types. Ha! This commit sponsored by Jon Merkley. Thank you!
| | * | | | | | | added a warning for old media typesRodney Ewing2013-07-022-0/+30
| | | | | | | | |
| | * | | | | | | converted video media_type to pluginRodney Ewing2013-07-022-10/+33
| | | | | | | | |
| | * | | | | | | converted stl media_type to pluginRodney Ewing2013-07-022-5/+27
| | | | | | | | |
| | * | | | | | | converted pdf media_type to pluginRodney Ewing2013-07-022-6/+29
| | | | | | | | |
| | * | | | | | | converted audio media_type to pluginRodney Ewing2013-07-022-6/+29
| | | | | | | | |
| | * | | | | | | typo in image supported_filetypesRodney Ewing2013-07-021-1/+1
| | | | | | | | |
| | * | | | | | | converted ascii media_type to pluginRodney Ewing2013-07-022-6/+29
| | | | | | | | |
| | * | | | | | | fixed some typos and enabled media_type plugins in testsRodney Ewing2013-07-024-6/+8
| | | | | | | | |
| | * | | | | | | removed sniff_handler from Imange Media Manager classRodney Ewing2013-07-021-1/+0
| | | | | | | | |
| | * | | | | | | removed CompatMediaManager() since all core media_types are classesRodney Ewing2013-07-021-30/+0
| | | | | | | | |