aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
Commit message (Expand)AuthorAgeFilesLines
* Insert links and content for ticket #387: content for verification in user.ht...Jef van Schendel2011-07-263-0/+23
* Merge remote branch 'remotes/elrond/dev/init'Christopher Allan Webber2011-07-252-10/+19
|\
| * Move setting up of storage into init/__init__.pyElrond2011-07-182-10/+19
* | Fix merge conflict in user.htmlJef van Schendel2011-07-251-3/+3
|\ \
| * | Now actually apply Velmont's patch instead of just committing it ;)Christopher Allan Webber2011-07-251-3/+3
* | | Moved a div aroundJef van Schendel2011-07-251-11/+11
* | | Ok, so here are the actual changes. Woops!Jef van Schendel2011-07-252-37/+41
* | | Assorted style changes, small base.html changes, added new background imageJef van Schendel2011-07-251-0/+0
|/ /
* | Add html doctypeChristopher Allan Webber2011-07-241-1/+2
* | Make charset utf-8.Christopher Allan Webber2011-07-241-0/+1
|/
* Merge remote branch 'remotes/elrond/dev/init'Christopher Allan Webber2011-07-172-20/+31
|\
| * Move application level setup of database to init/Elrond2011-07-172-20/+31
* | docstring for MediaComment's structureChristopher Allan Webber2011-07-171-1/+12
* | Described the MediaEntry structure in the docstring.Christopher Allan Webber2011-07-171-6/+81
* | Docstring for the User model's various schema fieldsChristopher Allan Webber2011-07-171-0/+26
* | Finished the docstring of the creature_add_magical_powers fake migrationChristopher Allan Webber2011-07-171-1/+2
|/
* Migration for mediafiles main->originalChristopher Allan Webber2011-07-171-0/+16
* Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'Christopher Allan Webber2011-07-164-20/+46
|\
| * Removed debug code, erroneously included in my last commitJoar Wandborg2011-07-031-1/+1
| * Feature #400 - Resize images to fit on page - AdditionsJoar Wandborg2011-07-035-21/+44
* | Merge remote branch 'remotes/cmoylan/test_submission_views_365'Christopher Allan Webber2011-07-166-0/+157
|\ \
| * \ Merge branch 'master' into test_submission_views_365Chris Moylan2011-07-137-19/+7
| |\ \
| * \ \ Merge branch 'master' into test_submission_views_365Chris Moylan2011-07-1035-259/+308
| |\ \ \
| * | | | added suggestions as per http://bugs.foocorp.net/issues/365#note-9Chris Moylan2011-07-101-47/+41
| * | | | finished basic submission testingChris Moylan2011-07-056-12/+94
| * | | | Merge branch 'master' into test_submission_views_365Chris Moylan2011-07-0545-640/+1230
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into test_submission_views_365Chris Moylan2011-06-307-91/+113
| |\ \ \ \ \
| * | | | | | mocked out submission specChris Moylan2011-06-301-3/+37
| * | | | | | Merge branch 'master' into test_submission_views_365Chris Moylan2011-06-295-11/+161
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into test_submission_views_365Chris Moylan2011-06-2820-78/+515
| |\ \ \ \ \ \ \
| * | | | | | | | removed the @setup_fresh_app decorator because it was messing \Chris Moylan2011-06-231-3/+5
| * | | | | | | | Merge branch 'master' into test_submission_views_365Chris Moylan2011-06-2315-49/+509
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into test_submission_views_365Chris Moylan2011-06-2222-68/+224
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | began work on submission test. nothing to see hereChris Moylan2011-06-211-0/+45
* | | | | | | | | | | Use cleaned_markdown_conversion in both cases in edit/views.pyChristopher Allan Webber2011-07-141-11/+6
* | | | | | | | | | | app.py and migrate.py must import migrations in order to load said migrations...Christopher Allan Webber2011-07-142-1/+6
* | | | | | | | | | | First migration: Add markdown bio!Christopher Allan Webber2011-07-141-3/+17
* | | | | | | | | | | Indenting section in the autoscape blockChristopher Allan Webber2011-07-131-1/+1
* | | | | | | | | | | Merge remote branch 'remotes/aaronw/feature410_markdown_bio'Christopher Allan Webber2011-07-133-4/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Markdown-enable user bio (Feature 410)Aaron Williamson2011-07-103-4/+9
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'master' into f411_new_migrationsChristopher Allan Webber2011-07-1310-60/+83
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | removed email variables from globals moduleDeb2011-07-124-16/+4
| * | | | | | | | | | Move db_name default into config_spec.iniElrond2011-07-113-3/+3
| |/ / / / / / / / /
| * | | | | | | | | Sorry, that OptionalField belonged there.Christopher Allan Webber2011-07-091-1/+2
| * | | | | | | | | <Elrond> Oh well... Did I really have this wtforms cruft in my setup_workbenchChristopher Allan Webber2011-07-091-2/+1
| * | | | | | | | | Added a note about workbench only currently being used by celeryChristopher Allan Webber2011-07-091-0/+3
| * | | | | | | | | Merge remote branch 'remotes/elrond/dev/init'Christopher Allan Webber2011-07-092-34/+56
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Factor setup_workbench into init submodule.Elrond2011-07-073-5/+15
| | * | | | | | | | | Let setup_global_and_app_config call setup_globalsElrond2011-07-052-3/+5
| | * | | | | | | | | Create setup_global_and_app_configElrond2011-07-042-14/+16