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
adae176943
merge
2012-10-12 23:06:39 -04:00
Victor Shnayder
db8639e06a
Fix preview code
...
- I'm starting to vaguely understand js variable scope and closures. Long way to go though :)
2012-10-12 22:52:41 -04: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
Victor Shnayder
619e9f18ac
Merge pull request #884 from MITx/feature/victor/capa-ajax
...
address Ike's comments.
2012-10-12 14:08:11 -07:00
Victor Shnayder
54d1f2afac
address Ike's comments.
2012-10-12 17:03:11 -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
Victor Shnayder
d78e041c2d
Testing and small fixes
...
- make chemical_equations_equal return False instead of raising errors.
- make tests not choke on unicode
- get full coverage
2012-10-12 15:32:36 -04:00
David Ormsbee
01ac01b62c
Re-enable change name, and fix up change email styles
2012-10-12 14:31:20 -04:00
Victor Shnayder
f6f2663b77
fix arrows list
2012-10-12 14:08:21 -04:00
Victor Shnayder
b6f7427e22
make tests pass again
2012-10-12 14:02:22 -04:00
Victor Shnayder
19d3cb3870
Add a chemicalequationinput with live preview
...
- architecturally slightly questionable: the preview ajax calls goes to an LMS view instead of an input type specific one. This needs to be fixed during the grand capa re-org, but there isn't time to do it right now.
- also, I kind of like having a generic turn-a-formula-into-a-preview service available
2012-10-12 13:52:48 -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
chrisndodge
ff25d13256
Merge pull request #868 from MITx/fix/cdodge/cas-delete-regression
...
DraftMongoContentStore needs to both delete the draft *and* the non-draf...
2012-10-12 08:17:35 -07:00
chrisndodge
750e70e842
Merge pull request #878 from MITx/feature/cale/edge-landing-page
...
Feature/cale/edge landing page
2012-10-12 08:01:46 -07: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
Calen Pennington
4814f8c38e
Cleaning up logos for edge landing page
2012-10-12 10:31:46 -04:00
Calen Pennington
c814758715
Merge pull request #866 from MITx/feature/cdodge/cms-import
...
Feature/cdodge/cms import
2012-10-11 19:22:19 -07:00
Victor Shnayder
c420c67b82
Actually implement exact vs factors-don't-matter comparisons in chemcalc
2012-10-11 17:40:26 -04:00
Chris Dodge
82abdd07dc
respond to some of Cale's comments
2012-10-11 16:23:28 -04:00
Tom Giannattasio
c3e2a544da
tweaks to datepicker and calendar
2012-10-11 14:53:45 -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
David Ormsbee
9c0e554992
Merge pull request #855 from MITx/bug/tomg/nested-hints
...
tweaked collapsible selector to target the proper section
2012-10-11 10:25:21 -07: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
5ae34aa4ed
Add heartbeat to cms
2012-10-11 12:32:23 -04:00
Calen Pennington
bc69ed8c9e
Move logsettings to common, so that it's shared between cms and lms
2012-10-11 12:31:52 -04:00
Calen Pennington
8eb4390def
Enable authentication in mongo modulestore and contentstore
2012-10-11 12:31:51 -04:00
Lyla Fischer
0cdbd170c2
fixed documentation
2012-10-11 12:23:06 -04:00
Lyla Fischer
1bd2cb4f85
quick bug fix
2012-10-11 12:12:34 -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
Lyla Fischer
331f35145f
fixed default tolerance on numericalresponse
2012-10-11 11:59:27 -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
Александр
64565692ab
removed obsolete crystalresponse
2012-10-11 18:41:25 +03:00
Александр
2b200b6e20
changed cryst inputtype to be similar to textline
2012-10-11 18:40:05 +03:00
