Calen Pennington
7b5427006c
Save lcp state on initialization (for seed initialization)
2013-03-11 12:25:45 -04:00
Calen Pennington
881e137fb0
Save lcp state when a problem is saved
2013-03-11 12:23:24 -04:00
Brian Talbot
524db5e3f9
Merge branch 'master' into fix/btalbot/studio-sasscleanup
2013-03-11 11:35:25 -04:00
Will Daly
6b94090e67
Fixed jasmine test issue with cms caused by previous change
...
to order of file import. Introduced static_files list
in files.json (supported in original django_jasmine implementation)
that loads static files before any compiled files.
2013-03-11 11:27:49 -04:00
Will Daly
618de5df25
Fixed import error for histogram.coffee
2013-03-11 11:27:49 -04:00
Julian Arni
588b27c9dc
Added Descriptor method, fixed order issue.
2013-03-11 11:17:12 -04:00
Calen Pennington
95f8f811c5
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/course_module.py
2013-03-11 10:49:29 -04:00
Calen Pennington
9c85d920ee
Fixing tests created on master
2013-03-11 10:48:06 -04:00
Diana Huang
421e169e1e
Update tests with new attributes.
2013-03-11 10:29:18 -04:00
Diana Huang
0c949d20c9
Add the ability to hide correctness markers
...
with a custom message for when they submit something.
2013-03-11 10:12:33 -04:00
David Ormsbee
4d4869b176
Remove HTTP-based logging leftover from early experiments.
2013-03-11 01:24:25 -04:00
David Ormsbee
5f125e6807
Merge branch 'master' into jmpm-analytics
2013-03-10 01:09:03 -05:00
Calen Pennington
6395745c2b
Clean up serialization on some fields
2013-03-08 21:17:19 -05:00
Carlos Andrés Rocha
fb407e3cb8
Merge pull request #1633 from MITx/fix/will/choicegroup_html_render_error
...
Fixed undefined variable error in choicegroup.html
2013-03-08 14:30:59 -08:00
cahrens
89ea88cdf2
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
2013-03-08 16:09:01 -05:00
cahrens
a68cdd35d8
Add advanced_modules course setting back in.
2013-03-08 16:07:59 -05:00
Calen Pennington
035829289e
Parse weight as a float when reading from a string
2013-03-08 16:01:27 -05:00
Calen Pennington
8bb0c64ff9
Set grading policy to an empty dict if it can't be decoded from json
2013-03-08 15:36:19 -05:00
Calen Pennington
248ce8803b
Make annotable module use the new xmodule format
2013-03-08 15:09:59 -05:00
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
