Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 | |
|\| | | | | ||||||
| * | | | | Only migrate to description_html if description also exists. | Christopher Allan Webber | 2011-06-20 | 1 | -1/+2 | |
| | | | | | ||||||
| * | | | | Fix cleaned_markdown_conversion so that it doesn't bork on empty strings | Christopher Allan Webber | 2011-06-20 | 1 | -0/+5 | |
| | |_|/ | |/| | | | | | | | | | | | | | | Basically, clean_html would throw an error on '', so we just return '' "if not text" | |||||
* | | | | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-20 | 40 | -392/+868 | |
|\| | | | ||||||
| * | | | Also moving the test_server.ini to test_paste.ini to avoid ambiguity. | Christopher Allan Webber | 2011-06-20 | 2 | -1/+1 | |
| | | | | ||||||
| * | | | Moving server.ini->paste.ini because willkg points out server.ini is ambiguous | Christopher Allan Webber | 2011-06-20 | 3 | -2/+2 | |
| | | | | | | | | | | | | | | | | Updating the file, updating lazyserver.sh, updating docs. | |||||
| * | | | Updated git documentation to have more useful branch names. | Christopher Allan Webber | 2011-06-19 | 1 | -14/+14 | |
| | | | | | | | | | | | | | | | | | | | | I haven't discussed this with Will yet... if he gets unhappy we can roll back this documentation change :) | |||||
| * | | | Provide a migration to add description_html to MediaEntries that don't have it | Christopher Allan Webber | 2011-06-19 | 1 | -0/+16 | |
| | | | | ||||||
| * | | | Adds util.cleaned_markdown_conversion() and uses it in the submission process | Christopher Allan Webber | 2011-06-19 | 2 | -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 Webber | 2011-06-19 | 7 | -9/+30 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: setup.py | |||||
| | * | | | Made changes according to http://bugs.foocorp.net/issues/363#note-5 | Joar Wandborg | 2011-06-15 | 2 | -8/+12 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin | Joar Wandborg | 2011-06-15 | 24 | -153/+372 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin | Joar Wandborg | 2011-06-12 | 7 | -17/+348 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Added Markdown rendering for `media_entry` | Joar Wandborg | 2011-06-12 | 7 | -7/+24 | |
| | | | | | | | ||||||
| * | | | | | | Merge remote branch 'remotes/cmoylan/test_auth_views_364' | Christopher Allan Webber | 2011-06-19 | 1 | -6/+86 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | added test coverage for redirecting after login with the next param | Chris Moylan | 2011-06-19 | 1 | -2/+12 | |
| | | | | | | | | ||||||
| | * | | | | | | Added tests for all sorts of login form abuse. | Chris Moylan | 2011-06-19 | 1 | -6/+76 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests for log out | |||||
| * | | | | | | | Making ./runtests.sh the official way to run the tests. | Christopher Allan Webber | 2011-06-19 | 1 | -1/+1 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | ./runtests.sh: run unit tests without having to remember the long command. | Christopher Allan Webber | 2011-06-19 | 1 | -0/+30 | |
| | | | | | | | ||||||
| * | | | | | | Need to run nosetests with CELERY_CONFIG_MODULE set to from_tests again. | Christopher Allan Webber | 2011-06-19 | 3 | -8/+40 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically, if we don't do this celery sets itself up before it should and improperly. :\ | |||||
| * | | | | | | Documenting the setup_globals function. | Christopher Allan Webber | 2011-06-19 | 1 | -0/+6 | |
| | | | | | | | ||||||
| * | | | | | | Document our new global objects added during the configobj branch | Christopher Allan Webber | 2011-06-19 | 1 | -0/+8 | |
| | | | | | | | ||||||
| * | | | | | | Merge remote branch 'remotes/elrond/idea/globals_check' | Christopher Allan Webber | 2011-06-19 | 2 | -0/+18 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/tests/test_globals.py |