Commit Graph

139 Commits

Author SHA1 Message Date
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
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
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
cahrens
08ce212bd5 Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy
Conflicts:
	cms/static/js/models/settings/advanced.js
2013-02-06 10:35:12 -05:00
cahrens
8093de1d93 Set size of ACE Editor. 2013-02-06 09:49:27 -05:00
Don Mitchell
05ec0c11c6 Oops, when i alphabetized i got the value incorrectly.
Fixed cancel to not retain new entries.
2013-02-06 09:08:28 -05:00
Don Mitchell
592d7e532b Keys are sorted now 2013-02-06 08:58:20 -05:00
Don Mitchell
5275db9ab9 Cancel kind of works (reverts but leaves in new fields :-( )
Filter out system metadata fields
2013-02-05 19:17:43 -05:00
Don Mitchell
8f16d639b7 CRUD on policy fields w/ some validation 2013-02-05 17:21:02 -05:00
cahrens
ca2a375c17 saving work 2013-02-04 12:50:16 -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
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
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
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
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
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
e0849e8b5a Cache to debug other branch 2012-12-13 16:34:58 -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
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
Don Mitchell
39024a7fee Grading mostly working 2012-12-10 16:32:33 -05:00
Chris Dodge
130de49b49 support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed 2012-12-07 09:45:12 -05:00
Tom Giannattasio
a25d6b0862 wrapped up data syncing and date format issues 2012-11-30 10:41:10 -05:00
Don Mitchell
0b7bff4c3f Everything tested and ready for Tom to fix 2012-11-30 10:40:19 -05:00
Don Mitchell
7ed0002bd2 Details now has validation except for youtube ids which cause
crossdomain policy violations when i try to validate.
2012-11-29 16:18:36 -05:00
Don Mitchell
c0da6e4249 Details done except for syllabus 2012-11-28 17:10:41 -05:00
Don Mitchell
2238019539 Details tab works except for file references 2012-11-27 11:32:03 -05:00
Don Mitchell
f0c94a2c7e Beginning test of details tab. 2012-11-21 15:17:18 -05:00
Don Mitchell
339949f934 Another checkpoint before pull/merge 2012-11-20 11:37:14 -05:00
Don Mitchell
241c9bb1ac Checkpoint to rebase 2012-11-19 16:02:30 -05:00
Don Mitchell
88cc5a080b Everything tested and ready for Tom to fix 2012-11-19 10:38:58 -05:00