aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Remove excess grids, change CSS to center formsJef van Schendel2011-06-236-10/+5
| * Add <br /> for correct text layoutJef van Schendel2011-06-231-1/+1
| * Submit form should not have edit_box classJef van Schendel2011-06-231-1/+1
| * Make several small changes to wording and top bar linksJef van Schendel2011-06-233-7/+9
| * Merge remote branch 'remotes/schendje/960-grid-system'Christopher Allan Webber2011-06-2211-45/+401
| |\
| | * Switch css over to 960.gs. If I did everything right, things should look exac...Jef van Schendel2011-06-2311-45/+401
| * | Slightly clearer message about email marked as verified w/ adduser gmg commandChristopher Allan Webber2011-06-221-1/+1
| * | Setting status to active when adding users with ./bin/gmg adduserChristopher Allan Webber2011-06-221-0/+1
| * | Making arguments positional and removing the "usage" functionsChristopher Allan Webber2011-06-221-76/+41
| * | No need to describe usage of subcommands, gmg subcommand --help does thatChristopher Allan Webber2011-06-221-3/+3
| * | Adding new function to gmg_commands, adduser,makeadmin and changepw issue 373Alejandro Villanueva2011-06-222-0/+141
| |/
* | Merge branch 'master' into test_submission_views_365Chris Moylan2011-06-2224-76/+254
|\|
| * Check on media['uploader']'s id rather than the usernameChristopher Allan Webber2011-06-221-1/+1
| * Merge remote branch 'remotes/gullydwarf-cfdv/is388_only_media_owner_edits'Christopher Allan Webber2011-06-221-4/+6
| |\
| | * adds conditional for display of media edit linkCaleb Forbes Davis V2011-06-221-4/+6
| * | Two not three ways to contribute now, reflecting that in docs :)Christopher Allan Webber2011-06-221-1/+1
| * | Add updates background imagesJef van Schendel2011-06-222-0/+0
| |/
| * Several small UI changes to edit profile page: moved header, changed form wor...Jef van Schendel2011-06-222-5/+5
| * Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-222-2/+2
| |\
| | * Merge remote branch 'remotes/elrond/idea/invalidid'Christopher Allan Webber2011-06-222-2/+2
| | |\
| | | * Move InvalidId to db.utilElrond2011-06-202-2/+2
| * | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-2212-31/+161
| |\| |
| | * | I don't think we need the username to be part of the profile editing URLChristopher Allan Webber2011-06-212-4/+2
| | * | Adding an extra space between function definitionsChristopher Allan Webber2011-06-211-0/+1
| | * | Indenting some sections between if / else blocks in root.htmlChristopher Allan Webber2011-06-211-16/+14
| | * | Merge remote branch 'refs/remotes/gullydwarf-cfdv/is315'Christopher Allan Webber2011-06-2110-4/+129
| | |\ \
| | | * | assigns migration steps to User database objectscfdv2011-06-201-0/+2
| | | * | removes unecessary dependence on existence of username for User migration01, ...cfdv2011-06-201-6/+5
| | | * | adds accommmodations for migration of fields in User: bio and urlcfdv2011-06-201-2/+18
| | | * | Merge remote-tracking branch 'origin/master' into is315cfdv2011-06-2015-34/+160
| | | |\ \
| | | * \ \ Merge remote-tracking branch 'origin/master' into is315cfdv2011-06-1932-362/+710
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | enables primitive display of profile data on user pagecfdv2011-06-182-0/+37
| | | * | | enables entering user details including website url and biocfdv2011-06-184-7/+9
| | | * | | baby step towards enabling profile editscfdv2011-06-186-2/+67
| | | * | | adds user bio and website url fields to the databasecfdv2011-06-181-0/+2
| | | * | | adds global link to user's home page in the base.html templatecfdv2011-06-171-0/+2
| | * | | | Extra checks so that we don't even RUN tests unless the right celery environ setChristopher Allan Webber2011-06-212-7/+15
| | * | | | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblinChristopher Allan Webber2011-06-212-7/+29
| | |\ \ \ \
| | * | | | | Make sure we *ONLY* ever kill the test database, EVER.Christopher Allan Webber2011-06-212-9/+9
| * | | | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-213-7/+33
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | 333. Adds explanation of command lines; tweaks format-patch lineWill Kahn-Greene2011-06-212-7/+29
| | |/ / / /
| | * | | | Also fix clean_html so that it doesn't barf on an empty string.Christopher Allan Webber2011-06-211-0/+4
| * | | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-212-1/+7
| |\| | | |
| * | | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-2040-392/+868
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-192-2/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-177-7/+119
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-1526-95/+645
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-081-4/+4
| |\ \ \ \ \ \ \ \