aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Merge branch 'master' into configobjChristopher Allan Webber2011-06-188-7/+120
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | Conflicts: setup.py
| | * | | | | Configuration file loading via ConfigObj.Christopher Allan Webber2011-06-161-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses ConfigObj to open the config file. Also does validation via the config spec, so defaults are provided, strings are interpolated, types are converted.
| | * | | | | Basic config "requirements" file.Christopher Allan Webber2011-06-151-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not used yet, but this will be used by ConfigObj to transform values, set defaults, etc.
| | * | | | | Require ConfigObjChristopher Allan Webber2011-06-151-0/+1
| | | |_|_|/ | | |/| | |
* | | | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-192-2/+1
|\| | | | |
| * | | | | Removing unused pkg_resources import from test_celery_setupChristopher Allan Webber2011-06-181-2/+0
| | |/ / / | |/| | |
| * | | | We require lxml. Updating setup.py to reflect that.Christopher Allan Webber2011-06-171-0/+1
| | | | |
* | | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-177-7/+119
|\| | | |
| * | | | Merge remote branch 'remotes/cmoylan/test_auth_views_364'Christopher Allan Webber2011-06-172-6/+45
| |\ \ \ \
| | * | | | logins are now somewhat testedChris Moylan2011-06-171-5/+43
| | | | | |
| | * | | | added vim swapfiles to gitignoreChris Moylan2011-06-161-1/+2
| | |/ / /
| * | | | Merge remote branch 'remotes/gullydwarf-cfdv/is330'Christopher Allan Webber2011-06-164-0/+73
| |\ \ \ \
| | * | | | adds link from gallery back to user pagecfdv2011-06-161-1/+3
| | | | | |
| | * | | | adds link to user gallery in mediagoblin_header_right of user pagecfdv2011-06-161-0/+2
| | | | | |
| | * | | | user_gallery controller calls render_to_reponsecfdv2011-06-161-9/+6
| | | | | |
| | * | | | adds routing.py and view.py changescfdv2011-06-162-0/+32
| | | | | |
| | * | | | issue #330 - creates a user gallery templateCaleb Forbes Davis V2011-06-161-0/+40
| | |/ / /
| * / / / Recommending --set-upstream when doing a git push to a feature branch.Christopher Allan Webber2011-06-161-1/+1
| |/ / / | | | | | | | | | | | | | | | | This is nice because it means git will tell you when your branch is ahead/behind by several commits, assuming you keep working on it.
* | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-1526-95/+645
|\| | |
| * | | Merge remote branch 'remotes/elrond/dev/workbench_class'Christopher Allan Webber2011-06-143-67/+78
| |\ \ \
| | * | | Move destroy_workbench to Workbench classElrond2011-06-143-37/+25
| | | | | | | | | | | | | | | | | | | | | | | | | And add a lot of warnings, as the checks for "being part of the main Manager" are all gone.
| | * | | Drop WorkbenchManager.localized_file()Elrond2011-06-142-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As Workbench has the localized_file() method, use this everywhere and drop the wrapper method from WorkbenchManager. The processing code already did that.
| | * | | Create a Workbench class and use it everywhere.Elrond2011-06-133-45/+72
| | | | | | | | | | | | | | | | | | | | | | | | | Some references to Workbench.dir look ugly, I'm happy to hear suggestions there.
| * | | | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblinChristopher Allan Webber2011-06-136-2/+22
| |\ \ \ \
| | * | | | Adds local toc sectionsWill Kahn-Greene2011-06-135-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Some of our chapters are pretty long and this should make it much easier for a user to find what they're looking for and jumping to it. It's easier to read the section toc at the top of the chapter, than it is to read it in the sidebar.
| | * | | | Updates version in docsWill Kahn-Greene2011-06-131-2/+2
| | | | | |
| * | | | | A super strict HTML cleaner method with mediocre tests.Christopher Allan Webber2011-06-132-0/+46
| |/ / / /
| * | | | Already mentioned, but clarifying that branches should be localized toChristopher Allan Webber2011-06-131-3/+3
| | | | | | | | | | | | | | | | | | | | a feature/bugfix/issue.
| * | | | Tweaks git workflow structureWill Kahn-Greene2011-06-121-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | * minor tweaking of the headers of the git workflow to break things up and organize them a bit better
| * | | | Fixes git workflowWill Kahn-Greene2011-06-121-30/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * overhauls the docs so they're (hopefully) clearer on the git workflow * adds text about putting things in bugfix branches, documenting your work, and using the issue tracker * adds a contrived example that uses aliens
| * | | | Merge remote branch 'remotes/elrond/idea/simple_proc_media_clean'Christopher Allan Webber2011-06-121-8/+10
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: mediagoblin/process_media/__init__.py
| | * | | Refactor filename generation in the public storeElrond2011-06-081-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Just a small refactoring of the filename setup in the public store. Very simple.
| * | | | ensure color mode compatibility when making image thumbnailscfdv2011-06-121-0/+3
| | | | |
| * | | | First import of mg_globals as mgg, partly because I just wanted it toChristopher Allan Webber2011-06-121-11/+11
| | | | | | | | | | | | | | | | | | | | be clear that it's okay to do by doing it *somewhere* :)
| * | | | mediagoblin.globals->mediagoblin.mg_globalsChristopher Allan Webber2011-06-1214-35/+32
| | | | |
| * | | | Merge remote branch 'remotes/elrond/idea/clean_celery_setup'Christopher Allan Webber2011-06-122-6/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/celery_setup/from_celery.py
| | * | | | celery_setup: drop param to setup_self and simplify OUR_MODULENAMEElrond2011-06-102-7/+5
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup_self used to look like this: setup_self(setup_globals_func=setup_globals) The function isn't called with any param, so drop it. Rewrite function as needed. The module var OUR_MODULENAME just has the module's name in it. This is available as __name__ anyway, so use this to initialize the var.
| * | | | Merge remote branch 'remotes/elrond/idea/tests_kill_db'Christopher Allan Webber2011-06-121-0/+11
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Tests: Kill the whole testing database after all testsElrond2011-06-101-0/+11
| | |/ / | | | | | | | | | | | | | | | | | | | | nose allows setup and teardown functions at the package level. So use this to drop the complete database after all tests have finished.
| * | | possibly_localize_file->localized_file... a bit less terribly long.Christopher Allan Webber2011-06-113-13/+13
| | | |
| * | | Switch process_media over to using the workbench.Christopher Allan Webber2011-06-111-2/+11
| | | |
| * | | Don't bother returning whether or not we copied it or not, we canChristopher Allan Webber2011-06-112-17/+11
| | | | | | | | | | | | | | | | figure that out by looking to see whether our storage is local or not.
| * | | Moving workbench out of process_mediaChristopher Allan Webber2011-06-114-5/+3
| | | |
| * | | Merge branch 'master' into workbenchChristopher Allan Webber2011-06-111-9/+10
| |\ \ \
| | * | | Import mediagoblin.globals as mg_globals so we can be sure things areChristopher Allan Webber2011-06-111-9/+10
| | |/ / | | | | | | | | | | | | set up in the right order.
| * | | Have the application set up instances of the WorkbenchManager.Christopher Allan Webber2011-06-112-5/+16
| | | |
| * | | test WorkbenchManager.possibly_localize_file()Christopher Allan Webber2011-06-111-0/+43
| | | |
| * | | We don't need this extra '.' in making the filenameChristopher Allan Webber2011-06-111-1/+1
| | | |
| * | | Added a FakeRemoteStorage, for testing purposesChristopher Allan Webber2011-06-111-2/+10
| | | |
| * | | Make sure workbench won't kill directories out of scope.Christopher Allan Webber2011-06-111-6/+16
| | | |