Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,878 Commits 1 Branch 0 Tags
84cb0ce99bbca77efa9bd39bd3aa79c2b06c28a2
Commit Graph

183 Commits

Author SHA1 Message Date
Don Mitchell
d66f33956e Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 2012-12-19 17:31:30 -05:00
Don Mitchell
e37180e074 Generalized the grader drop down and applied to edit_subsection 2012-12-19 17:31:06 -05:00
cahrens
61c19dbc70 Fix for Studio #87, plus some cleanup. 2012-12-19 16:55:39 -05:00
Don Mitchell
b5fd6c9012 Send back error to client if failed to save malformed update and have it 
show an alert.
 2012-12-18 15:22:07 -05:00
Don Mitchell
0192a04b20 Fixed course_info parsing bug. 
Addressed some of Christina's review comments.
 2012-12-18 14:28:53 -05:00
Don Mitchell
5709ff34f5 Refactored videos to a much simpler impl b/c about videos don't have 
speeds and don't use the video/default.yaml format.
 2012-12-18 12:46:54 -05:00
Don Mitchell
598922b4cb Dont' warn about name change on initial creation. 
Fixed overview to save correctly (not overwrite w/ old value)
 2012-12-17 17:22:08 -05:00
Don Mitchell
f7703dadee Alert for assignment type name change referential integrity. 
Fixed orphaned graders (manifested as url not defined)
To keep assignment type blur from spamming warnings, I made all blurs
check whether the data changed before doing any other behaviors.
 2012-12-17 17:10:56 -05:00
Don Mitchell
7223c8ce13 Found cut/paste error which was causing intermittent bug due to 
overloaded template name.
 2012-12-15 16:36:23 -05:00
Don Mitchell
521fa938b3 Fixed course info bug (and simplified parsing). Incidentally fixed 2 
other course info bugs (not editing/deleting right element if > 10,
putting new elements at end rather than beginning of list).
Made Location more robust against parsing errors.
 2012-12-15 15:56:51 -05:00
Don Mitchell
2a353068ab Merge pull request #1163 from MITx/feature/christina/misc 
Feature/christina/misc
 2012-12-14 14:29:53 -08:00
Christina Roberts
e57b5b1431 Merge pull request #1160 from MITx/feature/btalbot/cms-gradable 
Overview page allows user to specify grading policy per subsection
 2012-12-14 14:09:28 -08:00
