Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,204 Commits 1 Branch 0 Tags
ba69392f70a8345231e8f6e7638bf9675d72f697
Commit Graph

11204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
ba69392f70 Fix inaccurate instructions around import 2013-03-06 17:10:45 -05:00
Calen Pennington
5222c61d73 Fix how the 'empty' field is excluded from html_module editable fields 2013-03-06 16:34:21 -05:00
Calen Pennington
4327aa1885 If we can't parse policy, then set it to an empty dictionary 2013-03-06 15:18:03 -05:00
Calen Pennington
4cbae2269c Clean up how grading policy is set 2013-03-06 15:12:54 -05:00
Calen Pennington
e7900859b6 Remove the 'title' alias for lms.display_name 2013-03-06 15:11:08 -05:00
Calen Pennington
3b7a589e5a Merge remote-tracking branch 'origin/feature/alex/poll-merged' into feature/alex/poll-merged 2013-03-06 12:58:24 -05:00
Vasyl Nakvasiuk
aa026387ce Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-03-06 19:52:28 +02:00
Vasyl Nakvasiuk
493421c1ec fix test_conditional, add new conditional to "conditional_and_poll" test course 2013-03-06 19:52:18 +02:00
Vik Paruchuri
7871fce7ff Merge branch 'feature/vik/fix-oe-storage' into feature/vik/storage-model-fixes 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-03-06 12:49:11 -05:00
Vik Paruchuri
b75b091581 Remove 2 more debug statements 2013-03-06 12:27:22 -05:00
Vik Paruchuri
c1218e8c08 Remove debug statements 2013-03-06 12:26:23 -05:00
Calen Pennington
8a9ba79d1f Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-03-06 12:15:07 -05:00
Vik Paruchuri
f73979d03b Generate less db inserts 2013-03-06 11:57:14 -05:00
Vik Paruchuri
d20fc439ec Fix peer grading boolean parsing 2013-03-06 11:47:48 -05:00
Vik Paruchuri
3329af077a Force instance state to save periodically 2013-03-06 11:29:25 -05:00
Vik Paruchuri
7ea3d70c2c Caching attribute values from child module 2013-03-06 11:21:42 -05:00
Vasyl Nakvasiuk
3270caed83 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-03-06 17:10:27 +02:00
Vasyl Nakvasiuk
06001c8c1e fix test_logic 2013-03-06 17:10:15 +02:00
Calen Pennington
14873e6465 Reorderd xmodule storage migrations 2013-03-06 08:45:32 -05:00
Vasyl Nakvasiuk
bb69e9fab6 fix dnd tests 2013-03-06 14:30:29 +02:00
Vasyl Nakvasiuk
f71c43f77b fix self.excess_draggables 2013-03-06 14:28:10 +02:00
Vik Paruchuri
b7c6f7ca1a Mostly working state 2013-03-05 19:16:02 -05:00
Vik Paruchuri
0d777a7a0e Convert to passing in current task state again 2013-03-05 17:53:06 -05:00
Brian Wilson
cde4cdf839 starting pdfbook doc 2013-03-05 17:51:44 -05:00
Vik Paruchuri
904ed6c80f Combined open ended renders correctly, but internal state tracking broken 2013-03-05 17:48:39 -05:00
Vik Paruchuri
697e426ce6 Switch to passing through entire task state 2013-03-05 16:58:59 -05:00
Christina Roberts
e093431d75 Merge pull request #1581 from MITx/feature/vik/advanced-studio 
Feature/vik/advanced studio
 2013-03-05 12:28:29 -08:00
Calen Pennington
35551049ef Merge remote-tracking branch 'origin/feature/vik/fix-oe-storage' into feature/alex/poll-merged 2013-03-05 15:05:47 -05:00
Calen Pennington
b7680f3157 Fix tests except for conditional module and open ended grading 2013-03-05 15:04:59 -05:00
Vik Paruchuri
102c594e7b Remove string and old import 2013-03-05 15:01:12 -05:00
Vik Paruchuri
9475c6edac Address review comments 2013-03-05 14:41:08 -05:00
Arthur Barrett
5bbb70ef8a Advanced modules must now be specified individually in order to enable them on the 'advanced' component menu. 2013-03-05 13:47:02 -05:00
Victor Shnayder
d7484c5e10 Merge pull request #1423 from MITx/feature/jth/remove_un-enroll_all 
removed un-enroll all button for fear of disaster
 2013-03-05 10:18:30 -08:00
Will Daly
a018b8ac38 Merge pull request #1599 from MITx/feature/deena/testing 
Feature/deena/testing
 2013-03-05 09:48:23 -08:00
Jay Zoldak
b0a018195a Pep8 fixes for tests 2013-03-05 11:53:00 -05:00
Vasyl Nakvasiuk
0d83fefecf merge feature/alex/drag_and_drop-mitx into feature/alex/poll-merged 2013-03-05 18:20:38 +02:00
Jay Zoldak
cee24c5cb2 Import existing UserFactory 2013-03-05 11:18:07 -05:00
chrisndodge
692c423634 Merge pull request #1600 from MITx/bug/christina/misc 
Don't collapse multiple underscores for asset names.
 2013-03-05 08:15:54 -08:00
cahrens
cc234d45e7 Don't collapse multiple underscores for asset names. 
#202
 2013-03-05 10:55:27 -05:00
Arthur Barrett
c9b2a6a203 updated CSS to use the new advanced icon 2013-03-05 10:52:39 -05:00
Arthur Barrett
fa3961d4dd merged openended and advanced categories per discussion at today's standup 2013-03-05 10:51:59 -05:00
Christina Roberts
5b3158444e Merge pull request #1595 from MITx/bug/christina/misc 
Selenium tests to go with pull request 1577 (bug #216)
 2013-03-05 07:50:15 -08:00
Brian Talbot
ef9f963f49 studio - advanced modules: added in advanced module button icon per artie/vik work 2013-03-05 10:39:21 -05:00
Vik Paruchuri
d03fe79e07 Small metadata naming fix 2013-03-05 10:36:22 -05:00
Vik Paruchuri
2924bd2f53 wip 2013-03-05 10:20:26 -05:00
Will Daly
2fd9ccece1 Fixed whitespace issues; removed a test that made no assertions 2013-03-05 09:34:52 -05:00
Will Daly
437aadb28e Cleaned up some tests; deleted skip tests 2013-03-05 09:32:20 -05:00
Will Daly
faf5c3f0a2 Updated Deena's tests after merge with master to ensure that none 
of the tests fail.  Deleted some tests.
 2013-03-05 09:10:02 -05:00
cahrens
d891361b4a Merge branch 'master' into bug/christina/misc 2013-03-05 09:09:08 -05:00
Vasyl Nakvasiuk
f87a5fbbbd fix GraphicalSliderToolModule 2013-03-05 14:24:59 +02:00