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

7826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
239b118abe add service entry point to generate tar.gz file and return to caller. Use of the NamedTemporaryFile will auto cleanup. 2012-12-27 15:31:12 -05:00
Chris Dodge
8e5fc2917a Merge branch 'feature/btalbot/cms-export' into feature/cdodge/export 2012-12-27 14:43:36 -05:00
Chris Dodge
3fa425c5d0 add unit test for import->export->import simple flow 2012-12-27 14:40:38 -05:00
Chris Dodge
625237601f Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export 
Conflicts:
	common/lib/xmodule/xmodule/contentstore/content.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
 2012-12-27 14:16:40 -05:00
Don Mitchell
53b73ca3da Merge pull request #1208 from MITx/feature/cdodge/clone-course 
fix up some thumbnail issues. Also we need to manage the user permission...
 2012-12-27 09:26:51 -08:00
Chris Dodge
6951865229 add unit tests for course cloning and deleting 2012-12-27 12:20:45 -05:00
chrisndodge
a2d283d9e9 Merge pull request #1209 from MITx/bug/dhm/dec12 
Got settings details unit tests to invoke the view handlers
 2012-12-27 08:34:58 -08:00
Chris Dodge
9dff39dd6d start adding clone unit test 2012-12-27 11:25:04 -05:00
Don Mitchell
03e79cc819 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 2012-12-27 11:22:29 -05:00
Don Mitchell
da343fd1d7 Finally! Details unit tests work and pass. Grading ones are fairly far 
along.
 2012-12-27 11:22:15 -05:00
Chris Dodge
fe408be1cc message edit 2012-12-27 10:32:07 -05:00
Chris Dodge
7088821233 fix command error message. There are really only two arguments supported (the optional 6 had been removed, but I forgot to change the message 2012-12-27 10:30:26 -05:00
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
chrisndodge
9f04f19a1c Merge pull request #1205 from MITx/bug/dhm/dec12 
Bug/dhm/dec12
 2012-12-27 07:03:34 -08: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
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