Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into test_submission_views_365 | Chris Moylan | 2011-06-23 | 15 | -49/+509 |
|\ | |||||
| * | Remove excess grids, change CSS to center forms | Jef van Schendel | 2011-06-23 | 6 | -10/+5 |
| | | |||||
| * | Add <br /> for correct text layout | Jef van Schendel | 2011-06-23 | 1 | -1/+1 |
| | | |||||
| * | Submit form should not have edit_box class | Jef van Schendel | 2011-06-23 | 1 | -1/+1 |
| | | |||||
| * | Make several small changes to wording and top bar links | Jef van Schendel | 2011-06-23 | 3 | -7/+9 |
| | | |||||
| * | Merge remote branch 'remotes/schendje/960-grid-system' | Christopher Allan Webber | 2011-06-22 | 11 | -45/+401 |
| |\ | |||||
| | * | Switch css over to 960.gs. If I did everything right, things should look ↵ | Jef van Schendel | 2011-06-23 | 11 | -45/+401 |
| | | | | | | | | | | | | exactly the same. | ||||
| * | | Slightly clearer message about email marked as verified w/ adduser gmg command | Christopher Allan Webber | 2011-06-22 | 1 | -1/+1 |
| | | | |||||
| * | | Setting status to active when adding users with ./bin/gmg adduser | Christopher Allan Webber | 2011-06-22 | 1 | -0/+1 |
| | | | |||||
| * | | Making arguments positional and removing the "usage" functions | Christopher Allan Webber | 2011-06-22 | 1 | -76/+41 |
| | | | | | | | | | | | | | | | | | | All these arguments were required and might as well be positional thusly. If you don't provide all required positional arguments, argparser will correct you and request usage. | ||||
| * | | No need to describe usage of subcommands, gmg subcommand --help does that | Christopher Allan Webber | 2011-06-22 | 1 | -3/+3 |
| | | | |||||
| * | | Adding new function to gmg_commands, adduser,makeadmin and changepw issue 373 | Alejandro Villanueva | 2011-06-22 | 2 | -0/+141 |
| |/ | |||||
* | | Merge branch 'master' into test_submission_views_365 | Chris Moylan | 2011-06-22 | 24 | -76/+254 |
|\| | |||||
| * | Check on media['uploader']'s id rather than the username | Christopher Allan Webber | 2011-06-22 | 1 | -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 Webber | 2011-06-22 | 1 | -4/+6 |
| |\ | |||||
| | * | adds conditional for display of media edit link | Caleb Forbes Davis V | 2011-06-22 | 1 | -4/+6 |
| | | | |||||
| * | | Two not three ways to contribute now, reflecting that in docs :) | Christopher Allan Webber | 2011-06-22 | 1 | -1/+1 |
| | | | |||||
| * | | Add updates background images | Jef van Schendel | 2011-06-22 | 2 | -0/+0 |
| |/ | |||||
| * | Several small UI changes to edit profile page: moved header, changed form ↵ | Jef van Schendel | 2011-06-22 | 2 | -5/+5 |
| | | | | | | | | wording, changed css class | ||||
| * | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-22 | 2 | -2/+2 |
| |\ | |||||
| | * | Merge remote branch 'remotes/elrond/idea/invalidid' | Christopher Allan Webber | 2011-06-22 | 2 | -2/+2 |
| | |\ | |||||
| | | * | Move InvalidId to db.util | Elrond | 2011-06-20 | 2 | -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 Schendel | 2011-06-22 | 12 | -31/+161 |
| |\| | | |||||
| | * | | I don't think we need the username to be part of the profile editing URL | Christopher Allan Webber | 2011-06-21 | 2 | -4/+2 |
| | | | | |||||
| | * | | Adding an extra space between function definitions | Christopher Allan Webber | 2011-06-21 | 1 | -0/+1 |
| | | | | |||||
| | * | | Indenting some sections between if / else blocks in root.html | Christopher Allan Webber | 2011-06-21 | 1 | -16/+14 |
| | | | | |||||
| | * | | Merge remote branch 'refs/remotes/gullydwarf-cfdv/is315' | Christopher Allan Webber | 2011-06-21 | 10 | -4/+129 |
| | |\ \ | |||||
| | | * | | assigns migration steps to User database objects | cfdv | 2011-06-20 | 1 | -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, ↵ | cfdv | 2011-06-20 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | + fix whitespace issues | ||||
| | | * | | adds accommmodations for migration of fields in User: bio and url | cfdv | 2011-06-20 | 1 | -2/+18 |
| | | | | | |||||
| | | * | | Merge remote-tracking branch 'origin/master' into is315 | cfdv | 2011-06-20 | 15 | -34/+160 |
| | | |\ \ | |||||
| | | * \ \ | Merge remote-tracking branch 'origin/master' into is315 | cfdv | 2011-06-19 | 32 | -362/+710 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | * | | | enables primitive display of profile data on user page | cfdv | 2011-06-18 | 2 | -0/+37 |
| | | | | | | |||||
| | | * | | | enables entering user details including website url and bio | cfdv | 2011-06-18 | 4 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | fixes usage of objects. still need to display the data on user page | ||||
| | | * | | | baby step towards enabling profile edits | cfdv | 2011-06-18 | 6 | -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 database | cfdv | 2011-06-18 | 1 | -0/+2 |
| | | | | | | |||||
| | | * | | | adds global link to user's home page in the base.html template | cfdv | 2011-06-17 | 1 | -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 set | Christopher Allan Webber | 2011-06-21 | 2 | -7/+15 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin | Christopher Allan Webber | 2011-06-21 | 2 | -7/+29 |
| | |\ \ \ \ | |||||
| | * | | | | | Make sure we *ONLY* ever kill the test database, EVER. | Christopher Allan Webber | 2011-06-21 | 2 | -9/+9 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-21 | 3 | -7/+33 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | 333. Adds explanation of command lines; tweaks format-patch line | Will Kahn-Greene | 2011-06-21 | 2 | -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 Webber | 2011-06-21 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-21 | 2 | -1/+7 |
| |\| | | | | |||||
| * | | | | | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-20 | 40 | -392/+868 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-19 | 2 | -2/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-17 | 7 | -7/+119 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-15 | 26 | -95/+645 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-08 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Added cancel button, capitalised button labels | Jef van Schendel | 2011-06-07 | 3 | -3/+4 |
| | | | | | | | | | |