cahrens
305f0b2a54
Add number of spaces for formatting of JSON.
2013-02-20 10:56:49 -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
6c95460761
studio - resolving merge from master
2013-02-15 09:15:06 -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
Don Mitchell
d569c559ca
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
...
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/views/settings/main_settings_view.js
cms/templates/index.html
cms/templates/settings.html
2013-02-12 16:57:00 -05:00
cahrens
f56729dbdb
Turn off line wrapping.
2013-02-12 15:27:38 -05:00
Don Mitchell
76d675ba16
fix npe for time (bug 185)
2013-02-12 15:20:02 -05:00
Don Mitchell
40668133f7
Fix bug which I know I fixed before (perhaps on another branch?) to
...
ensure old time had a value before comparing it to new time.
2013-02-12 15:11:35 -05:00
cahrens
75ceed7f69
Show "successful save" message when a new edit is made.
2013-02-12 10:29:47 -05:00
cahrens
e9bb5eb1d0
Minor updates.
2013-02-11 17:27:39 -05:00
cahrens
98920e7e05
Switch to new notification/Save/Cancel mechanism (attached to bottom of viewport).
2013-02-11 16:17:32 -05:00
cahrens
437c806fce
Enable/disable new entry button.
2013-02-11 14:16:04 -05:00
cahrens
67a557d59a
Update Save/Cancel button state on typing events.
2013-02-11 14:07:11 -05:00
cahrens
044a8a5cf6
CodeMirror.
2013-02-11 12:37:31 -05:00
Don Mitchell
773dfce68d
Try to make server and validation errors work together. Getting double
...
errors when there are parent and child views both defining on error
handlers still.
2013-02-11 12:04:45 -05:00
cahrens
039160f50c
Beginning of CodeMirror.
2013-02-11 11:20:14 -05:00
cahrens
ac732f6b07
Beginnings of feedback regarding unsaved and saved changes.
2013-02-08 17:19:19 -05:00
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
8f16d639b7
CRUD on policy fields w/ some validation
2013-02-05 17:21:02 -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
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
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
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
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
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
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
