aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* "Resend verification email" button should actually resend the verification emailChristopher Allan Webber2011-07-291-1/+2
|
* resend_activation should give the user a message and redirect them to their ↵Christopher Allan Webber2011-07-291-1/+7
| | | | user_home
* require_active_login now redirect's to user's homepage if not email verifiedChristopher Allan Webber2011-07-291-2/+3
|
* I think the "'s account" is a waste of spaceChristopher Allan Webber2011-07-281-1/+1
|
* I prefer it when "needs verification" looks like a button :)Christopher Allan Webber2011-07-281-1/+1
|
* A small amount of indenting in base.htmlChristopher Allan Webber2011-07-281-2/+9
|
* Give useful verification information on users that need to verify their emailChristopher Allan Webber2011-07-282-21/+50
|
* Make "needs verification" link only appear if you need verification really.Christopher Allan Webber2011-07-281-4/+9
|
* Insert links and content for ticket #387: content for verification in ↵Jef van Schendel2011-07-263-0/+23
| | | | user.html, needs-verification link in base.html, highlight class for links in base.css
* 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
| | | | | | | | | | | | | | Factoring out this one should be the last one needed to rewrite the celery setup. The idea is to not setup the whole app, but just call a bunch of individual setup_* functions and be done.
* | Fix merge conflict in user.htmlJef van Schendel2011-07-252-20/+3
|\ \
| * | Now actually apply Velmont's patch instead of just committing it ;)Christopher Allan Webber2011-07-252-20/+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
|/ /
* | User profile had the wrong {% else %} nesting.Christopher Allan Webber2011-07-241-0/+17
| | | | | | | | Thanks for the patch Velmont / Odin Hørthe Omdal!
* | Add html doctypeChristopher Allan Webber2011-07-241-1/+2
| | | | | | | | Thanks for the patch Velmont / Odin Hørthe Omdal!
* | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblinChristopher Allan Webber2011-07-241-0/+4
|\ \
| * | 333. Adds text about naming bugfix branchesWill Kahn-Greene2011-07-241-0/+4
| |/
* / Make charset utf-8.Christopher Allan Webber2011-07-241-0/+1
|/ | | | Thanks for the patch Velmont / Odin Hørthe Omdal!
* 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
| | | | | | | | | | | | Setting up the database now involves checking the migrations status and setting up the globals. Moved all of that into init/__init__.py:setup_database().
* | 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
| |
* | Added instructions on how to run mongod --repairChristopher Allan Webber2011-07-171-1/+8
| |
* | Docs: fixing an issue with being unable to install with distribute installed ↵Christopher Allan Webber2011-07-171-0/+12
| | | | | | | | | | | | already Basically, use "python bootstrap.py --distribute" if you get DistributionNotFound: distribute
* | 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
|\ | | | | | | | | | | | | | | | | Conflicts: mediagoblin/db/migrations.py mediagoblin/db/models.py mediagoblin/process_media/__init__.py mediagoblin/templates/mediagoblin/user_pages/media.html mediagoblin/util.py
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `migrations.py` * Removed empty line * Added empty line * `models.py` * Added `MediaEntry.get_display_media()` helper function * `process_media.__init__.py` * Updated `process_media_initial()` * Renamed `main` => `original`. * Added condition to `medium`, it's only created if the original dimensions exceed the MEDIUM_SIZE dimensions. * `media.html` * The image tag is now populated by `MediaEntry.get_display_media()` * `util.py` * Added `DISPLAY_IMAGE_FETCHING_ORDER`, used by `MediaEntry.get_display_media()`
* | 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-139-21/+12
| |\ \
| * \ \ Merge branch 'master' into test_submission_views_365Chris Moylan2011-07-1037-259/+316
| |\ \ \
| * | | | 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-0553-646/+1311
| |\ \ \ \
| * \ \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with my fixtures.
| * | | | | | | | Merge branch 'master' into test_submission_views_365Chris Moylan2011-06-2315-49/+509
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into test_submission_views_365Chris Moylan2011-06-2224-76/+254
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | began work on submission test. nothing to see hereChris Moylan2011-06-211-0/+45
| | | | | | | | | | |
* | | | | | | | | | | Changes clone url from http url to git urlWill Kahn-Greene2011-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cloning over http is always yuckier than cloning over git protocol.
* | | | | | | | | | | 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
| | | | | | | | | | |