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
Julian Arni
da2d0ed6ec
Foldit with puzzle leaderboard
2013-02-25 11:16:37 -05:00
Julian Arni
e5294591dc
Foldit leaderboard w/o tests
2013-02-22 11:12:26 -05:00
David Ormsbee
3494d58450
Merge pull request #1532 from MITx/feature/ned/clean_up_tests
...
Make sure temp directories are properly cleaned up so running tests does...
2013-02-21 08:52:09 -08:00
Ned Batchelder
c3b571bf9b
Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.
2013-02-21 11:38:45 -05:00
Don Mitchell
ba7959fc4d
Merge pull request #1511 from MITx/feature/cdodge/metadata-inheritence-crawling
...
Feature/cdodge/metadata inheritence crawling
2013-02-21 08:29:54 -08:00
Vik Paruchuri
c55f997086
Fix self assessment tests
2013-02-20 17:34:51 -05:00
Vik Paruchuri
912800cabf
Fix location string object problems
2013-02-20 17:27:37 -05:00
Vik Paruchuri
d5ba5457dc
Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-02-20 16:49:59 -05:00
Chris Dodge
67f97c2c56
update Victor's metadata inheritance comment
2013-02-20 16:26:09 -05:00
Chris Dodge
bd188f92ef
put back the inheritable_metadata list into the XModuleDescriptor class. Also extend the metadata_inheritance test case
2013-02-20 16:20:39 -05:00
Chris Dodge
da223d9e11
remove raise statement which was just needed for debugging
2013-02-20 14:13:19 -05:00
Chris Dodge
756959812f
add some comments regarding which code can be removed when the 'split mongo module store' work is completed
2013-02-20 14:11:57 -05:00
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
Vik Paruchuri
ee3c658f46
Merge remote-tracking branch 'origin/master' into feature/vik/disable-spell-check
2013-02-20 11:39:39 -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
Diana Huang
e467c057c9
Fix test so we don't have to skip it anymore.
2013-02-20 10:59:38 -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
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
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
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
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
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
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
