cahrens
39714a17d9
Merge branch 'master' into bug/christina/cursor-move
...
Conflicts:
cms/static/js/base.js
2013-03-22 16:03:52 -04:00
Don Mitchell
2dcfd1eba1
Merge pull request #1719 from MITx/feature/btalbot/studio-checklists
...
Add course checklists to Studio
2013-03-22 12:49:30 -07:00
cahrens
eebef1e647
Don't save subsection and unit names until the change event. Fixes bugs #18 and #228 .
2013-03-22 15:32:13 -04:00
Christina Roberts
1069c2c40a
Merge pull request #1722 from MITx/bug/btalbot/studio-pagetitles
...
Synced up Studio View <titles> with UI headings
2013-03-22 11:02:16 -07:00
Brian Talbot
b4e6b792cf
studio - changed the label of view published/live version of unit presented to a user while editing a draft of the same unit
2013-03-22 12:01:58 -04:00
Brian Talbot
420c8216aa
demo change to resolve push error
2013-03-22 11:31:47 -04:00
Brian Talbot
22fd8432c3
demo change to resolve push error
2013-03-22 11:31:43 -04:00
Brian Talbot
f11e54ddc7
studio - syncing up page <title> values with UI titles/headings
2013-03-22 11:27:16 -04:00
cahrens
be4045cb86
Reduce pep8 warnings, move Checklistst to top of menu.
2013-03-21 22:17:46 -04:00
cahrens
284cfcc941
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
2013-03-20 16:37:26 -04:00
cahrens
6d6e144c35
Urls working.
2013-03-20 16:37:08 -04:00
Brian Talbot
38df54dc53
studio - moved handling scrollable and new window links into their own functions for use throughout the app and not just on doc.ready + removed unused js plugin reference
2013-03-20 16:19:45 -04:00
Mark L. Chang
10ac7e04f8
copy finalized
2013-03-19 21:31:59 -04:00
cahrens
a03f6c3bf1
More Selenium test, code cleanup.
2013-03-19 14:02:07 -04:00
cahrens
49ee903eda
Merge branch 'master' into feature/btalbot/studio-checklists
...
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/template_loader.js
2013-03-18 15:30:19 -04:00
Chris Dodge
3e28ffa4f7
remove import and shortened line length
2013-03-18 15:10:17 -04:00
cahrens
f6fb64f130
Saving checkbox state, client template for individual checklist.
2013-03-18 15:03:54 -04:00
Chris Dodge
651465f1ad
add HTML templates for 404/500 errors
2013-03-18 12:56:17 -04:00
Brian Talbot
1aa8786b53
studio - checklists: added in smoothscrolling to in-page links across Studio but used only on checklists currently
2013-03-14 19:07:03 -04:00
Brian Talbot
13c38fa173
studio - checklists: revised input/label HTML and adjusted styling for each
2013-03-14 16:17:47 -04:00
cahrens
9a7b0fb563
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
...
Conflicts:
cms/templates/checklists.html
2013-03-14 13:47:55 -04:00
cahrens
017fd06bfc
Pre-merge.
2013-03-14 13:37:22 -04:00
Brian Talbot
0aea85a4d9
studio - checklists: moved content to yaml file, cleaned up new checklists production view, added in page-level nav, and collapse/expand indicators
2013-03-14 12:55:44 -04:00
cahrens
065e850449
Merge with Brian's changes.
2013-03-14 09:32:54 -04:00
cahrens
e0207432ca
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
2013-03-14 09:23:05 -04:00
cahrens
54156b7ac1
Saving work.
2013-03-14 09:22:58 -04:00
Brian Talbot
16f6744aef
studio - checklists: revised task completion styles, added in checklist visual progress UI and demo/PoC JS and cleaned up some content/status states
2013-03-13 19:13:26 -04:00
Brian Talbot
bf71f099d4
studio - checklists: finished static styling, initial checklist content import, and some basic JS
2013-03-13 14:09:18 -04:00
Brian Talbot
66a8735a58
studio - Checklists: initial design and front end proofing/firming up - WIP
2013-03-13 10:50:34 -04:00
Brian Talbot
1b5f040021
studio - checklists: roughed out initial static design, HTML, and most CSS for checklists v0 UI
2013-03-12 21:57:40 -04:00
Don Mitchell
6922152165
Merge pull request #1653 from MITx/feature/studio/advanced-settings-revamp-merge
...
Advanced Settings changes.
2013-03-12 09:13:16 -07:00
cahrens
eea5900591
Add in Mark's copy changes.
2013-03-12 11:15:50 -04:00
Calen Pennington
2a96c45677
Make default value for format setting None, and force lms and cms to be explicit about a string default
2013-03-12 10:16:14 -04:00
cahrens
99f55266f5
Do not need to pass blacklist keys to client.
2013-03-12 09:27:46 -04:00
cahrens
84f2137935
Merge branch 'feature/alex/poll-merged' into feature/studio/advanced-settings-revamp
2013-03-11 16:57:07 -04:00
cahrens
7e8fcb85ff
Updated Selenium test, deleted dead code related to Advanced Settings.
2013-03-11 16:56:24 -04:00
Calen Pennington
4cea094f70
Be a little more liberal with what count's as not having a due date in a section
2013-03-11 15:29:58 -04:00
Brian Talbot
82a00104c2
studio - settings: revised markup and styling around disabled/readonly fields
2013-03-11 12:24:43 -04:00
Brian Talbot
603d11577f
studio - settings: matched up styling/treatment of disabled input fields in schedule/details settings view to new advanced settings UI
2013-03-11 11:40:36 -04:00
Brian Talbot
72a7ec9e07
studio - advanced settings: removed new/delete controls from advanced policies and makde key fields readonly/disabled since we're now showing all policy metadata
2013-03-11 11:31:48 -04:00
Calen Pennington
93db5acc15
Make display_name defaulting explicit
2013-03-08 14:58:09 -05:00
Victor Shnayder
84f05f9f61
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/foldit_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_conditional.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
2013-03-08 00:40:18 -05:00
Calen Pennington
af3c92c47e
Remove old cms templates
2013-03-06 17:28:25 -05:00
Calen Pennington
ba69392f70
Fix inaccurate instructions around import
2013-03-06 17:10:45 -05:00
Calen Pennington
8a9ba79d1f
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
2013-03-06 12:15:07 -05:00
cahrens
b706d4a1f5
Use readonly attribute instead of disabled. Disabled text fields are not selectable on FireFox.
...
#225
2013-03-06 11:50:23 -05:00
Calen Pennington
1bfb933518
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
cms/templates/edit_subsection.html
cms/templates/overview.html
cms/templates/unit.html
cms/templates/widgets/header.html
common/djangoapps/course_groups/tests/tests.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/js/src/.gitignore
common/lib/xmodule/xmodule/mako_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/store_utilities.py
common/lib/xmodule/xmodule/modulestore/xml_exporter.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/views.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-04 16:33:40 -05:00
Christina Roberts
d0eefc6a67
Merge pull request #1580 from MITx/bug/dhm/course_update_js
...
Fix for script tags w/in json objects being oddly evaluated on html page
2013-03-04 12:42:42 -08:00
Don Mitchell
de3a75d29d
Don't prepopulate models which may have script tags in their payloads
...
but fetch async via json get.
2013-03-04 12:54:58 -05:00
Don Mitchell
e55bb845b2
Fix for script tags w/in json objects being oddly evaluated on html page
...
load by doing load separately. In process, upgraded backbone which
necessitated changing getByCid to get and got rid of obsolete
course_settings master object.
2013-03-01 16:05:58 -05:00
