VikParuchuri
|
d186e5d186
|
Merge pull request #1538 from MITx/diana/fix-import-export
Fix studio import and export for CombinedOpenEnded, PeerGrading XModules
|
2013-03-01 09:32:08 -08:00 |
|
David Ormsbee
|
d6957f3e7e
|
Merge pull request #1508 from MITx/feature/ichuang/fix-save-button-messages-and-add-capa-survey-mode
Fix capa save button msgs & add simple capa survey mode
|
2013-03-01 08:26:21 -08:00 |
|
Arthur Barrett
|
3d4510ab0c
|
fixed sass compiler issue with annotatable xmodule on cms
|
2013-02-28 18:35:32 -05:00 |
|
Victor Shnayder
|
136946a334
|
Merge remote-tracking branch 'origin/master' into feature/abarrett/annotatable_xmodule
|
2013-02-28 18:22:13 -05:00 |
|
Arthur Barrett
|
430449501e
|
deleting test file
|
2013-02-28 14:06:46 -05:00 |
|
Christina Roberts
|
1b9d105e35
|
Merge pull request #1568 from MITx/bug/christina/misc
Don't require text tag around multiple choice/checkbox answers.
|
2013-02-28 10:48:08 -08:00 |
|
cahrens
|
2be42b8f51
|
Don't require text tag around multiple choice/checkbox answers.
https://edx.lighthouseapp.com/projects/102637/tickets/196
|
2013-02-28 13:33:04 -05:00 |
|
Arthur Barrett
|
15f6edc2f2
|
Merge branch 'master' into feature/abarrett/annotatable_xmodule
|
2013-02-28 13:11:40 -05:00 |
|
Vasyl Nakvasiuk
|
e9dacfae09
|
remove self.contents from ConditionalModule
|
2013-02-28 20:07:59 +02:00 |
|
Christina Roberts
|
69ef622afd
|
Merge pull request #1540 from MITx/feature/ichuang/fix-studio-latex-hls-editor
Fix latex high-level source editor in current version of cms / studio
|
2013-02-28 10:02:09 -08:00 |
|
Arthur Barrett
|
1da644fcb3
|
merge from master. resolved conflict with test_responsetypes.py by using the version from master.
|
2013-02-28 11:22:32 -05:00 |
|
Christina Roberts
|
1ebc3b314d
|
Merge pull request #1566 from MITx/fix/cdodge/optimize-metadata-tree-computation
Fix/cdodge/optimize metadata tree computation
|
2013-02-28 07:28:48 -08:00 |
|
Chris Dodge
|
8a7211da05
|
remove unused import commands (which were used for temporary profiling). Also change get_lms_link_for_item() to preserve the previous argument ordering. Apparently all callers may not use argument name conventions for the 'preview' argument.
|
2013-02-28 09:40:30 -05:00 |
|
ichuang
|
9fe9e2fbf6
|
upadte latex2edx url in latex-problem template
|
2013-02-28 04:21:50 +00:00 |
|
Chris Dodge
|
905199b5eb
|
restore metadata inheritance. Fix lms jump computation on the Studio index page. This gets expensive.
|
2013-02-27 22:37:13 -05:00 |
|
Chris Dodge
|
e42cdfbd29
|
turn off metadata inheritence for a quick test
|
2013-02-27 21:45:17 -05:00 |
|
Chris Dodge
|
d0bbb0f6c9
|
use a different query to get all collections. Also don't apply inheritance to course modules, because that's ultimately a no-op
|
2013-02-27 20:43:49 -05:00 |
|
cahrens
|
e47d11bedc
|
Bug fix for #214.
https://edx.lighthouseapp.com/projects/102637-studio/tickets/214-Via-Tender-Numerical-Input-answer-0-a-tolerance-is-not-accepted#ticket-214-4
|
2013-02-27 17:36:28 -05:00 |
|
cahrens
|
c0f0ef0cd2
|
Bug fix for #214.
https://edx.lighthouseapp.com/projects/102637-studio/tickets/214-Via-Tender-Numerical-Input-answer-0-a-tolerance-is-not-accepted#ticket-214-4
|
2013-02-27 17:34:08 -05:00 |
|
Will Daly
|
487afad50d
|
Merge branch 'master' into feature/will/move_correct_mark_for_multiple_choice
|
2013-02-27 16:58:35 -05:00 |
|
Arthur Barrett
|
44a68e6903
|
added partially correct icon from marco
|
2013-02-27 14:36:14 -05:00 |
|
Arthur Barrett
|
9f8e172be9
|
show the status mark next to the submitted tag instead of at the bottom of the problem.
|
2013-02-27 13:35:10 -05:00 |
|
Will Daly
|
9fe305e02b
|
Modified ChoiceGroup to display correct/incorrect indicators
(check or x) next to the option the user selected (check boxes or radio
buttons).
|
2013-02-27 13:05:29 -05:00 |
|
Arthur Barrett
|
25fb210338
|
move return link to problem header
|
2013-02-27 12:45:58 -05:00 |
|
Arthur Barrett
|
afa7fca15a
|
Merge branch 'master' into feature/abarrett/annotatable_xmodule
|
2013-02-27 11:58:38 -05:00 |
|
Vasyl Nakvasiuk
|
9186e61702
|
use shortcut get_display_items
|
2013-02-27 18:52:17 +02:00 |
|
Vasyl Nakvasiuk
|
81bfa46f2e
|
fix caching problem in conditional_module
|
2013-02-27 18:34:09 +02:00 |
|
Arthur Barrett
|
9d939cba94
|
added more unit tests to module
|
2013-02-26 17:49:18 -05:00 |
|
Arthur Barrett
|
8162d5473f
|
added more unit tests for module
|
2013-02-26 17:08:01 -05:00 |
|
Arthur Barrett
|
12b30c1b69
|
added unit test
|
2013-02-26 14:24:10 -05:00 |
|
Julian Arni
|
b6f3042c1d
|
Incorporate Victor's suggestions
|
2013-02-26 12:38:09 -05:00 |
|
Arthur Barrett
|
18233ef0d7
|
bolded the section titles and added unittest skeleton for module
|
2013-02-26 12:15:43 -05:00 |
|
VikParuchuri
|
df01064e77
|
Merge pull request #1536 from MITx/diana/rubric-hot-keys
Add in rubric hotkeys
|
2013-02-26 06:46:26 -08:00 |
|
Vasyl Nakvasiuk
|
076926c43a
|
call system.error_tracker together with logging
|
2013-02-26 10:51:19 +02:00 |
|
Julian Arni
|
edba0978cf
|
Included styling and template
|
2013-02-25 18:18:46 -05:00 |
|
Julian Arni
|
0a47f27fa7
|
Merge branch 'master' into feature/jkarni/foldit-api
|
2013-02-25 17:32:30 -05:00 |
|
Julian Arni
|
26eaf8985c
|
Allow progress without leaderboard and vice-versa
|
2013-02-25 17:28:22 -05:00 |
|
Arthur Barrett
|
1f160d6ef4
|
added a box around the instructions text
|
2013-02-25 16:29:19 -05:00 |
|
Chris Dodge
|
816b0edfb0
|
add another command line argument to allow users to only simulate a delete (i.e. show what items would be deleted). This is a handy sanity checker.
|
2013-02-25 16:00:35 -05:00 |
|
Arthur Barrett
|
7b195eb0ee
|
fixed error if highlight not defined
|
2013-02-25 13:24:05 -05:00 |
|
Arthur Barrett
|
1721793e99
|
moved annotation return styling effect to css
|
2013-02-25 12:33:43 -05:00 |
|
Diana Huang
|
ae60661f94
|
Get previews to work in Studio and use the correct type of editors
for these XModules within Studio.
|
2013-02-25 11:42:06 -05:00 |
|
Diana Huang
|
f161bdd0a2
|
Fix studio import and export for CombinedOpenEnded and PeerGrading XModules
Also, fix a bug in the peer grading.
|
2013-02-25 11:42:06 -05:00 |
|
Vasyl Nakvasiuk
|
2348ed3db1
|
fix empty display_name problem
|
2013-02-25 18:38:47 +02:00 |
|
Arthur Barrett
|
e736ed34f5
|
added ability to hide/show instructions, if present
|
2013-02-25 11:29:59 -05:00 |
|
David Ormsbee
|
dde4fc981b
|
Merge pull request #1546 from MITx/fix/cdodge/make-jump-to-handle-lost-slash
add a 'missing slash' regular expression for Location patterns in order ...
|
2013-02-25 08:22:24 -08:00 |
|
Julian Arni
|
da2d0ed6ec
|
Foldit with puzzle leaderboard
|
2013-02-25 11:16:37 -05:00 |
|
Chris Dodge
|
752ff20cf5
|
add a 'missing slash' regular expression for Location patterns in order to account for dropped slash with the i4x:// pattern. Certain redirect cases will cause this 2nd slash to be dropped (I think via Nginx)
|
2013-02-25 10:45:00 -05:00 |
|
Vasyl Nakvasiuk
|
aa34c9d335
|
remove 'passed' feature
|
2013-02-25 16:56:34 +02:00 |
|
Vasyl Nakvasiuk
|
a70cb2e154
|
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
|
2013-02-25 16:20:01 +02:00 |
|