JonahStanley
58fe6d4e83
Cleaned up import and comment
2013-06-21 16:17:33 -04:00
JonahStanley
cb04f9f0b8
Moved port range to rake file
2013-06-21 08:51:44 -04:00
JonahStanley
fa18b48f6e
Contentstore singleton is now cleared during teardown
2013-06-21 08:51:44 -04:00
JonahStanley
51f8c0cfeb
Added the beginnings of self cleanup
2013-06-21 08:51:44 -04:00
Jay Zoldak
f90ed69cd7
move override of MODULESTORE settings into ModuleStore test case class
2013-06-21 08:51:44 -04:00
JonahStanley
e4af7287b6
Initial testing for parallelization
2013-06-21 08:51:43 -04:00
Calen Pennington
5ba6855d80
Merge pull request #224 from edx/cale/xmodule-assets-pylint-fixes
...
Fix pylint violations in xmodule static_content.py
2013-06-21 05:29:17 -07:00
Will Daly
151aa1c082
Merge pull request #114 from edx/will/test-report-cleanup
...
Clean tests step now removes stale coverage report files.
2013-06-20 18:59:02 -07:00
Ned Batchelder
3eec09b87a
Merge pull request #216 from edx/ned/remove-unused-imports
...
Ned/remove unused imports
2013-06-20 14:15:31 -07:00
Calen Pennington
4cb6eb6e19
Fix pylint violations in xmodule static_content.py
2013-06-20 16:45:11 -04:00
Calen Pennington
d06a9a2043
Merge pull request #219 from edx/cale/remove-simplewiki
...
Remove simplewiki from the codebase
2013-06-20 13:43:38 -07:00
Calen Pennington
5344434259
Merge pull request #218 from edx/cale/pep8-e128
...
Clean up pep8 E128 issues
2013-06-20 13:42:43 -07:00
Calen Pennington
d687a2aefd
Merge pull request #208 from edx/cale/create-dev-env-fixes
...
Cale/create dev env fixes
2013-06-20 13:42:24 -07:00
Christina Roberts
e84ee873d0
Merge pull request #230 from edx/christina/pep8-again
...
Pep8 cleaning.
2013-06-20 13:34:50 -07:00
Jonah Stanley
b7f745c737
Merge pull request #228 from edx/jonahstanley/fix-flakey-tests
...
Jonahstanley/fix flakey tests
2013-06-20 13:14:21 -07:00
Will Daly
106e0aae01
Clean tests step now removes stale coverage report files.
...
Added test cleaning to fasttest_* instead of test_*, so that
it always gets executed for lms and cms tests.
Added comment to `directory` command for tests.rake
Separated cleaning of test fixtures from cleaning of reports
directory to resolve conflicts with collectstatic.
2013-06-20 16:08:18 -04:00
cahrens
34f8c044b8
Pep8 cleaning.
2013-06-20 16:06:00 -04:00
JonahStanley
281f900389
Changed format of docstring
2013-06-20 15:40:58 -04:00
Peter Fogg
0ef4390aff
Merge pull request #132 from edx/peter-fogg/remove-video-xml
...
Peter fogg/remove video xml
2013-06-20 12:40:13 -07:00
JonahStanley
eec095a195
Changed naming of attempts to max_attempts and changed css_selector
2013-06-20 15:38:56 -04:00
JonahStanley
96c4d2877f
Navigation now has a click success condition
2013-06-20 14:05:00 -04:00
Christina Roberts
fc6422641a
Merge pull request #229 from edx/christina/activation_email
...
Don't mention edge in the e-mail; same text used for edge and edx.
2013-06-20 11:02:46 -07:00
cahrens
5f0a89bc27
Don't mention edge in the e-mail; same text used for edge and edx.
2013-06-20 13:16:13 -04:00
Brian Talbot
0c75f427b1
Merge pull request #226 from edx/talbs/studio-uiwell
...
studio - revising the visual design of UI well pattern
2013-06-20 09:46:06 -07:00
Peter Fogg
83d84e2b65
Actually fix merge conflicts.
2013-06-20 12:40:37 -04:00
Brian Talbot
b7b2f91e79
studio - revising the visual design of UI well pattern
2013-06-20 12:30:25 -04:00
Peter Fogg
1d8d507f49
Merge in master (again).
2013-06-20 12:21:16 -04:00
Christina Roberts
1a5b58acd6
Merge pull request #210 from edx/christina/course-settings-drupal
...
On marketing site, disable course settings options that do not work.
2013-06-20 09:15:18 -07:00
cahrens
9a753f1cc5
Studio feature to disable course settings on Drupal site.
2013-06-20 12:03:59 -04:00
Peter Fogg
ea56a0cd4a
Make sure we can handle empty youtube attributes.
2013-06-20 11:58:01 -04:00
Jonah Stanley
9b478ff3e3
Merge pull request #115 from edx/jonahstanley/add-gradingsettings-tests
...
Added testing for grading settings
2013-06-20 08:31:31 -07:00
cahrens
a498fa52ba
Modify after UX text changes.
2013-06-20 11:29:31 -04:00
JonahStanley
e1d4c69365
Merge branch 'master' into jonahstanley/fix-flakey-tests
...
Conflicts:
common/djangoapps/terrain/ui_helpers.py
2013-06-20 11:17:15 -04:00
Peter Fogg
c77eb4fd4c
Fix VideoAlpha acceptance test step definitions to not clash with Video module.
2013-06-20 11:14:33 -04:00
JonahStanley
a8789dced9
Fixed flakey check box by making a css_check function that behaves like css_click
...
As a result, changed inputfield to return the css, and all of the element.fill() to css_fill
2013-06-20 11:14:17 -04:00
Will Daly
ef06932df0
Merge pull request #197 from edx/will/fix-video-acceptance-tests
...
Will/fix video acceptance tests
2013-06-20 08:07:28 -07:00
cahrens
d601cee8e5
Merge branch 'master' into christina/course-settings-drupal
2013-06-20 11:00:12 -04:00
JonahStanley
1e51bd7314
Fixed flakey navigation tests by changing css
...
Now only check for the css that appears when the accordion is done
2013-06-20 10:58:11 -04:00
JonahStanley
033b974047
Fixed flakey show answer test
2013-06-20 10:54:43 -04:00
Christina Roberts
0d3b7edde3
Merge pull request #223 from edx/christina/pep8
...
pep8 fixes.
2013-06-20 07:54:15 -07:00
Felix Sun
a6f697cc47
Merge pull request #222 from edx/felix/prefsscopefix3
...
Fixed the preferences scope of xblock.
2013-06-20 07:53:57 -07:00
Brian Talbot
485b5b2d6d
studio - unconditionalizes course summary info in settings
2013-06-20 10:50:15 -04:00
cahrens
9e69586bb3
pep8 fixes.
2013-06-20 10:31:44 -04:00
Felix Sun
c00721bbe6
Fixed the preferences scope of xblock.
...
Added self to authors.
Conflicts:
AUTHORS
CHANGELOG.rst
2013-06-20 10:17:25 -04:00
Calen Pennington
501830c982
Merge pull request #174 from edx/cale/stabilize-dev-env
...
Cale/stabilize dev env
2013-06-20 07:09:35 -07:00
Peter Fogg
9c7be8b1dc
Fix merge conflict in CHANGELOG.rst.
2013-06-20 09:58:22 -04:00
Calen Pennington
cd972d6427
Merge branch 'cale/standard-coffee-watch' into cale/stabilize-dev-env
...
Conflicts:
CHANGELOG.rst
rakelib/assets.rake
2013-06-20 09:23:57 -04:00
Brian Talbot
604e820211
studio - revises styling of in-context notices UI
2013-06-20 09:23:56 -04:00
Calen Pennington
f11900a85c
Merge branch 'cale/singleton-watchers' into cale/stabilize-dev-env
...
Conflicts:
CHANGELOG.rst
2013-06-20 09:23:18 -04:00
Brian Talbot
419c5e7a5c
studio - removes course settings promo link and notice icons
2013-06-20 09:23:16 -04:00
