aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | This skips making an extra query to retrieve the uploader object and also checks on the canonical ID, which is probably good (even if indexing should ensure uniqueness there).
| * | | 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 ↵Jef van Schendel2011-06-222-5/+5
| | | | | | | | | | | | | | | | wording, changed css class
| * | | 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
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | Instead of import InvalidId from the low level bson module, first import it in our db.util wrapper and second import it from pymongo.errors.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds the migration_handler to the User db class, connecting the migration steps in ../db/migrations.py to the migration code in gmg_commands
| | | * | | removes unecessary dependence on existence of username for User migration01, ↵cfdv2011-06-201-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | + fix whitespace issues
| | | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes usage of objects. still need to display the data on user page
| | | * | | | baby step towards enabling profile editscfdv2011-06-186-2/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds * url and bio fields to database * form for editing the user profile * route to the edit profile controller * view for the profile editing page * template for the profile editing page * link to edit profile in the welcome page still needs * thorough inspection to see if it makes sense * tests * ?
| | | * | | | 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
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Issue #315 (add bio and website to user page) * enable profile edits * provide place in user's home page for details to appear
| | * | | | 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
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adds explanation of command lines and their arguments (gullydwarf's suggestion). * Switched the ``git format-patch ...`` line from using -o patches to using --stdout. This creates a single patch file and is (probably) easier to deal with. * Fixed a typo. * Adds toc to top of mediagoblin chapter
| | * | | | 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
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Added cancel button, capitalised button labelsJef van Schendel2011-06-073-3/+4
| | | | | | | | | |
| * | | | | | | | | Changed edit page: new background image, image is included in form, submit ↵Jef van Schendel2011-06-072-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | button text changed, title text changed, created new css class for edit forms
| * | | | | | | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-071-9/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-062-1/+38
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-0622-154/+625
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-0410-2/+203
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-033-48/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Added lines background to formsJef van Schendel2011-06-021-2/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Right-aligned input buttons, added gradientJef van Schendel2011-06-021-13/+22
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-026-9/+137
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-05-311-6/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \