aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-212-1/+7
|\
| * 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"
* | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-2040-392/+868
|\|
| * 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
| | | | | |
| | * | | | Preparing celery unit tests for new setup.Christopher Allan Webber2011-06-184-17/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of the previous passing in of dictionaries, we're actually checking some example config files.
| | * | | | ./bin/gmg commands upgraded to work with the new setup.Christopher Allan Webber2011-06-183-25/+1
| | | | | |
| | * | | | Nosetests should now be able to run using the new configobj / app init setupChristopher Allan Webber2011-06-184-68/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lots of changes: - CELERY_CONFIG_FILE does not need to be set to the from_tests module to run tests anymore, in fact it *should not be set at all* and is specifically forbidden. - moved around the configuration to the new 2-file format - and generally adjusting the code appropriately.
| | * | | | Only kill the database if it's really set up.Christopher Allan Webber2011-06-181-3/+4
| | | | | |
| | * | | | It's a good idea for us to pass the application itself into mg_globals :)Christopher Allan Webber2011-06-181-0/+1
| | | | | |
| | * | | | Updating celery_setup.from_celery to use new config loading / app initChristopher Allan Webber2011-06-181-54/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The code for this is significantly simpler now. The app sets up everything but celery, and from_celery finishes the job. - There's no more specifying the mediagoblin section in the file, which doesn't make sense anymore and was already confusing.
| | * | | | Removing option to set celery config section.Christopher Allan Webber2011-06-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no real reason to support setting the celery config section; so we'll just make it always ['celery'].
| | * | | | Removing type conversions from setup_celery_from_config.Christopher Allan Webber2011-06-181-64/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These simply aren't needed any more, not now that the config validator stuff does type conversion for us. Also fixed the docstring to explain force_celery_always_eager.
| | * | | | Erk! Forgot to include the new mediagoblin.ini.Christopher Allan Webber2011-06-181-0/+15
| | | | | |
| | * | | | Move entire app structure over to using the new config system.Christopher Allan Webber2011-06-183-74/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a huge change! This means several things. - From the python point of view, launching the application is a heck of a lot cleaner. You just need to pass in the config file path to MediaGoblinApp's __init__() and whether or not this funtion should setup celery and you're good. - There are now two separate config files, separating the server setup from the application setup. - server.ini: the paste deploy config file, which configures the applications and server setup but *NOT* the mediagoblin application itself. - mediagoblin.ini: where you configure mediagoblin (and possibly celery) - Launching the application is now different. Instead of: ./bin/paster serve mediagoblin.ini --reload We launch like: ./bin/paster serve server.ini --reload
| | * | | | Tests for mediagoblin.config functionsChristopher Allan Webber2011-06-185-0/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests for: - read_mediagoblin_config() - generate_validation_report()
| | * | | | CONFIG_SPEC_PATH should be config_spec here, fixing.Christopher Allan Webber2011-06-181-1/+1
| | | | | |
| | * | | | Make REPORT_HEADER a unicode string also. Unicode everywhere, ideally!Christopher Allan Webber2011-06-181-1/+1
| | | | | |
| | * | | | Validation error reporting functionality.Christopher Allan Webber2011-06-181-6/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed a few things so we can report errors to users properly in the config loading system. - We now return from read_mediagoblin_config both a loaded config and the validation results - We now have a helper function generate_validation_report that can generate a proper validation report saying if there are errors in a way that's useful to users. - Moved conf->config in the read_mediagoblin_config function, which looks nicer IMO.
| | * | | | Let's specifically import string_list()s in the config_spec.Christopher Allan Webber2011-06-181-2/+2
| | | | | |