Arthur Barrett
|
fd49aceb29
|
fixed highlight style for cascade.
|
2013-03-06 13:36:11 -05:00 |
|
Arthur Barrett
|
9b32400b3a
|
tweaked commentary textarea size so it looks correct in ff
|
2013-03-06 13:18:52 -05:00 |
|
Arthur Barrett
|
0424b53336
|
show the annotation callout at the span center rather than at the mouse
|
2013-03-06 00:05:41 -05:00 |
|
Arthur Barrett
|
3393e6385d
|
set a default height on the commentary textbox to show 5 lines of text
|
2013-03-06 00:05:36 -05:00 |
|
Arthur Barrett
|
2ed7394f27
|
visually distinguish instructions from guided discussion section
|
2013-03-06 00:05:28 -05:00 |
|
Arthur Barrett
|
7a0aead0d9
|
annotation now hides automatically on mouseleave events. click to hide/show or re-position the annotation.
|
2013-03-04 17:21:32 -05:00 |
|
Arthur Barrett
|
b0abfa07c8
|
style the guided discussion text so it is boxed like the instructions text.
|
2013-03-04 14:23:41 -05:00 |
|
Arthur Barrett
|
2e6115c734
|
constrain the annotation call-out horizontally so it is always visible in the window
|
2013-03-04 14:19:28 -05:00 |
|
Arthur Barrett
|
20174fd24a
|
Removing failing jasmine tests for now.
|
2013-03-01 17:06:12 -05:00 |
|
Arthur Barrett
|
530051037d
|
adding annotatable module template
|
2013-03-01 13:58:39 -05:00 |
|
Arthur Barrett
|
82544f2ae1
|
start adding jasmine tests to module
|
2013-03-01 13:39:51 -05:00 |
|
Arthur Barrett
|
6dba2394b2
|
enable studio authoring (raw) for xmodule
|
2013-03-01 13:32:56 -05: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Arthur Barrett
|
1f160d6ef4
|
added a box around the instructions text
|
2013-02-25 16:29:19 -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 |
|
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 |
|
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 |
|
Victor Shnayder
|
01a38c29be
|
Add auto-cohorting functionality.
See changes in xml-format.md or wiki (dynamic cohorts v1) for spec.
|
2013-02-24 18:48:01 -05:00 |
|
Victor Shnayder
|
8e93e0770f
|
Merge pull request #1509 from MITx/feature/victor/capa-finished
Add showanswer="finished" option and tests
|
2013-02-24 13:24:34 -08:00 |
|
Arthur Barrett
|
c3f55845c0
|
factoring out discussion logic (for now, anyway)
|
2013-02-22 18:22:32 -05:00 |
|
Arthur Barrett
|
66ddfa295d
|
more refactoring and work on annotationinput (should be working now).
|
2013-02-22 16:33:28 -05:00 |
|
Arthur Barrett
|
840f7839fa
|
added save and render functionality to annotationinput
|
2013-02-22 12:48:22 -05:00 |
|
Vik Paruchuri
|
d5865e70b8
|
Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages
|
2013-02-22 10:21:34 -05:00 |
|
Diana Huang
|
f9667849b8
|
Fix some minor bugs in event handling and add enter key support
|
2013-02-22 09:47:50 -05:00 |
|