Arjun Singh
|
71923e7c1f
|
Add block display back for text
|
2012-09-27 13:31:08 -07:00 |
|
Chris Dodge
|
adad3c550b
|
Support asset library references in CapaModule. Also some code refactoring/cleanup. Preparing for review and submit
|
2012-09-27 12:31:45 -04:00 |
|
Chris Dodge
|
39e64c1e56
|
work in progress. Need to commit before rebasing to master
|
2012-09-27 10:24:53 -04:00 |
|
Chris Dodge
|
7bf7eab616
|
support client-side caching through 'Last-Modified' response headers
|
2012-09-27 10:24:53 -04:00 |
|
Chris Dodge
|
7512b78eb2
|
work-in-flight for uploading/serving of static content for courses
|
2012-09-27 10:24:53 -04:00 |
|
Arjun Singh
|
81bd0baf08
|
Fix multiple choice style and multiple choice show answer style
|
2012-09-27 02:24:01 -07:00 |
|
Lyla Fischer
|
949f638dd1
|
added several problem types
|
2012-09-26 17:31:33 -04:00 |
|
Lyla Fischer
|
c1c7d3a1db
|
added basic problem types
|
2012-09-26 16:13:16 -04:00 |
|
Calen Pennington
|
7e0b087b97
|
Remove unused reference to EditingDescriptor
|
2012-09-25 15:47:12 -04:00 |
|
Calen Pennington
|
7998b4fea6
|
Fix editing of html modules that broke with changes to EditingDescriptor
|
2012-09-25 15:46:57 -04:00 |
|
Lyla Fischer
|
3cbb8ed27c
|
fixed sequence template
|
2012-09-25 15:16:30 -04:00 |
|
Lyla Fischer
|
5478416a42
|
fixed lack-of-yaml in html template
|
2012-09-25 14:02:25 -04:00 |
|
Lyla Fischer
|
1aa51a5eb9
|
basic templates for video, html, discussion, and sequential
|
2012-09-25 13:47:45 -04:00 |
|
Calen Pennington
|
7f6196c835
|
Add an example sequence template
|
2012-09-25 10:10:45 -04:00 |
|
Calen Pennington
|
5410e161f9
|
Switch template definitions to yaml, so that they can have multiline strings
|
2012-09-25 10:10:45 -04:00 |
|
Calen Pennington
|
022e27e1a2
|
Add docstrings to xmodule.templates.py
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
5e0f0be1be
|
Fix up ErrorDescriptor._construct, and use in in ErrorDescriptor.from_json
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
bf4ae6b7e6
|
Load modules from the mongo modulestore as errordescriptors if creating a regular descriptor fails, but leave the location the same
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
d4377d4ada
|
Make imports into the CMS ignore broken modules, while still loading bad xml as error modules in the LMS
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
3107bb9c45
|
Make separate json and xml editing interfaces
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
e9358f0e4e
|
Make ErrorDescriptor continue to use the interface for __init__ that XModuleDescriptor uses, while providing a helper function for constructing from a different set of arguments
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
b69edcd869
|
Pass org and course through ErrorDescriptor.from_xml to ErrorDescriptor.__init__
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
d8736914d4
|
Display an error descriptor for a preview when a descriptor can be loaded but a module can't
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
7d8095cd97
|
Initial port of templates into filesystem based storage
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
2554413291
|
Hook up link to create modules from templates
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
912d6cd6f1
|
Move common code for updating modules in mongo to a single helper function that also handles creating the item if it doesn't already exist
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
9c5b0ba6ea
|
Create the data dir to put files in, if it doesn't exist when loading a module from mongo
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
335b4bb04b
|
Add method to find courses that contain a particular module location
|
2012-09-25 09:23:07 -04:00 |
|
Chris Dodge
|
a85b255271
|
Define 'system metadata' which should not be editable by the end user. When posting back metadata edits, we need to fetch a copy of the existing metadata and apply the changes.
|
2012-09-24 16:54:46 -04:00 |
|
Chris Dodge
|
a3bf3fb1ca
|
Put SequenceDescriptor back as a subclass of MakeModuleDescriptor. THe previous change to have it derive from EditorDescriptor was not safe as EditorDescriptor presumes that there is a edit box in the JS save flows. So we need to edit get_context() on MakoModuleDescriptor to also pass along the metadata to the Mako rendering templates
|
2012-09-21 15:49:07 -04:00 |
|
Chris Dodge
|
4b6eabec5f
|
Support editing of metadata on Sequences
|
2012-09-21 14:29:19 -04:00 |
|
Chris Dodge
|
d51f127afa
|
work-in-progress: As a problem author, I would like to be able to edit module metadata
|
2012-09-21 14:29:19 -04:00 |
|
David Ormsbee
|
a4d4a3b022
|
Merge pull request #650 from MITx/feature/bridger/course_grading
Feature/bridger/course grading
|
2012-09-21 08:10:03 -07:00 |
|
Lyla Fischer
|
1dfb745751
|
removed line from optioninput field - it makes it look like the end of a question
|
2012-09-20 19:03:16 -04:00 |
|
Bridger Maxwell
|
68ab19730f
|
Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading
Conflicts:
lms/djangoapps/courseware/views.py
|
2012-09-20 17:42:31 -04:00 |
|
Bridger Maxwell
|
dfa977dbfa
|
Fixed problem weighting bug. Attribute is on descriptor, not module.
|
2012-09-20 17:37:34 -04:00 |
|
Bridger Maxwell
|
a43b09c0a9
|
Fixed new implementation of abtest's displayable_items.
|
2012-09-20 13:23:47 -04:00 |
|
Bridger Maxwell
|
b62e13aec8
|
Using new xmodule API in grades.py.
|
2012-09-20 02:06:41 -04:00 |
|
Bridger Maxwell
|
28826b8a36
|
Added new API to xmodule(descriptor). get_children_locations and has_dynamic_children.
|
2012-09-20 00:31:37 -04:00 |
|
David Ormsbee
|
dcd32abc0e
|
Merge pull request #729 from MITx/feature/dave/textbook_fixes
Fixing textbook bugs that didn't appear in 6.002x
|
2012-09-19 14:58:24 -07:00 |
|
David Ormsbee
|
f9a49ece6f
|
Dynamically find the start and end pages of a textbook instead of hardcoding to 6.002 values
|
2012-09-19 17:12:08 -04:00 |
|
kimth
|
b3bde7d631
|
Merge pull request #727 from MITx/feature/tomg/multiple-choice
fixed styles for checkboxes
|
2012-09-19 11:05:54 -07:00 |
|
Tom Giannattasio
|
82ab2e5a67
|
fixed styles for checkboxes
|
2012-09-19 14:03:56 -04:00 |
|
kimth
|
3428f5f45a
|
Merge pull request #726 from MITx/feature/tomg/multiple-choice
polished multiple choice question styles
|
2012-09-19 08:48:19 -07:00 |
|
Tom Giannattasio
|
2c4b335f98
|
polished multiple choice question styles
|
2012-09-19 11:02:45 -04:00 |
|
arjun810
|
501d44d023
|
Merge pull request #722 from MITx/kimth/fix-imageresponse
Don't break on empty answer string
|
2012-09-18 13:43:18 -07:00 |
|
kimth
|
d401a32709
|
Don't break on empty answer string
|
2012-09-18 16:39:58 -04:00 |
|
David Ormsbee
|
12586f3679
|
Merge pull request #718 from MITx/feature/cale/cms-drag-and-drop-children
Feature/cale/cms drag and drop children
|
2012-09-18 12:09:31 -07:00 |
|
Victor Shnayder
|
09909c7ec2
|
Merge pull request #711 from MITx/kimth/onreset-type
onreset rerandomize option
|
2012-09-18 11:09:25 -07:00 |
|
Calen Pennington
|
c1ce5a87ac
|
Move sequence nav into xmodule
|
2012-09-18 13:19:01 -04:00 |
|