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
Calen Pennington
93db5acc15 Make display_name defaulting explicit 2013-03-08 14:58:09 -05:00
Will Daly
607f27e715 Fixed undefined variable error in choicegroup.html 2013-03-08 14:06:45 -05:00
Calen Pennington
d8b99e1e8e Make remote_gradebook use the new field instead of metadata 2013-03-08 13:21:58 -05:00
Calen Pennington
c1a8c6de63 Return children from timelimit module definition_from_xml in the new format (separate from definition) 2013-03-08 12:59:11 -05:00
Brian Talbot
786ffd1092 studio - further small cleanup on Sass 2013-03-08 12:44:24 -05:00
Brian Talbot
f2a495bfeb Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-08 12:23:10 -05:00
Calen Pennington
8ae336792a Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 2013-03-08 12:00:10 -05:00
Calen Pennington
d9b68e2de2 Merge pull request #1628 from MITx/feature/cale/heartbeat-metrics 
Add datadog metrics capture around heartbeat timing
 2013-03-08 08:59:44 -08:00
Brian Talbot
928ecb98fc Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-08 11:47:51 -05:00
Brian Talbot
3b2c970248 studio - reorganized and documented used Sass for studio 2013-03-08 11:47:11 -05:00
Jay Zoldak
1f30baabfd Change default browser for lettuce back to chrome. 2013-03-08 11:15:14 -05:00
Jay Zoldak
21e7bc5128 More robust handling for finding and clicking on objects by css. 
Tag tests not working under PhantomJS to skip for now.
 2013-03-08 11:15:14 -05:00
Calen Pennington
cd802d8e14 Add datadog metrics capture around heartbeat timing 2013-03-08 10:36:59 -05:00
Will Daly
352126b417 Updated tests for correct_map to match changes made to get_npoints 2013-03-08 10:08:20 -05:00
Calen Pennington
972fed2e44 Set position just-in-time when rendering sequences for the first time 2013-03-08 09:15:27 -05:00
Peter Baratta
49f85211fa More documentation for the javascript 2013-03-08 03:39:34 -07:00
Victor Shnayder
96541c434e Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 2013-03-08 00:43:46 -05:00
Victor Shnayder
84f05f9f61 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/foldit_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
 2013-03-08 00:40:18 -05:00
David Ormsbee
5f44b2de04 minor comment on partial credit 2013-03-07 23:52:01 -05:00
David Ormsbee
30f3923c15 Quick patch to regression causing partial credit to break on 6.00x 2013-03-07 23:50:09 -05:00
Diana Huang
2c6ee50ac3 Fix issue where javascript was disappearing from problem html 2013-03-07 19:39:43 -05:00
Victor Shnayder
b02ff247cb Merge pull request #1623 from MITx/fix/will/checkbox_bug 
Fixed checkbox bug in capa_module
 2013-03-07 14:05:52 -08:00
Will Daly
6a54c2a2bc Fixed checkbox bug in capa_module 2013-03-07 17:01:56 -05:00
Chris Dodge
c23c5cc3d9 add comments 2013-03-07 16:12:21 -05:00
Christina Roberts
cb70a0f9d9 Merge pull request #1620 from MITx/fix/cdodge/static-url-allow-references-to-common 
need to support link references to static content that is in the code ba...
 2013-03-07 13:07:16 -08:00
Arthur Barrett
60b060263c refactor highlight css to prevent issues with cascade 2013-03-07 16:02:22 -05:00
Chris Dodge
891bddcdf9 need to support link references to static content that is in the code base (e.g. module's .js/.css) 2013-03-07 14:28:09 -05:00
Arthur Barrett
f5c3775b5d fixed the annotation tooltip line height so it is the same in studio and the lms. 2013-03-07 12:21:47 -05:00
Will Daly
e86ed0db91 Merge branch 'master' into fix/will/mc_checkbox_bug 2013-03-07 12:07:34 -05:00
Arthur Barrett
4d136f8d3b fixed annotation tooltip styling issue in studio 2013-03-07 11:52:10 -05:00
Brian Talbot
afa704c253 Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-07 11:38:07 -05:00
Will Daly
8d83d2fb4e Added handling of condition when no multiple choice item selected, 
but the answer is incorrect.
 2013-03-07 10:52:19 -05:00
Chris Dodge
9ba759802c make export a bit more resilient. If there's a piece of metadata that we can't serialize - i.e. someone wrote a new bool attribute and didn't put it in the type mapping table - then we log the exception and continue. 2013-03-07 10:43:36 -05:00
Will Daly
e841f29352 Updated CSS and template for choicegroup response 
so that: a) checks/x marks appear after each option
for radio buttons, b) checks/x marks appear for the
entire problem (not individual options) for checkbox
buttons.

Also fixed issue with checks appearing on the next line
by changing <text> to display:inline instead of display:block
 2013-03-07 10:17:03 -05:00
Victor Shnayder
5ec39825e0 Merge pull request #1604 from MITx/hotfix/jkarni/folditscore 
Hotfix/jkarni/folditscore
 2013-03-06 17:32:29 -08:00
Victor Shnayder
b6a6e10bb5 Fix max_attempts='' 
That's what studio defaults to, and recent changes made it break.
Added a few tests to make sure it doesn't happen again.
 2013-03-06 20:16:24 -05:00
Victor Shnayder
57700a56d4 remove links to missing image files. We can add them if needed later. 2013-03-06 19:11:36 -05:00
Calen Pennington
094b18972c Append course modules to list of courses during import 2013-03-06 18:14:14 -05:00
Calen Pennington
cec3475c9d Remove references to .definition and .metadata in modules 2013-03-06 18:07:56 -05:00
Brian Wilson
b5ab766092 initial framework for htmlbook 2013-03-06 17:57:33 -05:00
jkarni
3bb108b12e Merge pull request #1608 from MITx/feature/jkarni/genex 
Feature/jkarni/genex
 2013-03-06 14:35:01 -08:00
David Ormsbee
d0bff1ed3c Merge branch 'master' into jmpm-analytics 
Conflicts:
	lms/djangoapps/instructor/views.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html
 2013-03-06 17:09:09 -05:00
Diana Huang
5c3dfd9280 Update correctmap to handle partially correct answers, and 
fix annotation tests so that they use the new test_system functionality
 2013-03-06 16:43:12 -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
Victor Shnayder
12b6b7d403 Merge pull request #1609 from MITx/diana/refactor-chemical-equation 
Refactor Chemical Equation Preview
 2013-03-06 12:09:03 -08:00
Victor Shnayder
fb350ed1e3 Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule 
Feature/abarrett/annotatable xmodule DO NOT MERGE
 2013-03-06 12:05:27 -08:00
Brian Talbot
9a7b6c7eaf Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-06 15:04:34 -05:00