Christopher Allan Webber
b9f097a6f9
Indenting some sections between if / else blocks in root.html
2011-06-21 23:25:15 -05:00
Christopher Allan Webber
3208bea54c
Merge remote branch 'refs/remotes/gullydwarf-cfdv/is315'
2011-06-21 23:22:16 -05:00
Christopher Allan Webber
29f1333e72
Extra checks so that we don't even RUN tests unless the right celery environ set
2011-06-21 17:02:49 -05:00
Christopher Allan Webber
26c61fc843
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
2011-06-21 16:06:09 -05:00
Christopher Allan Webber
cfd2cbf3dd
Make sure we *ONLY* ever kill the test database, EVER.
2011-06-21 16:04:44 -05:00
Jef van Schendel
3efb084809
Merge remote-tracking branch 'gitorious/master'
2011-06-21 19:13:07 +02:00
Will Kahn-Greene
f439193628
333. Adds explanation of command lines; tweaks format-patch line
...
* 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
2011-06-21 12:32:43 -04:00
Christopher Allan Webber
4fd18da0a8
Also fix clean_html so that it doesn't barf on an empty string.
2011-06-21 08:20:05 -05:00
Jef van Schendel
4e5a55787b
Merge remote-tracking branch 'gitorious/master'
2011-06-21 11:22:31 +02:00
Chris Moylan
1975b5dd1f
began work on submission test. nothing to see here
2011-06-21 00:11:54 -05:00
cfdv
0472653ee4
assigns migration steps to User database objects
...
adds the migration_handler to the User db class, connecting the
migration steps in ../db/migrations.py to the migration code in
gmg_commands
2011-06-20 22:48:25 -05:00
Christopher Allan Webber
a2c37d0a78
Only migrate to description_html if description also exists.
2011-06-20 21:02:46 -05:00
Christopher Allan Webber
8268884653
Fix cleaned_markdown_conversion so that it doesn't bork on empty strings
...
Basically, clean_html would throw an error on '', so we just return ''
"if not text"
2011-06-20 21:01:05 -05:00
cfdv
17bb7c388b
removes unecessary dependence on existence of username for User migration01, + fix whitespace issues
2011-06-20 19:28:02 -05:00
cfdv
e36ecab093
adds accommmodations for migration of fields in User: bio and url
2011-06-20 13:07:15 -05:00
cfdv
78c0744077
Merge remote-tracking branch 'origin/master' into is315
2011-06-20 12:50:44 -05:00
Jef van Schendel
2d1f91cc41
Merge remote-tracking branch 'gitorious/master'
2011-06-20 16:33:14 +02:00
Christopher Allan Webber
5c441e75eb
Also moving the test_server.ini to test_paste.ini to avoid ambiguity.
2011-06-20 08:57:58 -05:00
Christopher Allan Webber
41f965c59d
Moving server.ini->paste.ini because willkg points out server.ini is ambiguous
...
Updating the file, updating lazyserver.sh, updating docs.
2011-06-20 08:55:58 -05:00
Christopher Allan Webber
fcdd172264
Updated git documentation to have more useful branch names.
...
I haven't discussed this with Will yet... if he gets unhappy we can
roll back this documentation change :)
2011-06-19 20:53:38 -05:00
Christopher Allan Webber
a01d04a017
Provide a migration to add description_html to MediaEntries that don't have it
2011-06-19 20:42:48 -05:00
Christopher Allan Webber
4bf8e8888c
Adds util.cleaned_markdown_conversion() and uses it in the submission process
...
This simplifies the markdown processing & html cleaning of descritions
and etc by providing a wrapper function that we can use in multiple
locations.
2011-06-19 20:41:40 -05:00
Christopher Allan Webber
0692c01e4c
Merge remote branch 'remotes/jwandborg/issue_363'
...
Conflicts:
setup.py
2011-06-19 20:00:35 -05:00
Christopher Allan Webber
0798684894
Merge remote branch 'remotes/cmoylan/test_auth_views_364'
2011-06-19 19:56:25 -05:00
cfdv
0e66e6a6c6
Merge branch 'is330', remote-tracking branch 'origin/master' into is330
2011-06-19 17:39:32 -05:00
cfdv
cd95cb6d3d
Merge remote-tracking branch 'origin/master' into is315
2011-06-19 17:20:23 -05:00
Elrond
3efdd97c2e
Move InvalidId to db.util
...
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.
2011-06-20 00:09:40 +02:00
Christopher Allan Webber
8b7663a0bd
Making ./runtests.sh the official way to run the tests.
2011-06-19 16:52:27 -05:00
Christopher Allan Webber
188240e312
./runtests.sh: run unit tests without having to remember the long command.
2011-06-19 16:51:02 -05:00
Christopher Allan Webber
eaca78748c
Need to run nosetests with CELERY_CONFIG_MODULE set to from_tests again.
...
Basically, if we don't do this celery sets itself up before it should
and improperly. :\
2011-06-19 16:43:23 -05:00
Christopher Allan Webber
68bf5b1942
Documenting the setup_globals function.
2011-06-19 16:24:31 -05:00
Christopher Allan Webber
218b8124ca
Document our new global objects added during the configobj branch
2011-06-19 16:23:17 -05:00
Christopher Allan Webber
d802498a2c
Merge remote branch 'remotes/elrond/idea/globals_check'
...
Conflicts:
mediagoblin/tests/test_globals.py
2011-06-19 16:22:41 -05:00
Christopher Allan Webber
668e8c26ad
Reset the globals parameters while testing parameters
...
(This way we can be sure that the database is torn down if necessary
but this was the only test that passed last.)
2011-06-19 16:03:13 -05:00
Christopher Allan Webber
d45e39664a
Re-commenting-out lxml from setup.py
...
Clarifying that this is something to install from the package manager
and not via python setuptools itself.
2011-06-19 15:35:19 -05:00
Christopher Allan Webber
f1fadb641d
Updated hacking howto to reflect our new, easier to run lazyserver.sh command.
2011-06-19 14:03:08 -05:00
Christopher Allan Webber
678a504a59
./lazyserver.sh: launch a server in the most basic way possible
...
Looks for paster either in buildout or in virtualenv / on the path,
wherever it seems to be.
2011-06-19 13:38:33 -05:00
Christopher Allan Webber
78e1c5f1ed
Actually we need pkg_resources again in test_celery_setup :)
...
This got removed in master at the same time that it got used in the
configobj branch...
2011-06-19 13:00:49 -05:00
Christopher Allan Webber
fa4e6b279b
Merge branch 'configobj'
2011-06-19 12:59:19 -05:00
Chris Moylan
12c231c8ac
added test coverage for redirecting after login with the next param
2011-06-19 12:28:53 -05:00
Christopher Allan Webber
77edca545b
Adjusting hackinghowto docs to reflect change in server/tests commands
2011-06-19 11:50:05 -05:00
Christopher Allan Webber
07f35dad60
Removing a couple of unused imports from util.py
2011-06-19 11:41:48 -05:00
Christopher Allan Webber
a32f17c969
Removing "paste config" phrasing where we're no longer using paste's config
2011-06-19 11:39:35 -05:00
Christopher Allan Webber
3c7d11ff28
renaming storage_system_from_paste_config()->storage_system_from_config()
...
As Elrond points out, this name doesn't make sense anymore since this
isn't based on the paste config. Thanks Elrond!
2011-06-19 11:36:52 -05:00
Christopher Allan Webber
0a7805f913
util.read_config_file() no longer needed; removing.
2011-06-19 11:10:45 -05:00
Chris Moylan
0a4cecdc66
Added tests for all sorts of login form abuse.
...
Added tests for log out
2011-06-19 00:22:47 -05:00
cfdv
699b547580
enables primitive display of profile data on user page
2011-06-18 22:24:32 -05:00
cfdv
0bf340727e
enables entering user details including website url and bio
...
fixes usage of objects. still need to display the data on user page
2011-06-18 21:30:56 -05:00
Christopher Allan Webber
8abeaf2fb6
Preparing celery unit tests for new setup.
...
Instead of the previous passing in of dictionaries, we're actually
checking some example config files.
2011-06-18 20:15:46 -05:00
Christopher Allan Webber
72c3ae046a
./bin/gmg commands upgraded to work with the new setup.
2011-06-18 20:14:51 -05:00