aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | 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
* | | | | Make sure we *ONLY* ever kill the test database, EVER.Christopher Allan Webber2011-06-212-9/+9
|/ / / /
* | | | Also fix clean_html so that it doesn't barf on an empty string.Christopher Allan Webber2011-06-211-0/+4
| | | |
* | | | 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
| | |
* | | Moving server.ini->paste.ini because willkg points out server.ini is ambiguousChristopher Allan Webber2011-06-203-2/+2
| | | | | | | | | | | | Updating the file, updating lazyserver.sh, updating docs.
* | | Updated git documentation to have more useful branch names.Christopher Allan Webber2011-06-191-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 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-197-9/+30
|\ \ \ | | | | | | | | | | | | | | | | 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-1524-153/+372
| |\ \ \
| * \ \ \ Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblinJoar Wandborg2011-06-127-17/+348
| |\ \ \ \
| * | | | | Added Markdown rendering for `media_entry`Joar Wandborg2011-06-127-7/+24
| | | | | |
* | | | | | 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
| | | | | | |
| * | | | | | Added tests for all sorts of login form abuse.Chris Moylan2011-06-191-6/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests for log out
* | | | | | | Making ./runtests.sh the official way to run the tests.Christopher Allan Webber2011-06-191-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | ./runtests.sh: run unit tests without having to remember the long command.Christopher Allan Webber2011-06-191-0/+30
| | | | | |
* | | | | | Need to run nosetests with CELERY_CONFIG_MODULE set to from_tests again.Christopher Allan Webber2011-06-193-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 Webber2011-06-191-0/+6
| | | | | |
* | | | | | Document our new global objects added during the configobj branchChristopher Allan Webber2011-06-191-0/+8
| | | | | |
* | | | | | Merge remote branch 'remotes/elrond/idea/globals_check'Christopher Allan Webber2011-06-192-0/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/tests/test_globals.py
| * | | | | | Let setup_globals check for known globalsElrond2011-06-122-0/+18
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid typos in calling setup_globals(), only allow globals, which are already known to the system. Plugins should have their own globals.
* | | | | | Reset the globals parameters while testing parametersChristopher Allan Webber2011-06-191-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (This way we can be sure that the database is torn down if necessary but this was the only test that passed last.)
* | | | | | Re-commenting-out lxml from setup.pyChristopher Allan Webber2011-06-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarifying that this is something to install from the package manager and not via python setuptools itself.
* | | | | | Updated hacking howto to reflect our new, easier to run lazyserver.sh command.Christopher Allan Webber2011-06-191-15/+17
| | | | | |
* | | | | | ./lazyserver.sh: launch a server in the most basic way possibleChristopher Allan Webber2011-06-191-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks for paster either in buildout or in virtualenv / on the path, wherever it seems to be.
* | | | | | Actually we need pkg_resources again in test_celery_setup :)Christopher Allan Webber2011-06-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This got removed in master at the same time that it got used in the configobj branch...
* | | | | | Merge branch 'configobj'Christopher Allan Webber2011-06-1928-363/+574
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Adjusting hackinghowto docs to reflect change in server/tests commandsChristopher Allan Webber2011-06-191-3/+3
| | | | | |
| * | | | | Removing a couple of unused imports from util.pyChristopher Allan Webber2011-06-191-2/+0
| | | | | |
| * | | | | Removing "paste config" phrasing where we're no longer using paste's configChristopher Allan Webber2011-06-191-3/+3
| | | | | |
| * | | | | renaming storage_system_from_paste_config()->storage_system_from_config()Christopher Allan Webber2011-06-193-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As Elrond points out, this name doesn't make sense anymore since this isn't based on the paste config. Thanks Elrond!
| * | | | | util.read_config_file() no longer needed; removing.Christopher Allan Webber2011-06-191-22/+0
| | | | | |