Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-07 | 1 | -9/+1 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-06 | 2 | -1/+38 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-06 | 22 | -154/+625 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-04 | 10 | -2/+203 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-03 | 3 | -48/+40 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Added lines background to forms | Jef van Schendel | 2011-06-02 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Right-aligned input buttons, added gradient | Jef van Schendel | 2011-06-02 | 1 | -13/+22 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-02 | 6 | -9/+137 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-05-31 | 1 | -6/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Improved object_gallery.html spacing | Jef van Schendel | 2011-05-31 | 2 | -10/+13 | |
| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | began work on submission test. nothing to see here | Chris Moylan | 2011-06-21 | 1 | -0/+45 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | 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 | |||||
| * | | | | | | | | | | | | | | | 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.) | |||||
* | | | | | | | | | | | | | | | Re-commenting-out lxml from setup.py | Christopher Allan Webber | 2011-06-19 | 1 | -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 Webber | 2011-06-19 | 1 | -15/+17 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | ./lazyserver.sh: launch a server in the most basic way possible | Christopher Allan Webber | 2011-06-19 | 1 | -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 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 | 28 | -363/+574 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Adjusting hackinghowto docs to reflect change in server/tests commands | Christopher Allan Webber | 2011-06-19 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | 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. |