Commit Graph

6040 Commits

Author SHA1 Message Date
Chris Dodge
28d9827468 fix up some thumbnail issues. Also we need to manage the user permissions when we clone and delete course 2012-12-27 10:20:28 -05:00
Don Mitchell
83bc9d7bf8 Grader unit tests (partial) 2012-12-26 15:48:37 -05:00
Don Mitchell
8d9a221945 Delete not-yet-implemented file 2012-12-26 13:50:01 -05:00
Don Mitchell
88b2457c13 Bug 98: no unit tests b/c it's just text in hmtl 2012-12-26 11:47:42 -05:00
Don Mitchell
a35c1386f2 Bug 99: don't show date as 'Unset' but leave out altogether if not set
plus commented out failing unit tests until I can get someone to help
debug them.
2012-12-26 11:30:31 -05:00
Don Mitchell
58abb10c2d Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 2012-12-26 10:31:10 -05:00
Don Mitchell
ff490599fa Debugging unit tests 2012-12-26 10:29:35 -05:00
Brian Talbot
c9e5c47b30 removed progress bar UI from export UI 2012-12-26 09:19:08 -05:00
Brian Talbot
ed3f3b02d6 studio - course export UI alpha - roughing in states/views 2012-12-26 09:10:05 -05:00
Don Mitchell
866ce8d2ae Merge pull request #1194 from MITx/feature/christina/misc
Feature/christina/misc
2012-12-20 13:45:27 -08:00
cahrens
91ce214964 Fix for Studio #96. 2012-12-20 14:59:21 -05:00
cahrens
90ce6967aa Fix for Studio #96. 2012-12-20 14:58:02 -05:00
Don Mitchell
90e12ff46b Merge pull request #1192 from MITx/feature/cdodge/clone-course
implement course clone and delete functionality from the command line
2012-12-20 11:29:49 -08:00
Chris Dodge
b40a8a3e9e implement course clone and delete functionality from the command line 2012-12-20 13:55:15 -05:00
Don Mitchell
17a1e281b1 Unit tests now work!!! 2012-12-20 13:42:57 -05:00
Don Mitchell
683535d913 Another bug for when the content for an update is more than one element. 2012-12-20 11:09:10 -05:00
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
Don Mitchell
14330ebc4a Merge pull request #1187 from MITx/feature/christina/misc
Fix for Studio #87, plus some cleanup.
2012-12-19 14:03:05 -08:00
cahrens
61c19dbc70 Fix for Studio #87, plus some cleanup. 2012-12-19 16:55:39 -05:00
Chris Dodge
91b0fddfce malformed url generation for User's tab 2012-12-19 13:49:47 -05:00
chrisndodge
3ae08d101c Merge pull request #1178 from MITx/fix/zoldak/cms-jasmine
CMS Jasmine tests are fixed. Fail the Jenkins edge build when CMS Jasmine specs fail.
2012-12-19 08:42:08 -08:00
Jay Zoldak
b19aa06540 Fix broken jasmine tests for CMS. All (11) specs are now passing. 2012-12-19 11:26:36 -05:00
Don Mitchell
b689d19bec Ensure empty video string deletes the video record and doesn't create
a partial descriptor. 
Use 400 not the contrived 515 for malformed html.
2012-12-19 11:11:14 -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
fc2b6f034b Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 2012-12-18 14:29:10 -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
chrisndodge
a34b42b8d2 Merge pull request #1174 from MITx/bug/btalbot/cms-userstab
cms - added users tab back into course navigation
2012-12-18 10:19:30 -08:00
Don Mitchell
dd758c06f7 Merge pull request #1175 from MITx/fix/cdodge/initializing-tabs
initialize the tabs metadata on course if we go to the edit-tabs page. T...
2012-12-18 10:13:35 -08:00
Chris Dodge
2ae2e46880 initialize the tabs metadata on course if we go to the edit-tabs page. This will prevent the author from getting into a bad state in the LMS 2012-12-18 13:08:21 -05:00
Brian Talbot
af5d007a8f cms - added users tab back into course navigation 2012-12-18 12:50:04 -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
Jay Zoldak
cc54c37359 Exclude settings.py files from coverage reports and configure titles for the reports. 2012-12-17 15:00:11 -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
chrisndodge
368abbe669 Merge pull request #1165 from MITx/bug/btalbot/pullrequest1160-untangling
cms pull request 1160 - CSS resolutions
2012-12-15 11:50:07 -08:00
Brian Talbot
2ee488733c cms pull request 1160 - brought back all css changes lost in this request - mostly overview related 2012-12-15 00:25:29 -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
Christina Roberts
dbd9ac6e59 Merge pull request #1162 from MITx/fix/cdodge/security-holes
add some permissions asserting
2012-12-14 13:37:12 -08: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
Brian Talbot
7d1a08d481 pages - made intro text visible again and styled it some 2012-12-14 16:15: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
Brian Talbot
e4f4f32c1b tooltips - removed duplicate/incorrect tooltip_manager.js reference in base.html and added tooltips to unit actions 2012-12-14 15:18:45 -05:00
Don Mitchell
0fc16dffee Gradable impl'd for overview page 2012-12-14 12:29:57 -05:00