Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

19803 Commits

Author SHA1 Message Date
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
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
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
Brian Talbot
6c95460761 studio - resolving merge from master 2013-02-15 09:15:06 -05:00
Brian Wilson
0d3b566dd8 finish piping URL through to pdf.js 2013-02-14 15:47:53 -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
Vasyl Nakvasiuk
8cf8dcd10b rm videoalpha_list method 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
0b73f0a59d remove unnecessary code 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
de94855ba0 use one general dictionary self.sources for videoalpha_module 2013-02-14 11:22:13 +02:00
Valera Rozuvan
7d851b9f5d Fixed bug when switching speeds in YouTube HTML5 player. 2013-02-14 11:22:13 +02:00
Valera Rozuvan
e59994a4b8 Finalized HTML5 YouTube player inbrowser speed changes. 2013-02-14 11:22:13 +02:00