Calen Pennington
e35d1483c6
Merge pull request #1009 from MITx/bug/lyla/latextemplate
...
fixed typo
2012-11-02 13:38:40 -07:00
Calen Pennington
0bfa443520
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2012-11-02 11:09:19 -04:00
Lyla Fischer
8ed4ef4412
fixed typo
2012-11-01 11:36:41 -04:00
David Ormsbee
ddc4f705e0
Remove raise that was there just for debugging purposes
2012-11-01 04:50:23 -04:00
David Ormsbee
8a453e99ca
Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view.
2012-11-01 04:37:16 -04:00
Victor Shnayder
e4c49f3a1e
Merge pull request #1001 from MITx/feature/victor/inputtypes-refactor
...
Feature/victor/inputtypes refactor
2012-10-31 15:18:28 -07:00
Carlos Andrés Rocha
e5b11a9c57
Add HD control to video player
2012-10-30 19:21:17 -04:00
David Ormsbee
535980eb6d
Allow optional advertised_start metadata in Course, to let people pre-launch thier courses quietly if desired.
2012-10-30 11:06:50 -04:00
Victor Shnayder
a155265409
minor whitespace + comment fixes
2012-10-29 23:44:38 -04:00
Arjun Singh
75f0a56d70
Change documentation, make values strings for save button forcing
2012-10-28 21:57:28 -07:00
Arjun Singh
e29d244a8f
allow saving nonrandomized problems
2012-10-28 21:47:43 -07:00
kimth
98c3d861ad
Fix reference to iidiv
2012-10-27 18:19:56 +00:00
Chris Dodge
90f9d5fcf0
fix grading policy filepath generation
2012-10-26 15:18:56 -04:00
kimth
62840765a5
Variable name is misleading, use generic 'answer' instead
2012-10-26 06:59:21 +00:00
kimth
84aeb9dad3
Permit collapsibles in capa detailed solution
2012-10-26 06:01:26 +00:00
Victor Shnayder
16990c2743
Add an end date to courses.
...
- needed for cert generation (and later lots of other things)
2012-10-24 17:23:13 -04:00
Calen Pennington
bacd728efc
Squelch some (but not all, yet) errors during template loading
2012-10-24 16:25:20 -04:00
Calen Pennington
f970da6da2
Fix issue where import didn't work if no grading policy file existed
2012-10-24 15:51:43 -04:00
Chris Dodge
ae4df32e43
adjust implemented according to code review feedback. Move all of the grading_policy retrieval into a from_xml() override method. Also move in some of the grading inheritance logic into course_module.py
2012-10-24 12:27:30 -04:00
Chris Dodge
d2c46f51ea
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-grading-policy
2012-10-23 23:56:02 -04:00
Chris Dodge
91e50f13cb
implement importing of grading policy during import. This is stored in definition.data.grading_policy.
2012-10-23 23:55:55 -04:00
Calen Pennington
b52ed48221
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/xmodule/js/src/html/display.coffee
lms/envs/common.py
2012-10-23 13:38:11 -04:00
Chris Dodge
1530341d55
have import be a bit more flexible in terms of the packaging of the content. Allow for tar.gz names to be different from the course name. Also don't assume that the unpacking of the zip will yield a single top level root folder.
2012-10-22 16:01:57 -04:00
Lyla Fischer
094382d588
added solutions and basic metadata to templates
2012-10-17 14:30:31 -04:00
Victor Shnayder
38bd83858b
Make problemset render as a sequential, not a vertical.
...
- Piotr requested this. Hopefully it doesn't break anything, but we should run it by the content fellows before merging.
2012-10-15 12:52:21 -04:00
ichuang
557b79129b
added image, solution, showhide examples to latex_problem template;
...
fixed x_module.py to only load *.yaml files as templates
TODO: Note that bad templates cause the CMS not to load; it should throw
exceptions instead of dying.
2012-10-14 23:26:46 -04:00
ichuang
a8cbcca9ab
fix HTML display of math (it wasn't queueing mathjax)
2012-10-14 22:14:51 -04:00
ichuang
50f665311e
update latex template problem; add template adaptive hint problem
2012-10-14 21:28:25 -04:00
ichuang
8742ba76a3
improved latex problem template; hls codemirror box autosizes height;
...
capa responsetypes can now include "inline='1'" for their span to be inline
2012-10-14 20:19:14 -04:00
ichuang
92f329ca1a
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx
2012-10-14 16:36:40 -04:00
Chris Dodge
d34075ff89
remove the — from the HTML, this apparently is causing the CAS and LMS to barf on staging, but strangly not on dev
2012-10-14 15:43:16 -04:00
Victor Shnayder
4594d37bf2
Merge pull request #900 from MITx/feature/ichuang-fix-capa_module-reset-string-bug
...
reset_problem in capa_module should always return dicts not strings
2012-10-14 10:36:49 -07:00
ichuang
3c8830f3b0
reset_problem in capa_module should always return dicts not strings
...
this is for the master branch (versus cms-master)
2012-10-14 12:57:58 -04:00
Chris Dodge
8f1336d87a
remove HTML comment from schematiceditor template
2012-10-13 23:27:37 -04:00
ichuang
db8f69d497
fix tabs in latex_html.yaml template
2012-10-13 23:10:51 -04:00
ichuang
bf959d8fc3
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx
2012-10-13 22:54:14 -04:00
ichuang
f846f4c2ad
add import filter capability to html & problem editing; provides latex2edx interface
2012-10-13 22:33:41 -04:00
Chris Dodge
444d4b1054
fix exception in LMS when rendering newly create multiple choice problems. The capa module is barfing on the HTML comment which was in there and the XML parser couldn't handle it.
2012-10-13 22:19:48 -04:00
arjun810
1ec0fae801
Merge pull request #891 from MITx/feature/victor/capa-ajax
...
Feature/victor/capa ajax
2012-10-13 17:05:44 -07:00
kimth
113e8b97b6
Toggle shouldn't follow anchor
2012-10-13 16:19:54 +00:00
kimth
3b461ee11f
choicegroup should only process choices belonging to its input_id
2012-10-13 06:13:33 +00:00
Victor Shnayder
48de4b40ee
Fix my js_loader patch
...
* still call the callback when skipping duplicate file. This updates the completed flags, and so the overall "we're done" callback fires properly.
2012-10-12 22:52:02 -04:00
ichuang
73477ec1bf
reset_problem in capa_module should always return dicts not strings
2012-10-12 21:06:15 -04:00
Chris Dodge
a12baec599
add new files
2012-10-12 20:55:16 -04:00
Victor Shnayder
1c18ad9607
make loader only load scripts once per run, midway through fixing multiple chem equations per page
2012-10-12 19:18:58 -04:00
ichuang
fd5c7c622c
Merge pull request #862 from MITx/feature/victor/capa-ajax
...
Feature/victor/capa ajax
I'm happy with all the changes to inputtypes, modulo the minor comments.
I didn't read chemcalc.py closely, but the tests look good.
2012-10-12 13:51:10 -07:00
Chris Dodge
4e4b6accda
wip: create new course
2012-10-12 16:11:55 -04:00
Chris Dodge
d31a7c6d6b
log and continue on thumbnail generation exception
2012-10-12 13:11:55 -04:00
Chris Dodge
b17836f232
swallow exceptions when generating thumbnails
2012-10-12 12:27:21 -04:00
Chris Dodge
281f194b2a
per feedback, change back 'draft-aware' modulestore to not delete the published copy. In delete_item in views.py do the logic to determine whether we should be using a 'draft-aware' modulestore or not, based on the category type
2012-10-12 11:00:34 -04:00
