Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,507 Commits 1 Branch 0 Tags
92e99d7a8b458cdf7fc3609324cb5ade3daf4767
Commit Graph

11507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
92e99d7a8b Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields 2013-03-13 11:35:50 -04:00
Calen Pennington
f01c7f9469 Merge pull request #1649 from MITx/feature/jkarni/folditxblockupdate 
readding Julian Arni's update to definition
 2013-03-13 07:07:25 -07:00
Calen Pennington
cf4ea53d01 Small fixes to mongo metadata translations 2013-03-13 09:34:27 -04:00
Calen Pennington
7aa97d2999 Do metadata name translation in the mongo modulestore (because it isn't using from_json) 2013-03-13 07:42:14 -04:00
Calen Pennington
dc2dbb3412 Do metadata name translation in json import as well as xml import 2013-03-13 07:42:14 -04:00
Calen Pennington
8ace7eeb2d Translate metadata names that are coming in from the policy file as well as from xml attributes 2013-03-13 07:42:14 -04:00
Chris Dodge
e786ed2f51 re-add lost xml_importer.py code 2013-03-13 00:19:48 -04:00
Julian Arni
830e08db1c Have definition_from_xml return (definition, children) 2013-03-12 14:34:34 -04:00
Christina Roberts
1379ba9c58 Merge pull request #1658 from MITx/fix/zoldak/poll-merged-fix-factory 
Update course factory to reflect XBlock changes
 2013-03-12 11:09:51 -07:00
Jay Zoldak
f9f0bd0deb Update course factory to reflect XBlock changes 2013-03-12 14:05:12 -04:00
Calen Pennington
c0b6c01fd1 Use the right pip for bash OR 2013-03-12 13:30:24 -04:00
Calen Pennington
137662081f Squelch pep8 and pylint output unless they fail 2013-03-12 13:26:17 -04:00
Calen Pennington
7b2efa9dbf Merge pull request #1656 from MITx/fix/vik/oe-xblock-stage2 
Fix/vik/oe xblock stage2
 2013-03-12 10:20:52 -07: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
Calen Pennington
433e50e04f Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads 2013-03-12 12:41:22 -04:00
Don Mitchell
6922152165 Merge pull request #1653 from MITx/feature/studio/advanced-settings-revamp-merge 
Advanced Settings changes.
 2013-03-12 09:13:16 -07:00
Calen Pennington
f155bd0943 Merge pull request #1655 from MITx/fix/vik/oe-xblock-stage 
Potentially fix xblock storage model for open ended
 2013-03-12 08:46:03 -07:00
Vik Paruchuri
19e3e79cfa Remove model data, save instance state after init 2013-03-12 11:30:08 -04:00
cahrens
eea5900591 Add in Mark's copy changes. 2013-03-12 11:15:50 -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
1411fadd28 Fix access to children via definition 2013-03-12 10:41:10 -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
cahrens
bdf1b1b097 Merge branch 'feature/alex/poll-merged' into feature/studio/advanced-settings-revamp-merge 2013-03-12 09:38:34 -04:00
Calen Pennington
cfd7e6d214 Coerce correctmap keys to strings, so that they are pickleable 2013-03-12 09:32:19 -04:00
cahrens
99f55266f5 Do not need to pass blacklist keys to client. 2013-03-12 09:27:46 -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
chrisndodge
90caa65b53 Merge pull request #1651 from MITx/fix/cdodge/pylint-improvements 
do a bunch of pylint improvements
 2013-03-11 18:18:00 -07:00
Chris Dodge
bf0e5a2701 do a bunch of pylint improvements 2013-03-11 21:14:24 -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
cahrens
84f2137935 Merge branch 'feature/alex/poll-merged' into feature/studio/advanced-settings-revamp 2013-03-11 16:57:07 -04:00
cahrens
7e8fcb85ff Updated Selenium test, deleted dead code related to Advanced Settings. 2013-03-11 16:56:24 -04:00
Calen Pennington
a39d607a8d Make default course grading weights integers, to minimize floating point variation 2013-03-11 15:41:59 -04:00
Calen Pennington
4cea094f70 Be a little more liberal with what count's as not having a due date in a section 2013-03-11 15:29:58 -04:00
chrisndodge
894f9171be Merge pull request #1647 from MITx/fix/zoldak/pep8-cleanup-tests 
Fix modulestore tests for pep8 violations
 2013-03-11 12:20:38 -07:00
Jay Zoldak
1c98d5fc8d Fix modulestore tests for pep8 violations 2013-03-11 15:16:09 -04:00
Don Mitchell
d85f7ac9be Merge pull request #1645 from MITx/feature/cdodge/pylint-cleanup 
Feature/cdodge/pylint cleanup
 2013-03-11 12:10:05 -07:00
Julian Arni
6e92666a20 Fixed score order. 
Less is more.
 2013-03-11 14:57:19 -04:00
Chris Dodge
4ec3683c3c clean up some pylint violations 2013-03-11 14:57:04 -04:00
Chris Dodge
26f4424581 clean up some pylint violations 2013-03-11 14:55:37 -04:00
Chris Dodge
78c8358957 clean up pyling violations from views.py 2013-03-11 14:51:44 -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