Chris Dodge
|
e0d1449e91
|
add a finally statement to be sure to turn back on event firing on writes in case an import throws an exception
|
2013-03-19 17:42:21 -04:00 |
|
Chris Dodge
|
e59b650fab
|
add an array of courses to not refresh the metadata cache on writes. This is needed for imports where we are doing bulk updates otherwise, the DB gets thrashed and the import takes too long, timing out the browser
|
2013-03-18 15:02:49 -04:00 |
|
Calen Pennington
|
f1d4096bcd
|
Mark snippets as raw strings to avoid having to escape backslashes
|
2013-03-15 11:52:50 -04:00 |
|
Calen Pennington
|
9f99c9004b
|
Fix up capa tests
|
2013-03-15 11:28:33 -04:00 |
|
Calen Pennington
|
6b64b4214f
|
Make relative imports explicitly relative
|
2013-03-15 11:23:22 -04:00 |
|
Calen Pennington
|
fd3ba7db2a
|
Don't make cms.djangoapps a python module
|
2013-03-15 10:50:46 -04:00 |
|
Calen Pennington
|
029d8c8085
|
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
|
2013-03-15 09:46:47 -04:00 |
|
Calen Pennington
|
116ecf2a50
|
Disable sequence nav buttons when the sequence is empty
|
2013-03-15 08:39:24 -04:00 |
|
Calen Pennington
|
44e6572e12
|
Make StringyInteger and StringyFloat return None when they can't parse the string from json, and don't try to overwrite max_attempts if it's ''
|
2013-03-15 08:25:27 -04:00 |
|
Will Daly
|
ce5e86895a
|
Fixed pep8
|
2013-03-14 14:45:08 -04:00 |
|
Will Daly
|
5e433cda2e
|
Clarified comments about the logic of showing the save button
|
2013-03-14 14:43:04 -04:00 |
|
Will Daly
|
4dabb4ceb6
|
Save button no longer appears for non-randomized problems unlimited attempts
|
2013-03-14 14:34:36 -04:00 |
|
Chris Dodge
|
d2f216615f
|
move the instantiation of the metadata cache out of modulestore.py as it was causing a circular import dependency when running on AWS. Put instantiation into one_time_startup.py which I believe is run before any Django requests are handled
|
2013-03-14 13:57:48 -04:00 |
|
Calen Pennington
|
3211221f98
|
Merge pull request #1664 from MITx/feature/cdodge/cache-metadata-inheritence-in-django-cache
use django caching to hold computed metadata inheritence. Also invalidat...
|
2013-03-13 17:13:02 -07:00 |
|
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
|
a9c5a6388c
|
Update to version of xblock that supports full inheritance of field attributes
|
2013-03-13 14:51:10 -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 |
|
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 |
|
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
|
cfd7e6d214
|
Coerce correctmap keys to strings, so that they are pickleable
|
2013-03-12 09:32:19 -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 |
|
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 |
|