Arthur Barrett
e736ed34f5
added ability to hide/show instructions, if present
2013-02-25 11:29:59 -05: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
Arthur Barrett
78bf8d5876
update annotationinput jsonv alue on tag selection or comment change
2013-02-22 00:42:12 -05:00
Arthur Barrett
3970ea33e1
return from capa problem
2013-02-21 22:54:50 -05:00
Arthur Barrett
0e2c46a718
Clicking "reply to annotation" scrolls to the problem (specified in xml by problem=index).
2013-02-21 17:01:43 -05:00
Arthur Barrett
a8178de497
Added styling to the annotationinput capa problem.
2013-02-21 13:52:22 -05:00
Arthur Barrett
cc7f791078
parse xml for annotationinput
2013-02-20 19:19:17 -05:00
Arthur Barrett
07f64abb11
Refactored init method.
2013-02-20 17:38:47 -05:00
Arthur Barrett
a982ebbb03
Refactored rendered method and added span ids.
2013-02-20 17:33:11 -05:00
Arthur Barrett
af2bfa9d4e
Saving work in progress on v2 with capa template for annotation problem.
2013-02-20 16:30:19 -05:00
Arthur Barrett
610e210cc8
Merge branch 'feature/victor/annotation-input' into feature/abarrett/annotatable_xmodule
2013-02-20 11:32:46 -05:00
Arthur Barrett
33c12647cb
Merge branch 'master' into feature/abarrett/annotatable_xmodule
2013-02-20 11:31:53 -05:00
Arthur Barrett
2f68cba24d
merged from master
2013-02-20 11:07:46 -05:00
Diana Huang
03a4deb847
Merge pull request #1489 from MITx/feature/vik/settings-to-xmodule
...
Feature/vik/settings to xmodule
2013-02-20 08:06:20 -08:00
Victor Shnayder
c1c050a6b6
WIP on an inputtype for heroesX annotation
...
- has a text area for saved but (currently) ungraded comments
- has a set of tags with weights
2013-02-19 17:35:40 -05:00
Jay Zoldak
9096914782
Move terrain module from lms to common.
2013-02-19 16:46:32 -05:00
Vik Paruchuri
2b01ecc1af
Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule
2013-02-19 15:21:47 -05:00
Arthur Barrett
34cc112cfb
Saving work in progress on annotations v2 with classification problems.
2013-02-19 14:18:56 -05:00
Christina Roberts
94a28f600b
Merge pull request #1510 from MITx/bug/btalbot/html-strongspan
...
xmodule scss - resolved studio bug #191
2013-02-19 09:09:47 -08:00
VikParuchuri
0db6247d96
Merge pull request #1513 from MITx/feature/vik/improve-oe-ui
...
Skip self assessment test (fails due to need for querydict for getlist t...
2013-02-19 08:15:42 -08:00
Vik Paruchuri
9ee956a397
Skip self assessment test (fails due to need for querydict for getlist to work, but mocking querydict is painful)
2013-02-19 11:05:43 -05:00
Vik Paruchuri
4d57f1b9ee
Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule
2013-02-19 10:43:55 -05:00
Diana Huang
f4addddf42
Merge pull request #1484 from MITx/feature/vik/improve-oe-ui
...
Feature/vik/improve oe ui
2013-02-19 07:27:29 -08:00
Brian Talbot
6d2ada5084
xmodule scss - resolved some general span styling that would override basic em or strong type styling
2013-02-19 09:59:36 -05:00
Arthur Barrett
72d9c1d7d2
Saving work-in-progress of guided classification exercise.
2013-02-18 19:02:54 -05:00
Arthur Barrett
9fb80ec3df
Removed console.log.
2013-02-15 13:50:57 -05:00
Arthur Barrett
24f519e32f
Moved the return link above the inline discussion and updated the header styling so the hide annotations button is right-aligned with the help icon.
2013-02-15 13:46:38 -05:00
cahrens
b49325009a
Merge branch 'master' into feature/btalbot/studio-softlanding
2013-02-15 13:14:46 -05:00
Christina Roberts
dceb8fee5e
Merge pull request #1494 from MITx/feature/marco/addcomponent
...
Feature/marco/addcomponent
2013-02-15 10:13:24 -08:00
Valera Rozuvan
c7679ea624
Removed debugging comments.
2013-02-15 18:12:53 +02:00
Valera Rozuvan
a0f46dae49
Fixed bug that prevented Firefox from playing HTML5 video content.
2013-02-15 18:10:14 +02:00
Brian Talbot
6c95460761
studio - resolving merge from master
2013-02-15 09:15:06 -05:00
Don Mitchell
bfcc0559a7
Merge pull request #1503 from MITx/fix/cdodge/export-policy-json
...
add exporting of policy.json
2013-02-14 12:47:37 -08:00
Chris Dodge
ea068d4aa8
add exporting of policy.json
2013-02-14 14:19:38 -05:00
Victor Shnayder
1108137dc3
Address Cale's comment--make property a simple class var
2013-02-14 13:24:21 -05:00
Victor Shnayder
d7f9bdda66
Move foldit app into the lms. No need for it in the cms, and it was breaking tests there..
2013-02-14 13:23:58 -05:00
Victor Shnayder
4f8757600a
merge
2013-02-14 12:49:14 -05:00
Victor Shnayder
5e44846596
Foldit integration.
...
- ops view for the desktop app to talk to
- xmodule that talks to the foldit model and displays the student's state
- grading tweak to make grade updates from an external service work:
- Add an always_recalculate_grades property to XModuleDescriptor.
2013-02-14 12:45:06 -05:00
Victor Shnayder
fffbb55944
Make hidden_module not cause 500 errors by adding a get_html()
2013-02-14 12:45:01 -05:00
Arthur Barrett
2848df8282
Style changes to comments: increase font size, width. Improved scrolling between spans and discussions.
2013-02-14 12:43:11 -05:00
Carlos Andrés Rocha
1f61f6ce08
Merge pull request #1409 from MITx/feature/valera/video_alpha
...
Feature/valera/video alpha
2013-02-14 08:08:57 -08:00
Victor Shnayder
e352226df5
Merge remote-tracking branch 'origin/master' into 700x-sandbox
2013-02-14 09:19:25 -05:00
Vasyl Nakvasiuk
237e6ff6a8
merge
2013-02-14 11:33:04 +02:00
Vasyl Nakvasiuk
93000af79d
fix problem with mutable default value in VideoAlphaModule._get_source
2013-02-14 11:30:21 +02:00
Valera Rozuvan
92dc8859a3
YouTube HTML5 mode is used by default. Fix typo in video alpha template.
2013-02-14 11:22:14 +02:00
Valera Rozuvan
1254e11836
Fixes and additions. Addressing comments by Carlos for pull request 1409.
2013-02-14 11:22:14 +02:00
Vasyl Nakvasiuk
b69b88a718
some small fix
2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
b229abd396
add xml exmaple for videoalpja module in docstring
2013-02-14 11:22:13 +02:00
