cahrens
7f1c89b492
Merge branch 'master' into feature/btalbot/studio-alerts
2013-04-08 10:28:52 -04:00
Brian Talbot
1a68d516fb
resolving local merge with master
2013-04-05 15:27:08 -04:00
Brian Talbot
512e4fe3bd
resolving local merge with master and sprucing style and templates for merge with master
2013-04-05 15:13:21 -04:00
Brian Talbot
52a2fc7114
changing timeFormat for settings views
2013-04-04 17:45:40 -04:00
Mark L. Chang
4ce34fa298
instrumented checklists
2013-04-04 01:51:15 -04:00
Mark L. Chang
7b5ec1bc41
instrumented advanced settings
2013-04-04 01:51:14 -04:00
Mark L. Chang
22bd8da1f2
added event tracking to static pages
2013-04-04 01:51:14 -04:00
Brian Talbot
d87c4e3866
resolving local merge with master
2013-04-03 15:01:55 -04:00
cahrens
fa63bcce94
Allow clearing of dates (except for course start date).
...
https://edx.lighthouseapp.com/projects/102637/tickets/231
2013-03-25 17:25:49 -04:00
cahrens
ccd4db9ac3
Writing test.
2013-03-25 15:24:53 -04:00
cahrens
c39ff353ea
Don't assume input fields will be within a div.
...
https://edx.lighthouseapp.com/projects/102637/tickets/232
2013-03-25 11:09:33 -04:00
Brian Talbot
7051a94e7b
resolved local master merge conflicts with studio sass
2013-03-21 16:15:19 -04:00
cahrens
f44989e516
Use Brian's open external method.
2013-03-21 11:17:31 -04:00
cahrens
fd9c29f449
Merge branch 'master' into feature/btalbot/studio-checklists
2013-03-20 16:37:56 -04:00
cahrens
6d6e144c35
Urls working.
2013-03-20 16:37:08 -04:00
Brian Talbot
f181a454e4
studio - added in basic JS confirm UI when deleting course updates
2013-03-20 11:20:16 -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
cahrens
f6fb64f130
Saving checkbox state, client template for individual checklist.
2013-03-18 15:03:54 -04:00
Brian Talbot
cdcdfd49e0
studio - alerts: resolving local master merge conflcits
2013-03-18 10:58:16 -04:00
cahrens
ac25b02ce6
Minor updates.
2013-03-14 13:48:17 -04:00
cahrens
017fd06bfc
Pre-merge.
2013-03-14 13:37:22 -04:00
cahrens
54156b7ac1
Saving work.
2013-03-14 09:22:58 -04:00
Brian Talbot
36746fb729
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-12 16:05:54 -04:00
cahrens
7e8fcb85ff
Updated Selenium test, deleted dead code related to Advanced Settings.
2013-03-11 16:56:24 -04:00
cahrens
f5dd5d35e9
Need to trigger invalid instead of error, after changes for new version of Backbone.
2013-03-08 14:51:29 -05:00
cahrens
98e410816e
New version of Backbone has separate invalid event.
2013-03-07 13:52:55 -05:00
cahrens
9ec33928ce
New version of Backbone has separate invalid event.
2013-03-07 13:37:10 -05:00
Brian Talbot
62514d85a3
studio - alerts: loosely wired advanced settings with new notification and alert messages
2013-03-06 15:36:38 -05:00
Brian Talbot
156a702e08
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-05 09:57:35 -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
Brian Talbot
ec90d349e2
studio - alerts: revisited advanced editor notification UI to marry new styles/behavior - WIP
2013-03-04 12:47:07 -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
cahrens
d7c28bfa11
Don't usurp ValidatingView's error handling.
...
#219
2013-03-01 15:24:56 -05:00
Don Mitchell
c11d627c88
Chrome/Safari don't use keypress for backspace and delete.
2013-02-22 11:00:27 -05:00
Don Mitchell
e5efcf65d3
remove console.log
2013-02-21 13:34:11 -05:00
Don Mitchell
851a99cb13
remove commented out code
2013-02-21 13:32:29 -05:00
Don Mitchell
116c74c075
Highlighting of field labels and smarter decision as to when to show the
...
save cancel bar.
2013-02-21 13:27:36 -05:00
cahrens
cc63f9c2db
Unique IDs, other cleanup.
2013-02-20 17:11:34 -05:00
Brian Talbot
7b60ec380a
Merge branch 'master' into feature/cas/manual-policy-merged
2013-02-20 14:58:50 -05:00
Brian Talbot
ad770a5ec8
studio - manual policy editor: converting to new page layout - WIP
2013-02-20 14:24:13 -05:00
cahrens
305f0b2a54
Add number of spaces for formatting of JSON.
2013-02-20 10:56:49 -05:00
Brian Talbot
266e8951a4
made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750
2013-02-19 17:18:09 -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
Brian Talbot
20553b00d3
resolving merge conflict with master
2013-02-15 09:32:38 -05:00
Brian Talbot
6c95460761
studio - resolving merge from master
2013-02-15 09:15:06 -05:00
Brian Talbot
47c117bf03
studio - page headers: resolved new course update creation JS issue caused by new markup
2013-02-14 10:52:25 -05:00
cahrens
4ae691e88a
Convert JSON that doesn't parse to String (unless object, array, or single quote).
2013-02-13 17:41:52 -05:00
