Don Mitchell
9d2b92c362
Don't show 'empty' metadata field
...
Change logic for when to show simple v advanced editor to use an
explicit flag.
2013-02-13 16:34:11 -05:00
Don Mitchell
62d389c853
Added empty metadata attribute instead of using name to determine which
...
template is empty (very awkward b/c it's a template descriptor not an
instance one)
Changed display conditionals to get the right things to show in the
right tabs for problems
2013-02-13 16:33:19 -05:00
marco
1bb1fb3156
adding remaining advanced problem modes I left off the first pass
2013-02-13 16:33:18 -05:00
marco
18f2f97eb1
edited problem editor tooltips to have new names and also changed sample problem text to use new names
2013-02-13 16:33:17 -05:00
Christina Roberts
0b91c1c346
Merge pull request #1487 from MITx/fix/cdodge/cleanup-deleted-templates
...
clean up templates that were removed from disk - we need to remove from ...
2013-02-13 06:29:35 -08:00
jkarni
2197bd987f
Merge pull request #1461 from MITx/feature/julian/multiple-choice-tweaks
...
Feature/julian/multiple choice tweaks
2013-02-12 13:32:15 -08:00
Ned Batchelder
27e8d699be
On 32-bit Python, this conversion could overflow, for example, for year 2099. This conversion won't.
2013-02-12 13:43:03 -05:00
Brian Wilson
b5378b04b3
change timer to calculate relative duration in javascript
2013-02-12 12:25:11 -05:00
Chris Dodge
93d186511f
clean up templates that were removed from disk - we need to remove from DB as well
2013-02-12 10:23:32 -05:00
Don Mitchell
46a7f7427a
Merge pull request #1479 from MITx/fix/cdodge/export-include-grading-policy
...
add exporting of grading_policy.json
2013-02-11 12:53:36 -08:00
Chris Dodge
33009eba7d
add exporting of grading_policy.json
2013-02-11 14:30:26 -05:00
David Ormsbee
fb1e7f3dc1
Make type check for self.code a little more robust, give default val for mmlans so it's never undefined
2013-02-10 19:03:25 -05:00
David Ormsbee
80843c1561
Merge pull request #1463 from MITx/feature/brian/pearson-exam
...
Feature/brian/pearson exam
2013-02-08 11:07:15 -08:00
cahrens
98026e4325
A couple minor bug fixes.
...
https://edx.lighthouseapp.com/projects/102637/tickets/173
https://edx.lighthouseapp.com/projects/102637/tickets/177
2013-02-08 12:46:32 -05:00
Jay Zoldak
0d0049ec76
Merge pull request #1465 from MITx/feature/ichuang/fix-test-conditional
...
fix test_conditional
2013-02-08 08:13:01 -08:00
Calen Pennington
dd4db0601f
Remove generated files
2013-02-08 10:45:59 -05:00
ichuang
7b7b0690b6
fix test_conditional
2013-02-07 18:19:48 -05:00
Brian Wilson
290368ef0d
merge out from master
2013-02-07 17:40:54 -05:00
Brian Wilson
80e4944314
minor cleanup
2013-02-07 16:12:02 -05:00
Brian Wilson
2974b9eec3
Merge branch 'feature/brian/pearson-exam' of github.com:MITx/mitx into feature/brian/pearson-exam
2013-02-07 15:58:12 -05:00
Brian Wilson
cc11dc2aa3
switch to using timelimit module for Pearson test
2013-02-07 15:57:43 -05:00
Julian Arni
8a75e1ad19
Added comment
2013-02-07 14:50:18 -05:00
Brian Talbot
6d4cb558d3
lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav
2013-02-07 12:35:52 -05:00
Brian Wilson
33a5a5fd9f
add implementation for fixed_time_module
2013-02-07 05:17:56 -05:00
Victor Shnayder
37b735d708
Merge pull request #1454 from MITx/hotfix/dave/youtube_object
...
Hack to disable YouTube <iframe> API when they break it.
2013-02-06 19:41:12 -08:00
David Ormsbee
a470a62d12
Hack to disable YouTube <iframe> API when they break it.
2013-02-06 22:37:41 -05:00
Julian Arni
a770e34bec
Adding multiple-choice loncapa integration.
2013-02-06 20:54:43 -05:00
jmclaus
5737f58b95
Added GWT Protex - reads target shape from xml writes answer to hidden input field
2013-02-06 20:48:25 -05:00
Victor Shnayder
0141f31d33
add warning message to sample-post.py
2013-02-06 18:57:25 -05:00
Victor Shnayder
edf96036c8
Merge remote-tracking branch 'origin/master' into 7012x-clean
2013-02-06 18:53:14 -05:00
Carlos Andrés Rocha
536333cbb5
Refactor how editamolecule displays messages
2013-02-06 18:31:00 -05:00
ichuang
b5ba88f0af
Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker
...
Conflicts:
common/lib/xmodule/xmodule/conditional_module.py
2013-02-06 18:15:36 -05:00
ichuang
c16f688802
conditional xmod: add errortracker msg and inherit icon from child
2013-02-06 18:10:25 -05:00
Carlos Andrés Rocha
d4afa02b12
Modify editamolecule to load GWT scripts dynamically
2013-02-06 17:40:44 -05:00
David Ormsbee
e5fda33eff
Throw the error back up if we don't have a console to log it to.
2013-02-06 17:13:22 -05:00
Vik Paruchuri
463f31618d
Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images
2013-02-06 16:37:52 -05:00
Vik Paruchuri
cf81fb27e8
Add in close date to metadata
2013-02-06 15:55:39 -05:00
Vik Paruchuri
733faebaf0
Fix git issue
2013-02-06 15:28:05 -05:00
Vik Paruchuri
5a51d142bb
Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
2013-02-06 15:26:01 -05:00
Vik Paruchuri
f568e49265
Fix oe version tests
2013-02-06 15:20:02 -05:00
Diana Huang
f42f84d9e8
Merge pull request #1440 from MITx/diana/rubric-ui-improvements
...
Rubric UI updates
2013-02-06 11:04:44 -08:00
Diana Huang
f3fa438018
Merge branch 'master' into feature/diana/close-oe-problems
...
Conflicts:
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
common/lib/xmodule/xmodule/timeparse.py
2013-02-06 13:26:22 -05:00
Vik Paruchuri
f565d17b4f
Merge branch 'feature/vik/oe-versioning' into fix/vik/peer-grading-images
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
2013-02-06 13:23:31 -05:00
Vik Paruchuri
a0febd35a0
Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
2013-02-06 13:22:12 -05:00
Vik Paruchuri
ddda9ba55d
Try to fix tests
2013-02-06 13:19:37 -05:00
Diana Huang
4adf2f6180
Merge branch 'master' into diana/rubric-ui-improvements
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
2013-02-06 13:16:24 -05:00
Vik Paruchuri
96636681e9
Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
2013-02-06 13:16:02 -05:00
Diana Huang
1f5beba383
Merge branch 'master' into diana/rubric-ui-improvements
2013-02-06 13:12:04 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Jay Zoldak
fde6d1ba1c
Refactor tests for cms contentstore.
2013-02-06 10:42:21 -05:00
