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

11533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
c67f1677fd remove imports of Mongo.py from modules. They shouldn't need them. Also, video captions shouldn't need special logic to compute the url rewrites as the main get_html() should do this. 2013-03-13 15:57:38 -04:00
Chris Dodge
413aeed1b3 use django caching to hold computed metadata inheritence. Also invalidate the cache entries on writes (insert, updates) 2013-03-13 15:33:15 -04:00
Calen Pennington
a1c375b499 Run pylint on lms/*.py and cms/*.py 2013-03-13 13:30:49 -04:00
Calen Pennington
47ebd2b661 Set pythonpath when running pylint via rake to avoid import errors 2013-03-13 13:20:11 -04:00
Calen Pennington
324d286f9b Don't reference .metadata for data_dir 2013-03-13 12:47:05 -04:00
Calen Pennington
531eb80eb2 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.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/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-13 12:18:04 -04:00
Calen Pennington
5379a9fd2b Make the id property available on both modules and descriptors, and make it a property, so that we aren't duplicating the location data 2013-03-13 11:56:53 -04:00
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
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
Diana Huang
faab0ac139 Merge pull request #1657 from MITx/fix/brian/regrade-partial 
add management command to regrade partial-credit problems affected by ge...
 2013-03-12 13:40:15 -07:00
Christina Roberts
349348fcd3 Merge pull request #1661 from MITx/fix/cdodge/dont-clobber-on-delete-draft 
hot fix for delete_item. The 'delete_all_versions' is useful in that it ...
 2013-03-12 13:21:42 -07:00
Calen Pennington
47420fe7c5 Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads 2013-03-12 16:18:48 -04:00
Ned Batchelder
b05b627c23 Reduce some more pylint noise 2013-03-12 16:10:37 -04:00
Brian Wilson
046e0fd75e Merge remote-tracking branch 'origin/master' into fix/brian/regrade-partial 2013-03-12 16:09:10 -04:00
Calen Pennington
174ba0039d Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads 2013-03-12 15:51:29 -04:00
Brian Wilson
47e708e713 fix pylint and pep8 warnings 2013-03-12 15:49:48 -04:00
Chris Dodge
e5ee0a77ed hot fix for delete_item. The 'delete_all_versions' is useful in that it is set to true when doing explicit deletes as opposed to 'delete draft'. If delete_all_versions=False, then don't remove the deleted item from the parent children collection 2013-03-12 15:24:10 -04:00
Brian Wilson
6aed059d5f Change date and remove filtering by grade. Add check for student_answers. 2013-03-12 14:55:27 -04:00
Ned Batchelder
bc854ef068 Merge branch 'master' of github.com:MITx/mitx 2013-03-12 14:34:54 -04:00
Ned Batchelder
70af75e852 Don't run pylint on migrations, and it's ok to have a global name 'log' 2013-03-12 14:34:39 -04:00
Julian Arni
830e08db1c Have definition_from_xml return (definition, children) 2013-03-12 14:34:34 -04:00
Jay Zoldak
0ee656316b Merge pull request #1659 from MITx/fix/vik/oe-pep8 
Fix/vik/oe pep8
 2013-03-12 11:34:26 -07:00
Vik Paruchuri
c40ab310c3 Blank line fixes 2013-03-12 14:24:42 -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
Brian Wilson
fe0447093c add management command to regrade partial-credit problems affected by get_npoints bug. 2013-03-12 14:00:18 -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
Vik Paruchuri
554cb752fa Pep8 cleanup 2013-03-12 12:20:11 -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
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
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