cahrens
|
cbc0406df2
|
Merge branch 'feature/cas/manual-policy-merged' of github.com:MITx/mitx into feature/cas/manual-policy-merged
|
2013-02-20 10:57:35 -05:00 |
|
cahrens
|
305f0b2a54
|
Add number of spaces for formatting of JSON.
|
2013-02-20 10:56:49 -05:00 |
|
Jay Zoldak
|
67c2bac68f
|
Pep8fix lettuce test code
|
2013-02-20 09:53:02 -05:00 |
|
cahrens
|
167d07037d
|
Merged, delete Ace.
|
2013-02-19 14:56:37 -05:00 |
|
cahrens
|
f91060d197
|
Merge branch 'master' into feature/cas/manual-policy
Conflicts:
cms/djangoapps/contentstore/features/common.py
cms/djangoapps/contentstore/features/section.py
cms/djangoapps/contentstore/tests/test_course_settings.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/settings/course_grading_policy.js
cms/static/js/views/settings/main_settings_view.js
cms/static/sass/_settings.scss
cms/templates/settings.html
cms/urls.py
|
2013-02-19 13:27:35 -05:00 |
|
Jay Zoldak
|
34a4b35e66
|
Fix lettuce acceptance tests to reflect the new soft landing page changes.
|
2013-02-15 14:07:46 -05:00 |
|
cahrens
|
38632c52c3
|
Beginnings of Selenium test.
|
2013-02-14 17:36:37 -05:00 |
|
Calen Pennington
|
cfae1cdf62
|
Pep8 autofixes
|
2013-02-06 11:13:50 -05:00 |
|
Brian Talbot
|
e7e26a471c
|
studio - changed expectation of lettuce test for course overview section toggling
|
2013-01-11 12:03:17 -05:00 |
|
Jay Zoldak
|
64e8f9c0cd
|
Add BDD lettuce tests for studio overview toggle section feature.
|
2013-01-10 16:00:40 -05:00 |
|
Jay Zoldak
|
f056f0624d
|
Set up the framework for running lettuce tests against studio
|
2013-01-08 14:44:45 -05:00 |
|