Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,428 Commits 1 Branch 0 Tags
72ec00cbb71d0a1d7201dfdcd92462156dbd6152
Commit Graph

19237 Commits

Author SHA1 Message Date
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
Brian Talbot
dd82ea5738 Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-04 12:47:23 -05:00
Will Daly
1cc8950780 Added comments for make_dict_of_responses() in capa module 2013-03-04 12:45:13 -05:00
Will Daly
082216395c Added unit test for conversion of GET parameters for capa module. 
Added error checking for possible error cases
 2013-03-04 12:38:11 -05:00
David Ormsbee
a00f11c1ff Tell user that spaces aren't allowed in usernames (requested by Teppo). 2013-03-04 11:17:29 -05:00
Ned Batchelder
7c8a90229e Use 'is None' and 'is not None' 2013-03-04 10:57:25 -05:00
Ned Batchelder
97f1e04282 Fix some 2-space indents 2013-03-04 10:57:25 -05:00
Calen Pennington
908bfa3c09 Remove the old poll module test case 2013-03-04 09:02:59 -05:00
Calen Pennington
ee6c3d6b7e Make advertised_start work when it's not parseable as a date 2013-03-04 09:02:51 -05:00
jmclaus
cb14893daa Genex updates hidden input field on any modification of dna sequence 2013-03-03 21:41:52 +01:00
jmclaus
72b7193c03 Genex is gradable 2013-03-03 10:43:16 +01:00
Brian Talbot
47aacc70b7 Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-02 22:11:16 -05:00
Victor Shnayder
310ecead36 Merge pull request #1582 from MITx/feature/kevin/cohorts_take_3 
Feature/kevin/cohorts take 3
 2013-03-01 16:13:30 -08:00
Will Daly
548f9b85a8 Changed response_msg argument default to '' 2013-03-01 17:07:23 -05:00
Arthur Barrett
20174fd24a Removing failing jasmine tests for now. 2013-03-01 17:06:12 -05:00
Vik Paruchuri
4400f94196 Fix some xml issues in yaml 2013-03-01 16:41:18 -05:00
Will Daly
28a502ea97 Fixed a bug in CorrectMaps.get_npoints(), which would return 1 
when npoints=0.
 2013-03-01 16:40:54 -05:00
Your Name
b7a6eadca4 new cohorts tested 2013-03-01 16:33:27 -05:00
chrisndodge
c236b2c8a9 Merge pull request #1550 from MITx/feature/cdodge/add-test-delete 
add another command line argument to allow users to only simulate a dele...
 2013-03-01 13:29:06 -08:00
Don Mitchell
e55bb845b2 Fix for script tags w/in json objects being oddly evaluated on html page 
load by doing load separately. In process, upgraded backbone which
necessitated changing getByCid to get and got rid of obsolete
course_settings master object.
 2013-03-01 16:05:58 -05:00