Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
60,355 Commits 1 Branch 0 Tags
20d87061d428fb554bfbd3e904b1dcd052d6f934
Commit Graph

19226 Commits

Author SHA1 Message Date
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
Calen Pennington
71f39bc4c0 Merge pull request #751 from MITx/cdodge/meta-data-cms-editing 
Cdodge/meta data cms editing
 2012-09-25 06:16:51 -07: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
Victor Shnayder
0b40e75166 Fix login-if-?next behavior 
* for more context, see https://basecamp.com/1892446/projects/631155-devops/messages/4719963-strange-caching
 2012-09-23 22:33:20 -04:00
Victor Shnayder
450a20228d more info 2012-09-21 17:49:10 -04:00
Victor Shnayder
8d0cc1007a add a debug_request view that prints the request. 2012-09-21 16:51:49 -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
Chris Dodge
0a7dfca0e4 Fix JSON postback error where the content-type header line can contain more info than just the application/json descriptor. Now we just to a compare on the start of the header value. 2012-09-21 14:25:48 -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
Tom Giannattasio
68fe164b3b Merge pull request #745 from MITx/feature/lyla/optionresponseformatting 
removed line from optioninput field formatting
 2012-09-21 06:26:18 -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
188eeed3a3 Removed accidental symlink. 2012-09-20 17:41:02 -04:00
Bridger Maxwell
997c0ee1c6 Grading test now tries a weighted problem. 2012-09-20 17:38:07 -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
92171ea5da Added course grading test. 2012-09-20 16:56:27 -04:00
Bridger Maxwell
9ce3b83be3 Added a simple course for testing the grading functions. 2012-09-20 13:29:16 -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
Victor Shnayder
27cd9c9f82 Remove unused 'module' parameter from replace_{static,course}_urls 2012-09-20 01:12:33 -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
David Ormsbee
62bb10156d Merge pull request #704 from MITx/feature/victor/custom-tabs 
Custom tabs
 2012-09-18 07:10:42 -07:00
Calen Pennington
c914a46a3f Merge pull request #691 from MITx/feature/victor/anon-deep-links 
Feature/victor/anon deep links
 2012-09-18 07:08:45 -07:00
Victor Shnayder
ba92bdc2dc Merge pull request #708 from MITx/feature/cale/cms-bug-fixes 
Feature/cale/cms bug fixes
 2012-09-18 06:20:15 -07:00
Victor Shnayder
d9219c6086 Custom tabs 
* specify in tabs list in course policy
  - active page tracking now done in tabs.py
  - properly handle the fact that there may be multiple textbooks

* Still need:
  - wiki pages
  - (if that's delayed, special-case syllabus support)
 2012-09-18 08:45:09 -04:00
kimth
f45fa578a2 onreset rerandomize option 2012-09-17 15:56:09 -04:00
Tom Giannattasio
0acc75e3a4 fixed detailed-solution bug 2012-09-17 14:51:20 -04:00