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

5483 Commits

Author SHA1 Message Date
John Hess
0b2226b051 Merge pull request #1660 from MITx/hotfix/jkarni/folditorder 
Table order fix (again), changes a single character
 2013-03-12 16:17:08 -07:00
Arthur Barrett
bf6ca1b0e7 use document to get scrollTop for firefox 2013-03-12 17:32:00 -04:00
Arthur Barrett
8f1e49ec88 Merge branch 'master' into feature/abarrett/annotation-styling-fixes 2013-03-12 16:56:31 -04:00
Julian Arni
830e08db1c Have definition_from_xml return (definition, children) 2013-03-12 14:34:34 -04:00
Vik Paruchuri
c40ab310c3 Blank line fixes 2013-03-12 14:24:42 -04:00
Arthur Barrett
d860b167d6 fixed tooltip positioning for non-overlapping spans in studio 2013-03-12 14:09:56 -04:00
Calen Pennington
137662081f Squelch pep8 and pylint output unless they fail 2013-03-12 13:26:17 -04:00
Vik Paruchuri
f4930fff42 Merge remote-tracking branch 'origin/feature/alex/poll-merged' into fix/vik/oe-xblock-stage2 2013-03-12 13:04:42 -04:00
Vik Paruchuri
3a22dbafbe Change task states 2013-03-12 13:04:40 -04:00
Calen Pennington
2aa24350cd Migrate the randomize module to the new storage model 2013-03-12 12:59:06 -04:00
Calen Pennington
222aca7045 Make sure to parse integers that have been stored as strings in the DB 2013-03-12 12:45:16 -04:00
Vik Paruchuri
554cb752fa Pep8 cleanup 2013-03-12 12:20:11 -04:00
Julian Arni
1058b552f2 Table order fix (again) 2013-03-12 11:30:14 -04:00
Vik Paruchuri
19e3e79cfa Remove model data, save instance state after init 2013-03-12 11:30:08 -04:00
Calen Pennington
f6b4d3aa46 Make the markdown attribute default to None, to distinguish it from the empty string 2013-03-12 10:50:14 -04:00
Calen Pennington
2a96c45677 Make default value for format setting None, and force lms and cms to be explicit about a string default 2013-03-12 10:16:14 -04:00
Calen Pennington
2113541632 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	.ruby-version
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/models/settings/course_metadata.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
 2013-03-12 07:23:28 -04:00
Calen Pennington
40f134ed4d Don't use mutable defaults for fields 2013-03-11 22:23:23 -04:00
John Hess
331806f155 Merge pull request #1646 from MITx/feature/jkarni/folditx 
Feature/jkarni/folditx
 2013-03-11 15:50:05 -07:00
John Hess
d44e7272d2 readding Julian Arni's update to definition 2013-03-11 18:17:12 -04:00
John Hess
ad92eb4d02 whitespace back to original. for real though. 2013-03-11 18:05:34 -04:00
John Hess
00c35c95a4 whitespace back to original 2013-03-11 18:05:10 -04:00
John Hess
cc2c26b924 reverted change to definition to/from xml 2013-03-11 18:04:21 -04:00
Arthur Barrett
fcf82ba2bc fixed pep8 violations for annotation module 2013-03-11 18:02:22 -04:00
Arthur Barrett
946af8e189 Merge branch 'master' into feature/abarrett/annotation-styling-fixes 2013-03-11 16:27:55 -04:00
Arthur Barrett
094458dd6f Modified tooltip positioning on non-overlapping annotation spans. 2013-03-11 16:19:36 -04:00
Calen Pennington
a39d607a8d Make default course grading weights integers, to minimize floating point variation 2013-03-11 15:41:59 -04:00
Jay Zoldak
1c98d5fc8d Fix modulestore tests for pep8 violations 2013-03-11 15:16:09 -04:00
David Ormsbee
0605c94113 Merge pull request #1636 from MITx/feature/brian/htmlbook 
Initial implementation of htmlbook.
 2013-03-11 11:38:46 -07:00
Calen Pennington
de46666a7f Use .get to avoid key errors during inheritance 2013-03-11 14:38:16 -04:00
Brian Wilson
53f85f2a07 return empty list if no html or pdf textbook appears in policy.json 2013-03-11 13:52:43 -04:00
Calen Pennington
a943117608 Log ErrorDescriptor creation as a warning 2013-03-11 13:42:07 -04:00
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
Julian Arni
588b27c9dc Added Descriptor method, fixed order issue. 2013-03-11 11:17:12 -04:00
Calen Pennington
9c85d920ee Fixing tests created on master 2013-03-11 10:48:06 -04:00
Calen Pennington
6395745c2b Clean up serialization on some fields 2013-03-08 21:17:19 -05: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
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
Calen Pennington
972fed2e44 Set position just-in-time when rendering sequences for the first time 2013-03-08 09:15:27 -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
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
Arthur Barrett
60b060263c refactor highlight css to prevent issues with cascade 2013-03-07 16:02:22 -05:00