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

7804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Don Mitchell
b65775c300 Merge pull request #1195 from MITx/feature/christina/misc 
Fix typo in Formula Response name (Studio #101).
 2012-12-20 14:15:01 -08:00
cahrens
37b83c1ecf Fix typo in Formula Response name (Studio #101). 2012-12-20 17:06:12 -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
43d1542977 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 2012-12-20 13:43:09 -05:00
Don Mitchell
17a1e281b1 Unit tests now work!!! 2012-12-20 13:42:57 -05:00
chrisndodge
a82113dc7e Merge pull request #1191 from MITx/bug/dhm/dec12 
Another bug for when the content for an update is more than one element.
 2012-12-20 08:51:42 -08: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
chrisndodge
6ec046cefc Merge pull request #1188 from MITx/bug/dhm/dec12 
Implemented grader drop down on subsections
 2012-12-20 06:58:42 -08: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
Christina Roberts
fbabbcdbf2 Merge pull request #1184 from MITx/fix/cdodge/user-tab-crash 
malformed url generation for User's tab
 2012-12-19 10:52:34 -08: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
chrisndodge
8d15860c66 Merge pull request #1177 from MITx/bug/dhm/dec12 
Bug/dhm/dec12
 2012-12-19 08:33:17 -08:00
Jay Zoldak
e21c17ffeb Fail the Jenkins build when CMS Jasmine tests fail. 2012-12-19 11:32:55 -05: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
08d5ab0a3b Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 2012-12-19 11:11:24 -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
chrisndodge
c1c88a207d Merge pull request #1172 from MITx/bug/dhm/dec12 
Gives warning on type name change
 2012-12-19 06:33:02 -08: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
b74c542902 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 2012-12-17 17:22:26 -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
chrisndodge
c407012f2d Merge pull request #1168 from MITx/bug/dhm/dec12 
Import default grading_policy was setting it to a unicode empty string
 2012-12-17 10:17:23 -08:00
chrisndodge
288e1ec9c2 Merge pull request #1169 from MITx/fix/cdodge/course-id-on-mongo-system 
pin requests to a known version, as we believe there's been an upgrade w...
 2012-12-17 10:00:04 -08:00
Chris Dodge
02b0f011a5 pin requests to a known version, as we believe there's been an upgrade which is incompatible to our usage 2012-12-17 12:58:34 -05:00
Calen Pennington
c546c36858 Merge pull request #1147 from MITx/fix/zoldak/cms-jasmine 
Do not copy already compiled coffee to js files from xmodule video and a...
 2012-12-17 09:39:43 -08:00
Don Mitchell
e2526a37d3 Import default grading_policy was setting it to a unicode empty string 
rather than an empty dict and thus screwing up later updates.
 2012-12-17 11:50:40 -05:00
chrisndodge
c74be27a91 Merge pull request #1167 from MITx/fix/cdodge/course-id-on-mongo-system 
fix crash of custom tags when running against Mongo datastores. Mongo's ...
 2012-12-17 07:50:06 -08:00
Chris Dodge
d18f42224c fix crash of custom tags when running against Mongo datastores. Mongo's 'system' does not have a course_id attribute defined, which makes it asymmetric to XmlFilesystem store 2012-12-17 10:41:54 -05:00
chrisndodge
39d292a058 Merge pull request #1166 from MITx/bug/dhm/dec12 
Fixed course info bug (and simplified parsing). Incidentally fixed 2
 2012-12-15 14:03:58 -08: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
Chris Dodge
f5d07b1521 just tickle a file to for build cms-master. I dont seem to have the rights to force a jenkins build. 2012-12-15 15:15:45 -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