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
Chris Dodge
1015b3a974
DraftMongoContentStore needs to both delete the draft *and* the non-draft entities
2012-10-12 11:00:34 -04:00
Chris Dodge
14a1a7da31
allow importing of .tar.gz packages of courseware
2012-10-12 10:33:31 -04:00
Chris Dodge
82abdd07dc
respond to some of Cale's comments
2012-10-11 16:23:28 -04:00
Chris Dodge
bf392e360a
on import set course metadata to hide the progress tab since we don't yet support grading policies
2012-10-11 13:52:15 -04:00
Chris Dodge
a521ea239f
baseline working for importing courseware and static assets
2012-10-11 13:41:16 -04:00
Chris Dodge
bb46c5f909
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-import
2012-10-11 12:51:37 -04:00
Chris Dodge
ab1decd97b
import static assets. Also consolidate asset import/thumbnail generation into a single code base
2012-10-11 12:51:33 -04:00
Calen Pennington
9239da678a
Mark is_draft as system metadata, so that users don't edit it
2012-10-11 12:32:23 -04:00
Calen Pennington
8eb4390def
Enable authentication in mongo modulestore and contentstore
2012-10-11 12:31:51 -04:00
Chris Dodge
6b5b6342d2
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-import
...
Conflicts:
common/lib/xmodule/xmodule/contentstore/content.py
2012-10-11 12:11:48 -04:00
Chris Dodge
a84ef1b243
wip: static asset import
2012-10-11 12:10:28 -04:00
Chris Dodge
2153aae62c
schema change to better normalize asset->thumbnail relationships
2012-10-11 11:57:56 -04:00
Lyla Fischer
f26a4af75c
thinks work, they just don't display prettily, and it is hard to actually use the assets due to links
2012-10-11 11:57:14 -04:00
Lyla Fischer
deca6e66b0
cleaned filenames
2012-10-11 11:56:53 -04:00
Victor Shnayder
8cdd5b35c0
add note about randomization, based on discussion with Piotr
2012-10-11 11:15:58 -04:00
Tom Giannattasio
00e2f093b9
removed extra padding on nested sections
2012-10-10 16:19:03 -04:00
Tom Giannattasio
6f60af71fd
tweaked collapsible selector to target the proper section; functionality like this should have its own class to avoid selector conflicts, but it may be too late to fix this now
2012-10-10 16:14:32 -04:00
Calen Pennington
7c3d5d58b7
Fix up how parent locations interact w/ draft mode when creating new units
2012-10-10 12:49:53 -04:00
Calen Pennington
5f0e237ab0
Store the id of the publishing user on publish
2012-10-10 12:49:53 -04:00
Calen Pennington
0aa79ed479
Remove extraneous TODO comment
2012-10-10 12:49:52 -04:00
Calen Pennington
5dcf388b1c
Add line numbers and wrapping to xml, json, and html editors
2012-10-10 12:49:52 -04:00
Calen Pennington
b079b336db
Make updating children and data of a draft make the correct checks for whether the document is already a draft or not
2012-10-10 12:49:51 -04:00
Calen Pennington
310f26a6de
Basic implementation of draft, public and private modes
2012-10-10 12:49:51 -04:00
Calen Pennington
05c02f0d5f
Fixing tests from changes around draft mode
2012-10-10 12:49:51 -04:00
Calen Pennington
b6c93b61fd
Mark published_date as system metadata
2012-10-10 12:49:51 -04:00
Calen Pennington
1328fc5ac0
Store published date in module metadata, and display it on draft pages
2012-10-10 12:49:51 -04:00
Calen Pennington
1a8532d8ad
Make it possible to create, edit, and publish a draft
2012-10-10 12:49:51 -04:00
Calen Pennington
8da3723445
Clone the full item as a draft if it doesn't already exist when doing a draft editing operation
2012-10-10 12:42:15 -04:00
Calen Pennington
75f8b7c98d
Add Draft module store that is used whenever any item is update in the CAS (but not during import, and not for templates)
2012-10-10 12:42:14 -04:00
kimth
61b3857134
Don't function call on null
2012-10-10 03:46:17 +00:00
Victor Shnayder
9e02b3ce34
Move tests around:
...
- move progress tests into test_progress.py
- move grader tests into test_graders.py
- move the capa tests into capa/tests/
2012-10-08 15:52:18 -04:00
Bridger Maxwell
62400c4c92
Added starting_index conf to AssignmentFormatGrader. Added a bit of forwards compatibility for new grading policies.
2012-10-06 14:52:48 -04:00
