aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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-2010-17/+142
| | | |\ \ \
| | | * \ \ \ Merge remote-tracking branch 'origin/master' into is315cfdv2011-06-1926-312/+588
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | 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
| | | | | |
| | * | | | 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-211-0/+4
| |\| | | |
| | * | | | 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-2033-328/+731
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-191-2/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-175-5/+116
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-1520-61/+461
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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-0620-153/+623
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ 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-025-7/+135
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-05-311-6/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Improved object_gallery.html spacingJef van Schendel2011-05-312-10/+13
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | began work on submission test. nothing to see hereChris Moylan2011-06-211-0/+45
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Only migrate to description_html if description also exists.Christopher Allan Webber2011-06-201-1/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fix cleaned_markdown_conversion so that it doesn't bork on empty stringsChristopher Allan Webber2011-06-201-0/+5
| |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically, clean_html would throw an error on '', so we just return '' "if not text"
* | | | | | | | | | | | | | Also moving the test_server.ini to test_paste.ini to avoid ambiguity.Christopher Allan Webber2011-06-202-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Provide a migration to add description_html to MediaEntries that don't have itChristopher Allan Webber2011-06-191-0/+16
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Adds util.cleaned_markdown_conversion() and uses it in the submission processChristopher Allan Webber2011-06-192-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies the markdown processing & html cleaning of descritions and etc by providing a wrapper function that we can use in multiple locations.
* | | | | | | | | | | | | | Merge remote branch 'remotes/jwandborg/issue_363'Christopher Allan Webber2011-06-196-9/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: setup.py
| * | | | | | | | | | | | | | Made changes according to http://bugs.foocorp.net/issues/363#note-5Joar Wandborg2011-06-152-8/+12
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblinJoar Wandborg2011-06-1518-119/+188
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblinJoar Wandborg2011-06-127-17/+348
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Added Markdown rendering for `media_entry`Joar Wandborg2011-06-126-7/+23
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge remote branch 'remotes/cmoylan/test_auth_views_364'Christopher Allan Webber2011-06-191-6/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | added test coverage for redirecting after login with the next paramChris Moylan2011-06-191-2/+12
| | | | | | | | | | | | | | |