Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 55d7d2bc14 Updates to grading doc. Bridger Maxwell 2012-09-27 13:29:04 -04:00
  • adad3c550b Support asset library references in CapaModule. Also some code refactoring/cleanup. Preparing for review and submit Chris Dodge 2012-09-27 12:31:45 -04:00
  • 955e90129a Merge pull request #771 from MITx/feature/bridger/course_grading David Ormsbee 2012-09-27 08:39:49 -07:00
  • 39e64c1e56 work in progress. Need to commit before rebasing to master Chris Dodge 2012-09-27 09:55:30 -04:00
  • 7bf7eab616 support client-side caching through 'Last-Modified' response headers Chris Dodge 2012-09-26 16:39:02 -04:00
  • 7512b78eb2 work-in-flight for uploading/serving of static content for courses Chris Dodge 2012-09-26 15:26:13 -04:00
  • 85e6c23386 work-in-flight for uploading/serving of static content for courses Chris Dodge 2012-09-26 15:24:21 -04:00
  • 702c26eafc Merge pull request #772 from MITx/feature/cale/fix-html-module-editing Calen Pennington 2012-09-27 07:21:16 -07:00
  • 81bd0baf08 Fix multiple choice style and multiple choice show answer style Arjun Singh 2012-09-27 02:24:01 -07:00
  • 3533497b58 Restart server when xmodule css changes (run_watch_data) Arjun Singh 2012-09-27 02:23:42 -07:00
  • c8d7fd7849 Merge pull request #777 from MITx/kimth/fix-jquery-sequence arjun810 2012-09-26 21:18:51 -07:00
  • 8210bfdff5 Remove vestigial js include kimth 2012-09-26 19:51:04 -07:00
  • 949f638dd1 added several problem types Lyla Fischer 2012-09-26 17:31:33 -04:00
  • 3449a74241 merge with master Lyla Fischer 2012-09-26 16:15:04 -04:00
  • 8dd0feb44a basic templates for video, html, discussion, and sequential Lyla Fischer 2012-09-25 13:47:45 -04:00
  • c1c7d3a1db added basic problem types Lyla Fischer 2012-09-26 16:13:16 -04:00
  • 2fa122a784 Merge pull request #775 from MITx/hotfix/rocha/404-email-address Calen Pennington 2012-09-26 10:37:26 -07:00
  • ed3d944371 Fix display of email address on 404 pages Carlos Andrés Rocha 2012-09-26 13:35:48 -04:00
  • c5b5adeaa9 Merge pull request #774 from MITx/feature/rocha/legal-terms-update Calen Pennington 2012-09-26 10:25:41 -07:00
  • 52bde562ce Correct Terms of Use and Privacy static pages Carlos Andrés Rocha 2012-09-26 13:19:33 -04:00
  • 08b7cd8548 Merge pull request #773 from MITx/feature/rocha/legal-terms-update Calen Pennington 2012-09-26 09:01:26 -07:00
  • e05c7be1ab Update Terms of Use and Privacy static pages Carlos Andrés Rocha 2012-09-26 10:42:08 -04:00
  • 35569d1086 Merge pull request #731 from MITx/feature/ichuang/symmath_improvements ichuang 2012-09-25 19:36:02 -07:00
  • 7e0b087b97 Remove unused reference to EditingDescriptor Calen Pennington 2012-09-25 15:47:12 -04:00
  • 7998b4fea6 Fix editing of html modules that broke with changes to EditingDescriptor Calen Pennington 2012-09-25 15:46:57 -04:00
  • 3cbb8ed27c fixed sequence template Lyla Fischer 2012-09-25 15:16:30 -04:00
  • 5478416a42 fixed lack-of-yaml in html template Lyla Fischer 2012-09-25 14:02:25 -04:00
  • e1652c4790 Added doc explaining course grading at high level. Bridger Maxwell 2012-09-25 13:56:01 -04:00
  • 1aa51a5eb9 basic templates for video, html, discussion, and sequential Lyla Fischer 2012-09-25 13:47:45 -04:00
  • 305dcfc4e9 Put tests to check ordering of scores returned on progress page. David Ormsbee 2012-09-25 12:54:06 -04:00
  • d0cfd16bfa Merge pull request #769 from MITx/feature/rocha/elsevier-press-release Calen Pennington 2012-09-25 07:39:19 -07:00
  • 0c6a6a6e53 Merge pull request #750 from MITx/feature/cale/cms-save-validation Calen Pennington 2012-09-25 07:34:09 -07:00
  • 52a9bd2d1e Fix news and announcements icons on the frontpage Carlos Andrés Rocha 2012-09-25 10:33:38 -04:00
  • 7f6196c835 Add an example sequence template Calen Pennington 2012-09-25 09:57:11 -04:00
  • 5410e161f9 Switch template definitions to yaml, so that they can have multiline strings Calen Pennington 2012-09-25 09:48:54 -04:00
  • 022e27e1a2 Add docstrings to xmodule.templates.py Calen Pennington 2012-09-25 09:33:18 -04:00
  • 5e0f0be1be Fix up ErrorDescriptor._construct, and use in in ErrorDescriptor.from_json Calen Pennington 2012-09-24 11:48:44 -04:00
  • bf4ae6b7e6 Load modules from the mongo modulestore as errordescriptors if creating a regular descriptor fails, but leave the location the same Calen Pennington 2012-09-21 11:27:47 -04:00
  • d4377d4ada Make imports into the CMS ignore broken modules, while still loading bad xml as error modules in the LMS Calen Pennington 2012-09-21 11:24:56 -04:00
  • 3107bb9c45 Make separate json and xml editing interfaces Calen Pennington 2012-09-21 10:57:06 -04:00
  • 33f9eae3e8 Set data_dir based on parent data_dir when cloning new content in the CMS Calen Pennington 2012-09-24 11:15:37 -04:00
  • 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 Calen Pennington 2012-09-24 09:05:31 -04:00
  • b69edcd869 Pass org and course through ErrorDescriptor.from_xml to ErrorDescriptor.__init__ Calen Pennington 2012-09-24 08:56:02 -04:00
  • d8736914d4 Display an error descriptor for a preview when a descriptor can be loaded but a module can't Calen Pennington 2012-09-20 14:45:34 -04:00
  • 7d8095cd97 Initial port of templates into filesystem based storage Calen Pennington 2012-09-20 13:49:26 -04:00
  • 2554413291 Hook up link to create modules from templates Calen Pennington 2012-09-19 15:02:26 -04:00
  • 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 Calen Pennington 2012-09-19 14:55:56 -04:00
  • 9c5b0ba6ea Create the data dir to put files in, if it doesn't exist when loading a module from mongo Calen Pennington 2012-09-19 14:54:41 -04:00
  • eb20e47160 Remove drag-and-drop handles from navigation until we actually are going to enable them Calen Pennington 2012-09-19 14:52:51 -04:00
  • 68a1e7a8a0 Merge pull request #768 from MITx/feature/rocha/elsevier-press-release Calen Pennington 2012-09-25 07:03:00 -07:00
  • 57d0dd1b0b Pass location to get_containing_courses Calen Pennington 2012-09-25 10:01:20 -04:00
  • 17820fef3b Made small correction to Elseview announcement on front page Carlos Andrés Rocha 2012-09-24 17:03:47 -04:00
  • 7fd6e0e23f Change subtitle of Elsevier announcement on the frontpage Carlos Andrés Rocha 2012-09-24 16:37:11 -04:00
  • a948c13496 Resize images for the news feed on the frontpage Carlos Andrés Rocha 2012-09-24 15:47:19 -04:00
  • 1a95abd095 Update Elsevier press release and frontpage feed Carlos Andrés Rocha 2012-09-24 15:38:01 -04:00
  • 3492243ffa Add Elsevier press release Carlos Andrés Rocha 2012-09-20 19:44:40 -04:00
  • 55771159a5 Merge pull request #742 from MITx/feature/cale/cms-to-lms-links Calen Pennington 2012-09-25 06:23:23 -07:00
  • 335b4bb04b Add method to find courses that contain a particular module location Calen Pennington 2012-09-25 09:23:07 -04:00
  • 2223d2007b Only display the LMS link if it's set up, and don't error if it isn't Calen Pennington 2012-09-20 10:53:36 -04:00
  • c7209a736e Add links from the editing page for the cms to the corresponding page in the lms Calen Pennington 2012-09-17 16:30:37 -04:00
  • 71f39bc4c0 Merge pull request #751 from MITx/cdodge/meta-data-cms-editing Calen Pennington 2012-09-25 06:16:51 -07:00
  • 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. Chris Dodge 2012-09-24 16:54:46 -04:00
  • e50cc77adf Merge pull request #767 from MITx/feature/dave/progress_reverse_quickfix arjun810 2012-09-24 13:30:28 -07:00
  • 5f6cc6ef93 Quick fix for scores within a homework/lab showing up in reverse order. David Ormsbee 2012-09-24 16:24:38 -04:00
  • 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 Chris Dodge 2012-09-24 13:03:34 -04:00
  • eae2ef1d74 Merge pull request #765 from MITx/feature/victor/fix-index-js-caching Victor Shnayder 2012-09-24 06:24:33 -07:00
  • ea762eabf1 optimize! Victor Shnayder 2012-09-24 09:22:35 -04:00
  • 2edda935f7 Merge pull request #764 from MITx/feature/victor/fix-index-js-caching Calen Pennington 2012-09-24 06:20:52 -07:00
  • a8aced9bba Also make the actual ?next redirection work with caching Victor Shnayder 2012-09-24 09:15:06 -04:00
  • a45fe4a651 Merge pull request #759 from MITx/feature/victor/fix-index-js-caching Calen Pennington 2012-09-24 05:24:13 -07:00
  • 93ca4a4112 Merge pull request #763 from MITx/feature/arjun/188_minor arjun810 2012-09-24 04:33:05 -07:00
  • 95997a5e67 fix up syllabus Arjun Singh 2012-09-24 04:32:36 -07:00
  • 3bbe8b195d Merge pull request #762 from MITx/arjun/fix_progress_label arjun810 2012-09-24 01:48:44 -07:00
  • 60ed7046bd make progress label wider Arjun Singh 2012-09-24 00:33:26 -07:00
  • df2b06f235 Merge pull request #760 from MITx/kimth/fix-gradebook arjun810 2012-09-23 22:17:43 -07:00
  • f86933de4f Increase height of progress graph; allows for more cutoffs to look reasonable Arjun Singh 2012-09-23 20:53:38 -07:00
  • 0b40e75166 Fix login-if-?next behavior Victor Shnayder 2012-09-23 22:33:20 -04:00
  • 6f62408ed6 Add comments kimth 2012-09-23 18:47:35 -07:00
  • b376bc09a3 Arbitrary progress bar coloring kimth 2012-09-23 18:46:10 -07:00
  • d9946cc336 Merge pull request #757 from MITx/feature/ibrahim/fix-discussions-ie arjun810 2012-09-23 01:38:28 -07:00
  • c1fc50437a Adjust comments kimth 2012-09-22 23:11:26 -07:00
  • ad7e84ad0e Fix forums in IE9; apparently it's just very strict about the charset being a valid identifier. utf8 is not a valid identifier, utf-8 is. Ibrahim Awwal 2012-09-22 23:01:34 -07:00
  • 48b93fc985 Arbitrary grading markers kimth 2012-09-22 23:01:04 -07:00
  • 5e49871e93 cs188 styling Arjun Singh 2012-09-22 22:54:41 -07:00
  • 056eebf755 Merge pull request #756 from MITx/feature/arjun/minor_style_changes kimth 2012-09-22 19:12:02 -07:00
  • 38c0a034fb Add slides nowrap Arjun Singh 2012-09-22 18:06:19 -07:00
  • eca21e7c18 Fix syllabus in static_tab_wrapper; don't wrap slides Arjun Singh 2012-09-22 17:46:35 -07:00
  • 31ff5f2888 Merge pull request #755 from MITx/feature/arjun/188_styling kimth 2012-09-22 17:28:31 -07:00
  • 015328ed5c more 188 styling Arjun Singh 2012-09-22 17:19:27 -07:00
  • 987d8ea43b Some 188-specific styling + default styling for static tabs Arjun Singh 2012-09-22 14:17:34 -07:00
  • ae06f13b96 Fix broken submission in firefox Victor Shnayder 2012-09-21 18:35:00 -04:00
  • 0a4a523e44 Merge pull request #754 from MITx/feature/victor/add-request-debug-view Victor Shnayder 2012-09-21 14:50:24 -07:00
  • 450a20228d more info Victor Shnayder 2012-09-21 17:49:10 -04:00
  • b4ae3abe4d Merge pull request #752 from MITx/feature/victor/less-greedy-urls David Ormsbee 2012-09-21 14:42:03 -07:00
  • 6cd2a14b8e Merge pull request #753 from MITx/feature/victor/add-request-debug-view David Ormsbee 2012-09-21 14:41:21 -07:00
  • 8d0cc1007a add a debug_request view that prints the request. Victor Shnayder 2012-09-21 16:51:49 -04:00
  • 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 Chris Dodge 2012-09-21 15:49:07 -04:00
  • 03fbacd4e1 Merge branch 'cdodge/meta-data-cms-editing' of github.com:MITx/mitx into cdodge/meta-data-cms-editing Chris Dodge 2012-09-21 15:24:09 -04:00
  • cc13b61e30 add a trailing slash to avoid conflicts with slash-appending redirects Victor Shnayder 2012-09-21 15:12:23 -04:00
  • 8a57093309 Make static tab url pattern less greedy Victor Shnayder 2012-09-21 15:05:50 -04:00