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
Brian Talbot
0a2b74110e
studio - nav and soft landing various QA fixes
2013-02-12 17:03:48 -05:00
Brian Talbot
77343519c6
studio - settings: revising enumerated item lists
2013-02-11 12:08:31 -05:00
cahrens
039160f50c
Beginning of CodeMirror.
2013-02-11 11:20:14 -05:00
Brian Talbot
ed15997259
studio - settings: grading revamp WIP
2013-02-11 08:48:01 -05:00
cahrens
c907cf756c
Add ACE Editors.
2013-02-07 13:05:39 -05:00
Don Mitchell
8f16d639b7
CRUD on policy fields w/ some validation
2013-02-05 17:21:02 -05:00
Brian Talbot
6b17659195
styling - settings layout and delete buttons
2012-12-13 13:35:58 -05:00
Brian Talbot
69c26a08e3
settings/style - general UI clean up - wip
2012-12-13 13:06:56 -05:00
Don Mitchell
a46c1f4883
Updated underscore (using _.invert())
...
The scss junk comes from trying to sync w/ several branches. I believe
it's right but mostly unnecessary (surprised it showed up).
Debugged the merge w/ cms-master
Fixed grace period to be absolute time difference not a date on the
client side.
2012-12-11 14:18:13 -05:00
Chris Dodge
79e48dde97
move the underscore tempaltes to /static/client-templates and update the references
2012-12-10 10:01:08 -05:00
