Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

5216 Commits

Author SHA1 Message Date
Diana Huang
a789d6c363 Merge branch 'master' into diana/fix-self-assessment-test 2013-02-20 13:37:42 -05:00
Diana Huang
6e453c2b8b Clean up and fix some peer grading tests. 2013-02-20 13:36:09 -05:00
Vik Paruchuri
c3d485a609 Fix error message 2013-02-20 13:33:17 -05:00
Diana Huang
789db30176 Merge pull request #1520 from MITx/feature/vik/disable-spell-check 
Feature/vik/disable spell check
 2013-02-20 09:45:32 -08:00
Vik Paruchuri
dbe93502f1 Fix tests 2013-02-20 12:44:12 -05:00
Vik Paruchuri
2302c3244b Merge branch 'feature/vik/disable-spell-check' into feature/vik/check-if-submission-allowed 2013-02-20 12:01:42 -05:00
Vik Paruchuri
c48998b30a Fix SA tests 2013-02-20 11:57:29 -05:00
Vik Paruchuri
7be76fe124 Fix tests 2013-02-20 11:54:57 -05:00
Diana Huang
13d4cfa4d4 Merge branch 'master' into diana/click-tracking 2013-02-20 11:40:14 -05:00
Vik Paruchuri
ee3c658f46 Merge remote-tracking branch 'origin/master' into feature/vik/disable-spell-check 2013-02-20 11:39:39 -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
Diana Huang
eefe87494d Merge branch 'feature/diana/close-oe-problems' of github.com:MITx/mitx into feature/diana/close-oe-problems 2013-02-20 11:23:28 -05:00
Diana Huang
d0bd7466b4 Fix import statement for TimeInfo 2013-02-20 11:22:58 -05:00
Diana Huang
b3767fc553 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-02-20 11:20:10 -05:00
Arthur Barrett
2f68cba24d merged from master 2013-02-20 11:07:46 -05:00
Diana Huang
e467c057c9 Fix test so we don't have to skip it anymore. 2013-02-20 10:59:38 -05:00
ichuang
fb70525417 dummy change to re-trigger jenkins 2013-02-19 19:50:36 -05: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
Vik Paruchuri
2b01ecc1af Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule 2013-02-19 15:21:47 -05:00
Vik Paruchuri
72d069825d Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed 
Conflicts:
	lms/templates/instructor/staff_grading.html
 2013-02-19 15:21:09 -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
Vik Paruchuri
44fdc0135a Remove magic 8 ball grading 2013-02-19 10:43:10 -05:00
Chris Dodge
94613c3ed3 add a null guard 2013-02-19 10:33:38 -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
Alexander Kryklia
6940cb334a small refactor 2013-02-19 13:33:55 +02:00
Alexander Kryklia
e2470842f7 get_module get descr insted of loc 2013-02-19 13:31:28 +02:00
Alexander Kryklia
841cfd28cc fix typo 2013-02-19 13:06:14 +02:00
Victor Shnayder
a4ee057d05 Add showanswer="finished" option and tests 2013-02-18 21:43:57 -05:00
Arthur Barrett
72d9c1d7d2 Saving work-in-progress of guided classification exercise. 2013-02-18 19:02:54 -05:00
Chris Dodge
bd73cc16ee compute (and cache) a generation of metadata inheritance tree for the course. We can then add that metadata to a newly instantiated xmodule 2013-02-18 18:49:45 -05:00
ichuang
8587044ea4 fix capa save button msgs, add simple capa survey mode 2013-02-18 10:48:45 -05:00
Alexander Kryklia
72f6578395 fix typo 2013-02-18 11:46:07 +02:00
Alexander Kryklia
0a80f835c0 Revert "fix typo" 
This reverts commit 24d2c11c3e.
 2013-02-18 11:45:21 +02:00
Alexander Kryklia
24d2c11c3e fix typo 2013-02-18 11:45:03 +02:00
Chris Dodge
66c91b704a init work. Export the 'draft' store under a distinct folder in the export. TBD: do the import from that directory as well. 2013-02-15 17:16:05 -05:00
Calen Pennington
2bc3000156 Fix tests 2013-02-15 15:44:11 -05:00
Diana Huang
b896cef86d Add in click tracking for feedback elements 2013-02-15 15:17:53 -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
Christina Roberts
dceb8fee5e Merge pull request #1494 from MITx/feature/marco/addcomponent 
Feature/marco/addcomponent
 2013-02-15 10:13:24 -08:00
Diana Huang
7b11843086 Merge branch 'master' into diana/click-tracking 2013-02-15 12:53:21 -05:00
Alexander Kryklia
059b9f66e3 poll and conditional finished 2013-02-15 18:48:39 +02: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