Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,520 Commits 1 Branch 0 Tags
0c2dfd136eafaae88a71df4eecdcacc3845fca45
Commit Graph

775 Commits

Author SHA1 Message Date
Don Mitchell
09e8628037 add editor to new entries and when key changes 2013-02-08 16:58:50 -05:00
Don Mitchell
5254af2918 Letting render do its thing. The wrap confused the this pointer. 2013-02-08 15:36:42 -05:00
cahrens
4718c9a51a Forgot to define self when I moved code. 2013-02-08 11:17:02 -05:00
cahrens
950f5de3ca Move getSession() call out of render method to avoid crash on Chrome. 2013-02-08 08:26:24 -05:00
Don Mitchell
31393043d0 More for that commit 2013-02-07 14:46:42 -05:00
Don Mitchell
9cd1162a60 Grading and details split out. Put the unimplemented tabs into a single 
file not used.
 2013-02-07 14:45:24 -05:00
cahrens
c907cf756c Add ACE Editors. 2013-02-07 13:05:39 -05:00
Don Mitchell
1e68834e03 Remove from to-be-deleted list any readded keys w/ same name. 2013-02-06 17:42:00 -05:00
Don Mitchell
7b3c81ca53 blacklist violations now properly trigger violation error 
delete keys only after save completes
 2013-02-06 17:25:12 -05:00
cahrens
c243eec604 Move to view file. 2013-02-06 15:29:17 -05:00
Don Mitchell
1cc62fae75 Catch null pointer for uninitialized dates 2013-02-06 10:23:29 -05:00
Don Mitchell
4ba7de3402 Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy 2013-02-06 09:56:19 -05:00
Don Mitchell
8f16d639b7 CRUD on policy fields w/ some validation 2013-02-05 17:21:02 -05:00
Don Mitchell
902cdefefa Added comments for unused 2nd arg on generateCheckHoverState 2013-02-04 12:05:49 -05:00
Don Mitchell
50eced5b32 Attempt to patch the dnd hesitation fixes onto master 2013-02-04 11:34:59 -05:00
Don Mitchell
1595bd9b0e Move dnd code from base.js to a js file only loaded by overview.html 2013-02-01 17:20:58 -05:00
cahrens
b613bdc336 Fixes date bug (#149). 2013-01-31 13:37:45 -05:00
Don Mitchell
19927a83a5 Ensure settings and course info CRUD operations tell the user if there's 
a server error and pull the server error handler into a common function.
 2013-01-30 11:24:55 -05:00
Don Mitchell
ab4fd03dd8 Catch any and all save errors 2013-01-30 09:43:27 -05:00
Don Mitchell
b8c1dba1cb Catch save error and throw it in the user's face (bug 147). May need to 
add catches in more places or put in $.ajaxSetup?
 2013-01-29 17:31:12 -05:00
Don Mitchell
96a7db62cd Fixed time picker race condition for grace period. Still quirky in that 
in rounds down times from :01-:09 to :00 (and perhaps others). I think
that's a bug or setting in timepicker.
 2013-01-09 17:55:02 -05:00
Don Mitchell
e37180e074 Generalized the grader drop down and applied to edit_subsection 2012-12-19 17:31:06 -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
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
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
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
Don Mitchell
6c64032fcf Overview should be ready to test. 2012-12-14 09:22:54 -05: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
chrisndodge
6ab97b6fd9 Merge pull request #1125 from MITx/feature/dhm/cms-settings 
Feature/dhm/cms settings
 2012-12-13 06:52:49 -08: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
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