Commits · f93115ee4d6d8c51dc1b7d768f90b968e68c039b · edx / edx-platform · GitLab

27 Sep, 2012 10 commits
- Merge pull request #778 from MITx/hotfix/arjun/mc_style · f93115ee
```
Fixes multiple choice styling
```
  kimth committed Sep 27, 2012
  f93115ee Browse Files
- Merge pull request #781 from MITx/feature/bridger/course_grading · eb8cef93
```
Updates to grading doc.
```
  bridger committed Sep 27, 2012
  eb8cef93 Browse Files
- Add block display back for text · 71923e7c
  Arjun Singh committed Sep 27, 2012
  
  71923e7c Browse Files
- Updates to grading doc. · 55d7d2bc
  Bridger Maxwell committed Sep 27, 2012
  
  55d7d2bc Browse Files
- Merge pull request #771 from MITx/feature/bridger/course_grading · 955e9012
```
Added doc explaining course grading at high level.
```
  David Ormsbee committed Sep 27, 2012
  955e9012 Browse Files
- Merge pull request #772 from MITx/feature/cale/fix-html-module-editing · 702c26ea
```
Feature/cale/fix html module editing
```
  Calen Pennington committed Sep 27, 2012
  702c26ea Browse Files
- Fix multiple choice style and multiple choice show answer style · 81bd0baf
  Arjun Singh committed Sep 27, 2012
  
  81bd0baf Browse Files
- Restart server when xmodule css changes (run_watch_data) · 3533497b
  Arjun Singh committed Sep 27, 2012
  
  3533497b Browse Files
- Merge pull request #777 from MITx/kimth/fix-jquery-sequence · c8d7fd78
```
Remove vestigial js include
```
  arjun810 committed Sep 26, 2012
  c8d7fd78 Browse Files
- Remove vestigial js include · 8210bfdf
  kimth committed Sep 26, 2012
  
  8210bfdf Browse Files
26 Sep, 2012 7 commits
- Merge pull request #775 from MITx/hotfix/rocha/404-email-address · 2fa122a7
```
Fix display of email address on 404 pages
```
  Calen Pennington committed Sep 26, 2012
  2fa122a7 Browse Files
- Fix display of email address on 404 pages · ed3d9443
  Carlos Andrés Rocha committed Sep 26, 2012
  
  ed3d9443 Browse Files
- Merge pull request #774 from MITx/feature/rocha/legal-terms-update · c5b5adea
```
Correct Terms of Use and Privacy static pages
```
  Calen Pennington committed Sep 26, 2012
  c5b5adea Browse Files
- Correct Terms of Use and Privacy static pages · 52bde562
  Carlos Andrés Rocha committed Sep 26, 2012
  
  52bde562 Browse Files
- Merge pull request #773 from MITx/feature/rocha/legal-terms-update · 08b7cd85
```
Update Terms of Use and Privacy static pages
```
  Calen Pennington committed Sep 26, 2012
  08b7cd85 Browse Files
- Update Terms of Use and Privacy static pages · e05c7be1
  Carlos Andrés Rocha committed Sep 26, 2012
  
  e05c7be1 Browse Files
- Merge pull request #731 from MITx/feature/ichuang/symmath_improvements · 35569d10
```
improvements in symbolic math checking.

Merging now because it is needed for Physics courses.
```
  ichuang committed Sep 25, 2012
  35569d10 Browse Files
25 Sep, 2012 23 commits
- Remove unused reference to EditingDescriptor · 7e0b087b
  Calen Pennington committed Sep 25, 2012
  
  7e0b087b Browse Files
- Fix editing of html modules that broke with changes to EditingDescriptor · 7998b4fe
  Calen Pennington committed Sep 25, 2012
  
  7998b4fe Browse Files
- Added doc explaining course grading at high level. · e1652c47
  Bridger Maxwell committed Sep 25, 2012
  
  e1652c47 Browse Files
- Merge pull request #769 from MITx/feature/rocha/elsevier-press-release · d0cfd16b
```
Fix news and announcements icons on the frontpage
```
  Calen Pennington committed Sep 25, 2012
  d0cfd16b Browse Files
- Merge pull request #750 from MITx/feature/cale/cms-save-validation · 0c6a6a6e
```
Feature/cale/cms save validation
```
  Calen Pennington committed Sep 25, 2012
  0c6a6a6e Browse Files
- Fix news and announcements icons on the frontpage · 52a9bd2d
  Carlos Andrés Rocha committed Sep 25, 2012
  
  52a9bd2d Browse Files
- Add an example sequence template · 7f6196c8
  Calen Pennington committed Sep 25, 2012
  
  7f6196c8 Browse Files
- Switch template definitions to yaml, so that they can have multiline strings · 5410e161
  Calen Pennington committed Sep 25, 2012
  
  5410e161 Browse Files
- Add docstrings to xmodule.templates.py · 022e27e1
  Calen Pennington committed Sep 25, 2012
  
  022e27e1 Browse Files
- Fix up ErrorDescriptor._construct, and use in in ErrorDescriptor.from_json · 5e0f0be1
  Calen Pennington committed Sep 25, 2012
  
  5e0f0be1 Browse Files
- Load modules from the mongo modulestore as errordescriptors if creating a… · bf4ae6b7
```
Load modules from the mongo modulestore as errordescriptors if creating a regular descriptor fails, but leave the location the same
```
  Calen Pennington committed Sep 25, 2012
  bf4ae6b7 Browse Files
- Make imports into the CMS ignore broken modules, while still loading bad xml as… · d4377d4a
```
Make imports into the CMS ignore broken modules, while still loading bad xml as error modules in the LMS
```
  Calen Pennington committed Sep 25, 2012
  d4377d4a Browse Files
- Make separate json and xml editing interfaces · 3107bb9c
  Calen Pennington committed Sep 25, 2012
  
  3107bb9c Browse Files
- Set data_dir based on parent data_dir when cloning new content in the CMS · 33f9eae3
  Calen Pennington committed Sep 25, 2012
  
  33f9eae3 Browse Files
- Make ErrorDescriptor continue to use the interface for __init__ that… · e9358f0e
```
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
```
  Calen Pennington committed Sep 25, 2012
  e9358f0e Browse Files
- Pass org and course through ErrorDescriptor.from_xml to ErrorDescriptor.__init__ · b69edcd8
  Calen Pennington committed Sep 25, 2012
  
  b69edcd8 Browse Files
- Display an error descriptor for a preview when a descriptor can be loaded but a module can't · d8736914
  Calen Pennington committed Sep 25, 2012
  
  d8736914 Browse Files
- Initial port of templates into filesystem based storage · 7d8095cd
  Calen Pennington committed Sep 25, 2012
  
  7d8095cd Browse Files
- Hook up link to create modules from templates · 25544132
  Calen Pennington committed Sep 25, 2012
  
  25544132 Browse Files
- Move common code for updating modules in mongo to a single helper function that… · 912d6cd6
```
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
```
  Calen Pennington committed Sep 25, 2012
  912d6cd6 Browse Files
- Create the data dir to put files in, if it doesn't exist when loading a module from mongo · 9c5b0ba6
  Calen Pennington committed Sep 25, 2012
  
  9c5b0ba6 Browse Files
- Remove drag-and-drop handles from navigation until we actually are going to enable them · eb20e471
  Calen Pennington committed Sep 25, 2012
  
  eb20e471 Browse Files
- Merge pull request #768 from MITx/feature/rocha/elsevier-press-release · 68a1e7a8
```
Elseview press release
```
  Calen Pennington committed Sep 25, 2012
  68a1e7a8 Browse Files