Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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" | ||||
* | Also moving the test_server.ini to test_paste.ini to avoid ambiguity. | Christopher Allan Webber | 2011-06-20 | 2 | -1/+1 |
| | |||||
* | 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 | 6 | -9/+29 |
|\ | | | | | | | | | 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 | 18 | -119/+188 |
| |\ | |||||
| * \ | 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 | 6 | -7/+23 |
| | | | | |||||
* | | | | 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 | ||||
* | | | | | 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 | ||||
| * | | | | | Let setup_globals check for known globals | Elrond | 2011-06-12 | 2 | -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 parameters | Christopher Allan Webber | 2011-06-19 | 1 | -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.) | ||||
* | | | | | Actually we need pkg_resources again in test_celery_setup :) | Christopher Allan Webber | 2011-06-19 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This got removed in master at the same time that it got used in the configobj branch... | ||||
* | | | | | Merge branch 'configobj' | Christopher Allan Webber | 2011-06-19 | 24 | -328/+531 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Removing a couple of unused imports from util.py | Christopher Allan Webber | 2011-06-19 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | Removing "paste config" phrasing where we're no longer using paste's config | Christopher Allan Webber | 2011-06-19 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | renaming storage_system_from_paste_config()->storage_system_from_config() | Christopher Allan Webber | 2011-06-19 | 3 | -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 Webber | 2011-06-19 | 1 | -22/+0 |
| | | | | | |||||
| * | | | | Preparing celery unit tests for new setup. | Christopher Allan Webber | 2011-06-18 | 4 | -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 Webber | 2011-06-18 | 3 | -25/+1 |
| | | | | | |||||
| * | | | | Nosetests should now be able to run using the new configobj / app init setup | Christopher Allan Webber | 2011-06-18 | 4 | -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 Webber | 2011-06-18 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | It's a good idea for us to pass the application itself into mg_globals :) | Christopher Allan Webber | 2011-06-18 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Updating celery_setup.from_celery to use new config loading / app init | Christopher Allan Webber | 2011-06-18 | 1 | -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 Webber | 2011-06-18 | 1 | -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 Webber | 2011-06-18 | 1 | -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. | ||||
| * | | | | Move entire app structure over to using the new config system. | Christopher Allan Webber | 2011-06-18 | 2 | -64/+87 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 functions | Christopher Allan Webber | 2011-06-18 | 5 | -0/+134 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests for: - read_mediagoblin_config() - generate_validation_report() | ||||
| * | | | | CONFIG_SPEC_PATH should be config_spec here, fixing. | Christopher Allan Webber | 2011-06-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Make REPORT_HEADER a unicode string also. Unicode everywhere, ideally! | Christopher Allan Webber | 2011-06-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Validation error reporting functionality. | Christopher Allan Webber | 2011-06-18 | 1 | -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 Webber | 2011-06-18 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into configobj | Christopher Allan Webber | 2011-06-18 | 5 | -5/+116 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: setup.py | ||||
| * | | | | | Configuration file loading via ConfigObj. | Christopher Allan Webber | 2011-06-16 | 1 | -0/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses ConfigObj to open the config file. Also does validation via the config spec, so defaults are provided, strings are interpolated, types are converted. | ||||
| * | | | | | Basic config "requirements" file. | Christopher Allan Webber | 2011-06-15 | 1 | -0/+69 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | Not used yet, but this will be used by ConfigObj to transform values, set defaults, etc. | ||||
* | | | | | Removing unused pkg_resources import from test_celery_setup | Christopher Allan Webber | 2011-06-18 | 1 | -2/+0 |
| |/ / / |/| | | | |||||
* | | | | Merge remote branch 'remotes/cmoylan/test_auth_views_364' | Christopher Allan Webber | 2011-06-17 | 1 | -5/+43 |
|\ \ \ \ | |||||
| * | | | | logins are now somewhat tested | Chris Moylan | 2011-06-17 | 1 | -5/+43 |
| |/ / / | |||||
* | | | | adds link from gallery back to user page | cfdv | 2011-06-16 | 1 | -1/+3 |
| | | | | |||||
* | | | | adds link to user gallery in mediagoblin_header_right of user page | cfdv | 2011-06-16 | 1 | -0/+2 |
| | | | | |||||
* | | | | user_gallery controller calls render_to_reponse | cfdv | 2011-06-16 | 1 | -9/+6 |
| | | | | |||||
* | | | | adds routing.py and view.py changes | cfdv | 2011-06-16 | 2 | -0/+32 |
| | | | | |||||
* | | | | issue #330 - creates a user gallery template | Caleb Forbes Davis V | 2011-06-16 | 1 | -0/+40 |
|/ / / |