Don Mitchell
ac7b0334a6 Code review changes. 2012-12-14 16:51:40 -05:00
cahrens
e3b302f5fe Merge branch 'feature/cale/cms-master' into feature/christina/misc 2012-12-14 16:28:50 -05:00
Chris Dodge
ab9b208605 add some permissions asserting 2012-12-14 16:26:15 -05:00
cahrens
808cf8c692 Some JavaScript cleanup (also addresses Studio #60). 2012-12-14 16:24:01 -05:00
Don Mitchell
0b762fa35f Remove ability to set gradability at the section level (commented out 
until we decide the inheritance) 
Remove Policy from subsection editor
Commented out Graded as: _____ from subsection settings 
Fix menu dismissa
Fix ambiguous selection
 2012-12-14 15:19:14 -05:00
Don Mitchell
0fc16dffee Gradable impl'd for overview page 2012-12-14 12:29:57 -05:00
Brian Talbot
4e152952af cms settings - revised course overview textarea to display as codemirror field on page load 2012-12-14 11:57:46 -05:00
Brian Talbot
91713cbe18 editing UI - added in preventDefault() to all editing actions on course info 2012-12-14 11:14:09 -05:00
Christina Roberts
fef3fd871e Merge pull request #1154 from MITx/feature/dhm/cms-settings 
Fixed 2nd fn which had regex infinite loop
 2012-12-14 06:58:43 -08:00
Don Mitchell
b9d9c7b8c0 Fixed infinite loop in the 2nd video string parser which I'd fixed in 
the first yesterday. Fixed formatting of compounded video string errors.
 2012-12-14 09:48:04 -05:00
Don Mitchell
1eacd5e346 Fix infinite loop in videosourceSample. Had fixed same one in 
parse_videosource but neglected to fix this one.
 2012-12-14 09:45:25 -05:00
Don Mitchell
6c64032fcf Overview should be ready to test. 2012-12-14 09:22:54 -05:00
Don Mitchell
e0849e8b5a Cache to debug other branch 2012-12-13 16:34:58 -05:00
chrisndodge
094856e229 Merge pull request #1149 from MITx/style/studio/tom/ui-cleanups 
Various Style/UI Tweaks
 2012-12-13 12:41:10 -08:00
Christina Roberts
c182b8ef08 Merge pull request #1145 from MITx/feature/dhm/cms-settings 
Feature/dhm/cms settings
 2012-12-13 11:12:04 -08:00
Brian Talbot
f33efe3dde settings - debugged height issue with new/manipulated grade bars and moved solution back to CSS layer 2012-12-13 13:45:57 -05:00
Brian Talbot
34441759dd settings - added in preventDefault() for all grading controls that needed it 2012-12-13 13:44:03 -05:00
Don Mitchell
9cc1b348fa Merge branch 'feature/dhm/cms-settings' of github.com:MITx/mitx into feature/dhm/cms-settings 2012-12-13 13:02:03 -05:00
Don Mitchell
9b9bdb44a3 Fix video string parse for empty and completely malformed strings 2012-12-13 12:58:59 -05:00
Don Mitchell
595edac4c2 Caching changes to fix critical bug on other branch 2012-12-13 12:33:22 -05:00
Tom Giannattasio
95dfc730dc new header styles; collapse all button added to courseware 2012-12-13 11:20:30 -05:00
Tom Giannattasio
197ea33235 tweaked body color and window styles; adjusting new buttons 2012-12-13 11:20:30 -05:00
Tom Giannattasio
74ce3d225f removed new course button on click to prevent multiple instantiations 2012-12-13 11:19:22 -05:00
chrisndodge
6ab97b6fd9 Merge pull request #1125 from MITx/feature/dhm/cms-settings 
Feature/dhm/cms settings
 2012-12-13 06:52:49 -08:00
Don Mitchell
41ca47edfc Add flag to turn template caching on/off (default to off) 2012-12-13 09:47:51 -05:00
Chris Dodge
3421331f17 up the template caching version number to avoid stale caches since there's been a change to the underscore templates 2012-12-13 09:25:13 -05:00
Chris Dodge
fc8281d517 up the template caching version number to avoid stale caches since there's been a change to the underscore templates 2012-12-13 09:22:01 -05:00
Chris Dodge
35317b0679 more tweeks on CodeMirror. Also do a re-ordering of operations when creating a new Update, put the CodeMirror binding after the form has been inserted into the DOM. It appears to improve some rendering characteristics. 2012-12-12 20:47:37 -05:00
Don Mitchell
e75f63e957 More merge repairs. Hopefully done. 2012-12-12 17:13:55 -05:00
Chris Dodge
84b08b5ef5 call remove() on CodeMirror 2012-12-12 15:03:49 -05:00
Chris Dodge
0c68ba8bfa dispose of when we close the editor 2012-12-12 14:09:09 -05:00
Don Mitchell
71455f760e Check for null dates before setting time in timepicker. 
Remove syllabus as it's not instrumented.
 2012-12-12 11:37:04 -05:00
Don Mitchell
056bad4c66 Time zone prompt change and tooltip 
CodeMirror on overview entry
 2012-12-12 10:18:39 -05:00
Don Mitchell
d7591bc0c1 Show the timezone and current time (on tooltip) 2012-12-11 18:02:09 -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
Don Mitchell
0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into 
feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py
 2012-12-11 10:55:10 -05:00
Don Mitchell
5ea5a7c0a7 It works!!! 2012-12-10 18:55:35 -05:00
Don Mitchell
c43aa62fce Need to still add create and delete but otherwise done. 2012-12-10 18:01:28 -05:00