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

2694 Commits

Author SHA1 Message Date
Vik Paruchuri
d5865e70b8 Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages 2013-02-22 10:21:34 -05:00
Brian Wilson
d503fe3d79 Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js 2013-02-21 15:38:28 -05:00
Victor Shnayder
8d76556729 Merge pull request #1531 from MITx/fix/cdodge/serializing-ints-as-empty-strings 
Fix/cdodge/serializing ints as empty strings
 2013-02-21 12:12:44 -08:00
Diana Huang
76c4007449 Merge pull request #1522 from MITx/diana/click-tracking 
Add more click tracking and logging to the open ended grading interface
 2013-02-21 11:10:35 -08:00
Chris Dodge
bb75a23101 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings 2013-02-21 11:58:52 -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
Chris Dodge
68a8587ed2 don't serialize weight out as an int - use a string. The code in capa-module.py expects a string and tries to convert to a float. So this impedence mismatch is causing a crash on import when importing empty strings for 'weight' or 'attempts' 2013-02-21 11:02:47 -05:00
Diana Huang
9aac915c9f Remove unnecessary assignment 2013-02-21 10:33:48 -05:00
Diana Huang
3a8b7156a0 Merge branch 'master' into diana/click-tracking 2013-02-21 10:19:35 -05:00
Diana Huang
18a56005b0 Address code review feedback 
- make category a data field of an input
- namespace event types
- don't try to use the track function when it doesn't exist
- generate event types if it doesn't match a pre-existing pattern
 2013-02-21 10:17:08 -05:00
Vik Paruchuri
9d5a08fc6d Fix location string 2013-02-20 18:07:24 -05:00
Vik Paruchuri
9bc8dbd7ca Fix location strings, re-order checkboxes 2013-02-20 18:04:25 -05:00
Vik Paruchuri
7b604aa026 Fix an import statement 2013-02-20 17:57:09 -05:00
Vik Paruchuri
43158de9bb Merge branch 'feature/vik/check-if-submission-allowed' into feature/vik/oe-messages 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
 2013-02-20 17:50:00 -05: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
a8fadb0ecc Remove render to string import 2013-02-20 17:16:38 -05:00
Vik Paruchuri
19a80c6268 Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
 2013-02-20 17:12:53 -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
Vik Paruchuri
ad9400a0ef Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
 2013-02-20 16:43:04 -05:00
Vik Paruchuri
26a2e059c8 Actually display ETA message 2013-02-20 16:36:40 -05:00
Vik Paruchuri
111ef30f05 Render to string fix, display ETA message when student submits 2013-02-20 16:30:44 -05:00
Chris Dodge
67f97c2c56 update Victor's metadata inheritance comment 2013-02-20 16:26:09 -05:00
Vik Paruchuri
2f29d85efc Finish function to get eta value 2013-02-20 16:22:22 -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
Vik Paruchuri
59b2f2ccd7 Move controller query service to xmodule side to prepare for ETA message displays 2013-02-20 16:19:17 -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
ea13659249 Merge branch 'master' into diana/click-tracking 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
 2013-02-20 14:02:04 -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
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
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