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

6956 Commits

Author SHA1 Message Date
Diana Huang
f8adfc6244 Merge pull request #1602 from MITx/fix/will/capa_xmodule_unit_tests 
Fix/will/capa xmodule unit tests
 2013-03-06 06:03:17 -08:00
Peter Baratta
c6545eb092 Begin to document symmath as we go 2013-03-06 06:21:08 -07: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
Arthur Barrett
0424b53336 show the annotation callout at the span center rather than at the mouse 2013-03-06 00:05:41 -05:00
Arthur Barrett
3393e6385d set a default height on the commentary textbox to show 5 lines of text 2013-03-06 00:05:36 -05:00
Arthur Barrett
2ed7394f27 visually distinguish instructions from guided discussion section 2013-03-06 00:05:28 -05: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
Vik Paruchuri
904ed6c80f Combined open ended renders correctly, but internal state tracking broken 2013-03-05 17:48:39 -05:00
Will Daly
c7d80a91ee Changed name of survey_question to is_survey_question for clarity 2013-03-05 17:30:38 -05:00
Will Daly
43d8574e92 Refactored use of test_system in xmodule unit tests 
so that a new one is created for each test
 2013-03-05 17:26:15 -05:00
Will Daly
73281a43c9 Added tests for get_problem_html, including error conditions 2013-03-05 17:02:12 -05:00
Vik Paruchuri
697e426ce6 Switch to passing through entire task state 2013-03-05 16:58:59 -05:00
Will Daly
40d7e8addf Moved problem HTML error handling to its own function 2013-03-05 15:43:47 -05:00
Will Daly
608552429f Refactored capa module HTML rendering, isolating logic for 
determining which buttons to show
 2013-03-05 15:35:14 -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
9475c6edac Address review comments 2013-03-05 14:41:08 -05:00
Will Daly
42043d2ccc Added tests for capa module save_problem() 2013-03-05 12:01:04 -05:00
Will Daly
6ec3b94d0c Added test for capa module closed() method; modified 
closed() to handle edge cases
 2013-03-05 11:47:41 -05:00
Will Daly
49784009d5 Fixed incorrect doc string 2013-03-05 11:23:14 -05:00
Will Daly
21af0493fd Added unit tests for capa_module reset_problem() 2013-03-05 11:21:28 -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
cahrens
cc234d45e7 Don't collapse multiple underscores for asset names. 
#202
 2013-03-05 10:55:27 -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
Brian Talbot
156a702e08 Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-05 09:57:35 -05:00
Vasyl Nakvasiuk
f87a5fbbbd fix GraphicalSliderToolModule 2013-03-05 14:24:59 +02:00
chrisndodge
59250225d9 Merge pull request #1592 from MITx/fix/cdodge/optimize-instructor-dashboard 
additional courseware view optimizations. Do a 'depth' fetch on the sele...
 2013-03-04 17:19:53 -08:00
Chris Dodge
6ce3493f00 add comment 2013-03-04 19:59:18 -05:00
Vik Paruchuri
dc7c391454 Converting combined open ended module 2013-03-04 19:14:38 -05:00
Vik Paruchuri
cb4a7c663c A somewhat working state for notifications. Combined open ended and peer grading xmodules still have significant errors. 2013-03-04 18:54:52 -05:00
Vik Paruchuri
b5786874ab Wiring through some changes 2013-03-04 18:04:13 -05:00
Vik Paruchuri
77ed921624 Prelim wiring on peer grading and combined open ended xmodules 2013-03-04 17:48:43 -05:00
Arthur Barrett
7a0aead0d9 annotation now hides automatically on mouseleave events. click to hide/show or re-position the annotation. 2013-03-04 17:21:32 -05:00
Vik Paruchuri
02539a3bc8 Start converting COE storage model 2013-03-04 17:06:39 -05:00
Calen Pennington
1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-04 16:33:40 -05:00
Jay Zoldak
22420adc9a Merge pull request #1594 from MITx/bug/dhm/course_update_js 
Provide convenience converter of the grading policy but don't save it on
 2013-03-04 13:29:10 -08:00
Will Daly
9743f6bea9 Fixed indentation in capa module. 
Added test of HTML output for successful check to capa module unit tests
 2013-03-04 16:16:38 -05:00
Don Mitchell
0c4a52567e Provide convenience converter of the grading policy but don't save it on 
the object.
 2013-03-04 16:13:29 -05:00
Will Daly
d148906851 Added unit tests for capa module check_problem() method 2013-03-04 16:06:14 -05:00
Christina Roberts
d0eefc6a67 Merge pull request #1580 from MITx/bug/dhm/course_update_js 
Fix for script tags w/in json objects being oddly evaluated on html page
 2013-03-04 12:42:42 -08:00
Don Mitchell
020e1e94fb Move side effecting of definition for grader to the course_module and 
don't make caller responsible.
 2013-03-04 15:38:47 -05:00
Victor Shnayder
df5ad6ba42 Merge pull request #1574 from MITx/fix/will/cs191_matrix_style_bug 
Fix/will/cs191 matrix style bug
 2013-03-04 12:28:12 -08:00
Chris Dodge
a81e9a673c additional courseware view optimizations. Do a 'depth' fetch on the selected section so that it does a more efficient set of queries to the database. Also, in the CachingDescriptorSystem, if we have a 'cache miss', when we do the actual fetch (which creates a new 'system'), keep that fetched data around in our own collection, in case it is queried again 2013-03-04 14:59:45 -05:00
David Ormsbee
9d2a2cbc2f Merge pull request #1555 from MITx/feature/jkarni/foldit-api 
Feature/jkarni/foldit api
 2013-03-04 11:40:43 -08:00
Arthur Barrett
b0abfa07c8 style the guided discussion text so it is boxed like the instructions text. 2013-03-04 14:23:41 -05:00
Arthur Barrett
2e6115c734 constrain the annotation call-out horizontally so it is always visible in the window 2013-03-04 14:19:28 -05:00