JonahStanley 46da897610 Merge branch 'master' into jonahstanley/add-courseteam-tests ...

Conflicts:
	cms/envs/test.py

2013-06-17 16:43:56 -04:00

..

__init__.py

Move terrain module from lms to common.

2013-02-20 09:52:32 -05:00

browser.py

Turn off automatic snapshot to tmp dir on lettuce failure

2013-06-04 15:09:44 -04:00

course_helpers.py

Removed _MODULESTORE reference that was doing nothing

2013-06-17 14:12:42 -04:00

factories.py

Refactor user factory usage for lettuce tests. Fix merge conflict.

2013-05-30 13:48:07 -04:00

steps.py

Added docstring specifying when this method must be called

2013-06-06 14:52:35 -04:00

ui_helpers.py

Remove waits by adding code in click that will try the operation multiple times (thanks to Jonah).

2013-06-17 13:55:15 -04:00