Tom Giannattasio
10227e8cdf
added moderator label styles
2012-09-28 07:27:57 -04:00
David Ormsbee
c787246c15
Merge pull request #784 from MITx/feature/dave/no_basic_auth_queue
...
Make it so we don't require HTTP basic auth to talk to the queue server -- I'm merging my own PR, so please check me -- I just need to do this to get the sandbox testing happy for 6.00.
2012-09-27 17:20:36 -07:00
David Ormsbee
7a6eedb3f1
Make it so we don't require HTTP basic auth to talk to the queue server
2012-09-27 19:02:34 -04:00
kimth
f93115ee4d
Merge pull request #778 from MITx/hotfix/arjun/mc_style
...
Fixes multiple choice styling
2012-09-27 13:41:20 -07:00
bridger
eb8cef9308
Merge pull request #781 from MITx/feature/bridger/course_grading
...
Updates to grading doc.
2012-09-27 13:39:09 -07:00
Arjun Singh
71923e7c1f
Add block display back for text
2012-09-27 13:31:08 -07:00
Bridger Maxwell
55d7d2bc14
Updates to grading doc.
2012-09-27 13:29:04 -04:00
David Ormsbee
955e90129a
Merge pull request #771 from MITx/feature/bridger/course_grading
...
Added doc explaining course grading at high level.
2012-09-27 08:39:49 -07:00
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
Arjun Singh
81bd0baf08
Fix multiple choice style and multiple choice show answer style
2012-09-27 02:24:01 -07:00
Arjun Singh
3533497b58
Restart server when xmodule css changes (run_watch_data)
2012-09-27 02:23:42 -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
Bridger Maxwell
e1652c4790
Added doc explaining course grading at high level.
2012-09-25 13:56:01 -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
