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
Valera Rozuvan
8b0c30e69f
Fixed small typo.
2013-03-07 17:48:40 +02: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
David Ormsbee
c144795588
Re-enable a couple of analytics on the dashboard to test layout
2013-03-07 10:01:56 -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
Brian Wilson
aee7d85694
fix bug in tabs
2013-03-07 02:01:42 -05:00
Chris Dodge
75872e1d28
remove getting of descriptor. location isn't defined here so it blows up. Anyhow, the descriptor is being passed into the function, so we don't need to fetch...
2013-03-06 22:28:44 -05: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
Calen Pennington
094b18972c
Append course modules to list of courses during import
2013-03-06 18:14:14 -05:00
Calen Pennington
cec3475c9d
Remove references to .definition and .metadata in modules
2013-03-06 18:07:56 -05:00
Brian Wilson
b5ab766092
initial framework for htmlbook
2013-03-06 17:57:33 -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
Calen Pennington
af3c92c47e
Remove old cms templates
2013-03-06 17:28:25 -05: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
Calen Pennington
ba69392f70
Fix inaccurate instructions around import
2013-03-06 17:10:45 -05:00
David Ormsbee
d0bff1ed3c
Merge branch 'master' into jmpm-analytics
...
Conflicts:
lms/djangoapps/instructor/views.py
lms/envs/common.py
lms/templates/courseware/instructor_dashboard.html
2013-03-06 17:09:09 -05: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
Calen Pennington
5222c61d73
Fix how the 'empty' field is excluded from html_module editable fields
2013-03-06 16:34:21 -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
Brian Talbot
62514d85a3
studio - alerts: loosely wired advanced settings with new notification and alert messages
2013-03-06 15:36:38 -05:00
Calen Pennington
4327aa1885
If we can't parse policy, then set it to an empty dictionary
2013-03-06 15:18:03 -05:00
Calen Pennington
4cbae2269c
Clean up how grading policy is set
2013-03-06 15:12:54 -05:00
Calen Pennington
e7900859b6
Remove the 'title' alias for lms.display_name
2013-03-06 15:11:08 -05: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
Brian Talbot
9a7b6c7eaf
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-06 15:04:34 -05: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
Calen Pennington
3b7a589e5a
Merge remote-tracking branch 'origin/feature/alex/poll-merged' into feature/alex/poll-merged
2013-03-06 12:58:24 -05:00
Vasyl Nakvasiuk
aa026387ce
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
2013-03-06 19:52:28 +02:00
Vasyl Nakvasiuk
493421c1ec
fix test_conditional, add new conditional to "conditional_and_poll" test course
2013-03-06 19:52:18 +02:00
Vik Paruchuri
7871fce7ff
Merge branch 'feature/vik/fix-oe-storage' into feature/vik/storage-model-fixes
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
2013-03-06 12:49:11 -05:00
