Chris Dodge
c23c5cc3d9
add comments
2013-03-07 16:12:21 -05:00
Christina Roberts
cb70a0f9d9
Merge pull request #1620 from MITx/fix/cdodge/static-url-allow-references-to-common
...
need to support link references to static content that is in the code ba...
2013-03-07 13:07:16 -08:00
Christina Roberts
85d5264f5b
Merge pull request #1616 from MITx/fix/will/mc_checkbox_bug
...
Fix/will/mc checkbox bug
2013-03-07 12:47:16 -08:00
Chris Dodge
891bddcdf9
need to support link references to static content that is in the code base (e.g. module's .js/.css)
2013-03-07 14:28:09 -05:00
Don Mitchell
49db56ab7d
Merge pull request #1618 from MITx/bug/christina/misc
...
New version of Backbone has separate invalid event.
2013-03-07 11:02:52 -08:00
cahrens
98e410816e
New version of Backbone has separate invalid event.
2013-03-07 13:52:55 -05:00
cahrens
9ec33928ce
New version of Backbone has separate invalid event.
2013-03-07 13:37:10 -05:00
Will Daly
e86ed0db91
Merge branch 'master' into fix/will/mc_checkbox_bug
2013-03-07 12:07:34 -05:00
chrisndodge
19eb6a3449
Merge pull request #1617 from MITx/bug/christina/misc
...
Disable Django toolbar-- breaking mongo updates.
2013-03-07 08:31:44 -08:00
cahrens
4434ca632e
Disable Django toolbar-- breaking mongo updates.
2013-03-07 11:30:00 -05:00
Will Daly
8d83d2fb4e
Added handling of condition when no multiple choice item selected,
...
but the answer is incorrect.
2013-03-07 10:52:19 -05:00
Don Mitchell
2e23a5f584
Merge pull request #1615 from MITx/fix/cdodge/error-importing-metadata-with-empty-strings
...
make export a bit more resilient. If there's a piece of metadata that we...
2013-03-07 07:51:17 -08:00
Chris Dodge
9ba759802c
make export a bit more resilient. If there's a piece of metadata that we can't serialize - i.e. someone wrote a new bool attribute and didn't put it in the type mapping table - then we log the exception and continue.
2013-03-07 10:43:36 -05:00
Will Daly
e841f29352
Updated CSS and template for choicegroup response
...
so that: a) checks/x marks appear after each option
for radio buttons, b) checks/x marks appear for the
entire problem (not individual options) for checkbox
buttons.
Also fixed issue with checks appearing on the next line
by changing <text> to display:inline instead of display:block
2013-03-07 10:17:03 -05:00
Jay Zoldak
1b7863e79e
Merge pull request #1603 from MITx/fix/will/merge_jnater_unittests
...
Fix/will/merge jnater unittests
2013-03-07 06:47:55 -08:00
Victor Shnayder
5ec39825e0
Merge pull request #1604 from MITx/hotfix/jkarni/folditscore
...
Hotfix/jkarni/folditscore
2013-03-06 17:32:29 -08:00
Victor Shnayder
6af857b3fe
Merge pull request #1613 from MITx/victor/fix-blank-capa
...
Fix max_attempts=''
2013-03-06 17:18:38 -08:00
Victor Shnayder
b6a6e10bb5
Fix max_attempts=''
...
That's what studio defaults to, and recent changes made it break.
Added a few tests to make sure it doesn't happen again.
2013-03-06 20:16:24 -05:00
John Hess
28e300c033
Merge pull request #1612 from MITx/victor/fix-genex-css
...
remove links to missing image files. We can add them if needed later.
2013-03-06 16:14:09 -08:00
Victor Shnayder
57700a56d4
remove links to missing image files. We can add them if needed later.
2013-03-06 19:11:36 -05:00
David Ormsbee
5b12793aee
Merge pull request #1597 from MITx/docs/valera/drag_and_drop
...
Added documentation for drag and drop - targets on draggables feature.
2013-03-06 14:55:02 -08:00
David Ormsbee
d2f9b27d8e
Merge pull request #1611 from MITx/fix/brian/doc-pdfbook
...
add textbook and pdf textbook documentation
2013-03-06 14:54:36 -08:00
Brian Wilson
9c92c92fda
add textbook and pdf textbook documentation
2013-03-06 17:35:32 -05:00
jkarni
3bb108b12e
Merge pull request #1608 from MITx/feature/jkarni/genex
...
Feature/jkarni/genex
2013-03-06 14:35:01 -08:00
Jay Zoldak
73bca8afd2
Merge pull request #1610 from MITx/fix/diana/fix-annotation-tests
...
Update correctmap to handle partially correct answers, and
2013-03-06 14:11:47 -08:00
Diana Huang
5c3dfd9280
Update correctmap to handle partially correct answers, and
...
fix annotation tests so that they use the new test_system functionality
2013-03-06 16:43:12 -05:00
chrisndodge
05211d4fe8
Merge pull request #1607 from MITx/feature/christina/djdebug
...
Enable Django debug toolbar on Studio (including Mongo panel).
2013-03-06 13:14:19 -08:00
Victor Shnayder
12b6b7d403
Merge pull request #1609 from MITx/diana/refactor-chemical-equation
...
Refactor Chemical Equation Preview
2013-03-06 12:09:03 -08:00
Victor Shnayder
fb350ed1e3
Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule
...
Feature/abarrett/annotatable xmodule DO NOT MERGE
2013-03-06 12:05:27 -08:00
Diana Huang
42e711e7d2
Update tests and documentation.
2013-03-06 14:53:13 -05:00
Julian Arni
fb08942b63
Add 'get' default string
2013-03-06 14:49:36 -05:00
Diana Huang
1aa3580dcb
Switch over to using the inputtype ajax handler for chemical input.
2013-03-06 14:41:48 -05:00
Arthur Barrett
dfc9176f6b
fixed typo
2013-03-06 14:40:35 -05:00
Arthur Barrett
ddbab36439
Added instructions/documentation to the studio template for content authors.
2013-03-06 14:33:04 -05:00
Victor Shnayder
7af36eb633
Merge pull request #1598 from MITx/diana/capa-input-ajax
...
Give InputTypes the ability to handle their own AJAX
2013-03-06 11:30:28 -08:00
cahrens
de225e6623
Enable Django debug toolbar on Studio (including Mongo panel).
2013-03-06 14:08:54 -05:00
Arthur Barrett
5029d3a3dd
Merge branch 'feature/vik/advanced-studio' into feature/abarrett/annotatable_xmodule
2013-03-06 13:51:18 -05:00
Arthur Barrett
fd49aceb29
fixed highlight style for cascade.
2013-03-06 13:36:11 -05:00
Julian Arni
d05e82e35c
Merge branch 'master' into feature/jkarni/genex
2013-03-06 13:25:30 -05:00
Arthur Barrett
9b32400b3a
tweaked commentary textarea size so it looks correct in ff
2013-03-06 13:18:52 -05:00
Don Mitchell
69601047f2
Merge pull request #1605 from MITx/bug/christina/misc
...
Use readonly attribute instead of disabled. Disabled text fields are not...
2013-03-06 08:59:11 -08:00
cahrens
b706d4a1f5
Use readonly attribute instead of disabled. Disabled text fields are not selectable on FireFox.
...
#225
2013-03-06 11:50:23 -05:00
Julian Arni
dfa590e71c
Make exception a little more specific
2013-03-06 11:10:13 -05:00
Julian Arni
5682e02f53
Fix indendation that was causing only first submission to be saved
2013-03-06 11:05:10 -05:00
Diana Huang
4b7d1deb25
Fix a bug in extracting HTML
...
Update tests to reflect new behavior.
2013-03-06 10:34:57 -05:00
Will Daly
e1b99186ef
Removed test_permissions.py
2013-03-06 10:20:02 -05:00
Will Daly
2f5ea630e7
Cleaned up courseware test_tabs unittests
2013-03-06 10:16:43 -05:00
Will Daly
0d1b380008
Removed test_grades.py in courseware django app.
2013-03-06 09:44:53 -05:00
Will Daly
72411a175f
Added jnater's unit tests, cleaned up broken tests, ran pep8fix
2013-03-06 09:41:26 -05:00
Diana Huang
455dea870f
Remove unnecessary import.
2013-03-06 09:21:37 -05:00
