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

6341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
702c26eafc Merge pull request #772 from MITx/feature/cale/fix-html-module-editing 
Feature/cale/fix html module editing
 2012-09-27 07:21:16 -07:00
arjun810
c8d7fd7849 Merge pull request #777 from MITx/kimth/fix-jquery-sequence 
Remove vestigial js include
 2012-09-26 21:18:51 -07:00
kimth
8210bfdff5 Remove vestigial js include 2012-09-26 19:51:04 -07:00
Calen Pennington
2fa122a784 Merge pull request #775 from MITx/hotfix/rocha/404-email-address 
Fix display of email address on 404 pages
 2012-09-26 10:37:26 -07:00
Carlos Andrés Rocha
ed3d944371 Fix display of email address on 404 pages 2012-09-26 13:35:48 -04:00
Calen Pennington
c5b5adeaa9 Merge pull request #774 from MITx/feature/rocha/legal-terms-update 
Correct Terms of Use and Privacy static pages
 2012-09-26 10:25:41 -07:00
Carlos Andrés Rocha
52bde562ce Correct Terms of Use and Privacy static pages 2012-09-26 13:19:33 -04:00
Calen Pennington
08b7cd8548 Merge pull request #773 from MITx/feature/rocha/legal-terms-update 
Update Terms of Use and Privacy static pages
 2012-09-26 09:01:26 -07:00
Carlos Andrés Rocha
e05c7be1ab Update Terms of Use and Privacy static pages 2012-09-26 10:42:08 -04:00
ichuang
35569d1086 Merge pull request #731 from MITx/feature/ichuang/symmath_improvements 
improvements in symbolic math checking.

Merging now because it is needed for Physics courses.
 2012-09-25 19:36:02 -07: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
Calen Pennington
d0cfd16bfa Merge pull request #769 from MITx/feature/rocha/elsevier-press-release 
Fix news and announcements icons on the frontpage
 2012-09-25 07:39:19 -07:00
Calen Pennington
0c6a6a6e53 Merge pull request #750 from MITx/feature/cale/cms-save-validation 
Feature/cale/cms save validation
 2012-09-25 07:34:09 -07:00
Carlos Andrés Rocha
52a9bd2d1e Fix news and announcements icons on the frontpage 2012-09-25 10:33:38 -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
33f9eae3e8 Set data_dir based on parent data_dir when cloning new content in the CMS 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
eb20e47160 Remove drag-and-drop handles from navigation until we actually are going to enable them 2012-09-25 10:10:44 -04:00
Calen Pennington
68a1e7a8a0 Merge pull request #768 from MITx/feature/rocha/elsevier-press-release 
Elseview press release
 2012-09-25 07:03:00 -07:00
Calen Pennington
57d0dd1b0b Pass location to get_containing_courses 2012-09-25 10:01:20 -04:00
Carlos Andrés Rocha
17820fef3b Made small correction to Elseview announcement on front page 2012-09-25 09:41:50 -04:00
Carlos Andrés Rocha
7fd6e0e23f Change subtitle of Elsevier announcement on the frontpage 2012-09-25 09:41:50 -04:00
Carlos Andrés Rocha
a948c13496 Resize images for the news feed on the frontpage 2012-09-25 09:41:50 -04:00
Carlos Andrés Rocha
1a95abd095 Update Elsevier press release and frontpage feed 2012-09-25 09:41:50 -04:00
Carlos Andrés Rocha
3492243ffa Add Elsevier press release 2012-09-25 09:41:50 -04:00
Calen Pennington
55771159a5 Merge pull request #742 from MITx/feature/cale/cms-to-lms-links 
Add links from the editing page for the cms to the corresponding page in...
 2012-09-25 06:23:23 -07: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
2223d2007b Only display the LMS link if it's set up, and don't error if it isn't 2012-09-25 09:18:54 -04:00
Calen Pennington
c7209a736e Add links from the editing page for the cms to the corresponding page in the lms 2012-09-25 09:18:54 -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
arjun810
e50cc77adf Merge pull request #767 from MITx/feature/dave/progress_reverse_quickfix 
Quick fix for scores within a homework/lab showing up in reverse order.
 2012-09-24 13:30:28 -07:00
David Ormsbee
5f6cc6ef93 Quick fix for scores within a homework/lab showing up in reverse order. 
The real fix would be to have yield_dynamic_descriptor_descendents return
things in the proper order, but I'm not entirely sure what's going on
there, and this is a bug on prod now.
 2012-09-24 16:24:38 -04:00
Chris Dodge
e6445ceaa0 adjust implementation to reflect feedback from Calen. Also limit the jQuery selection to be within the metadata-edit region, just to avoid picking up other elements decorated with that attribute 2012-09-24 13:03:34 -04:00
Victor Shnayder
eae2ef1d74 Merge pull request #765 from MITx/feature/victor/fix-index-js-caching 
optimize!
 2012-09-24 06:24:33 -07:00
Victor Shnayder
ea762eabf1 optimize! 2012-09-24 09:22:35 -04:00
Calen Pennington
2edda935f7 Merge pull request #764 from MITx/feature/victor/fix-index-js-caching 
Also make the actual ?next redirection work with caching
 2012-09-24 06:20:52 -07:00