Victor Shnayder
fe50f94437
Fix inline html bug.
...
* problem was in trying to remove the outer <html> + </html> tags.
* cleaned up the stringify function to be less magical, and more
obviously correct.
[Fix #35136297 ]
2012-08-28 19:54:57 -04:00
Carlos Andrés Rocha
aa063d5729
[ #35065403 ] Lets video player continue to work if subtitles cannot be loaded
2012-08-28 18:18:37 -04:00
Arjun Singh
6a6b24af79
Disable jsresponse file compilation; done manually for now.
2012-08-28 12:40:49 -07:00
David Ormsbee
88e485315d
Merge pull request #571 from MITx/feature/arjun/contextualize_js_params
...
Contextualizing javascript parameters
2012-08-28 11:07:49 -07:00
kimth
bad24df842
Adjust tests to reflect XML requirement for external grader messages
2012-08-28 13:31:06 -04:00
kimth
09b2f4e55c
Merge branch 'master' into kimth/check-grader-html
2012-08-28 13:16:14 -04:00
kimth
fa074277cf
Adjust CodeResponse comments
2012-08-28 12:59:30 -04:00
kimth
4970d9d9f9
Don't need time import, have datetime
2012-08-28 12:55:04 -04:00
kimth
eb48cae887
Consolidate the timestamp uses in CodeResponse
2012-08-28 12:50:48 -04:00
kimth
da07db7c7b
Merge branch 'kimth/send-idhash' of https://github.com/MITx/mitx into kimth/send-idhash
2012-08-28 12:43:34 -04:00
kimth
fb5501855c
Merge master
2012-08-28 12:37:24 -04:00
David Ormsbee
88baeee1fb
Merge pull request #575 from MITx/feature/arjun/fix_js_points
...
Let JS responses return >1 point
2012-08-28 08:32:57 -07:00
Victor Shnayder
e9ded1cf36
slight refactoring to test file
...
* was going to use to test duplicated content, but we're not supporting that for now
2012-08-28 11:28:10 -04:00
Victor Shnayder
9277f5df8e
Minor cleanups to url name checking
...
* better error messages
* better fallback names
* architectural TODO for later...
2012-08-28 11:27:47 -04:00
David Ormsbee
231b8c6aa4
Merge pull request #548 from MITx/kimth/limit-queue-dos
...
Kimth/limit queue dos
2012-08-28 08:03:02 -07:00
kimth
024b9db10d
Log errors in external grader message parsing
2012-08-28 09:27:27 -04:00
Arjun Singh
947ec74afc
Let JS responses return >1 point
2012-08-28 06:13:41 -07:00
Arjun Singh
f7ebc4dd23
Load params from json
2012-08-28 00:49:32 -07:00
Arjun Singh
8ed9ab44e7
Contextualizing javascript parameters
2012-08-27 23:49:07 -07:00
kimth
377b09e170
Adjust comments
2012-08-27 20:07:54 -04:00
kimth
82a0d065a7
Use enumerate in loops
2012-08-27 20:04:48 -04:00
kimth
297df37fc0
Drop unnecessary iterator index
2012-08-27 19:59:22 -04:00
kimth
6302283183
Drop unnecessary .keys()
2012-08-27 19:57:46 -04:00
kimth
b4b8f6bc7d
Use with open(file) structure
2012-08-27 19:55:21 -04:00
kimth
2919389d8e
Use os.path.join -- all of them...
2012-08-27 19:53:10 -04:00
kimth
7c5879a1a5
Use os.path.join
2012-08-27 19:50:47 -04:00
kimth
093f080641
Filesubmission input does not reveal queue length
2012-08-27 19:45:39 -04:00
kimth
3051c6aca7
Access system.xqueue properly as dict
2012-08-27 19:41:35 -04:00
kimth
26051f9939
Waittime passed through ModuleSystem.xqueue
2012-08-27 19:39:33 -04:00
kimth
a197f634ea
Get_queuetime_str does not return None
2012-08-27 19:34:46 -04:00
kimth
572e88d5b2
Adjust wait message
2012-08-27 19:20:50 -04:00
kimth
03588c094c
Move stdlib import location
2012-08-27 19:17:53 -04:00
kimth
4468fee8e5
Define dateformat variable in xqueue_interface
2012-08-27 19:15:28 -04:00
kimth
98542f79ec
Define dateformat variable in xqueue_interface
2012-08-27 19:14:47 -04:00
kimth
50481c2a81
CodeResponse saves queuestate as dict
2012-08-27 19:04:36 -04:00
kimth
dca16ad007
CorrectMap uses dict to represent queuestate
2012-08-27 19:01:36 -04:00
kimth
0cff6fa30d
Remove debugging comment
2012-08-27 18:51:38 -04:00
kimth
c462b1a917
Document CorrectMap.set
2012-08-27 18:50:31 -04:00
David Ormsbee
57c6bfc3a6
commenting out the pre-loading of modules until we get a better way in place (that doesn't hang on deploy)
2012-08-27 18:46:13 -04:00
David Ormsbee
d524062652
Put quick check so we don't load course modules on init unless we're actually running in Django
2012-08-27 17:47:37 -04:00
kimth
b45fb750b2
CorrectMap allows unmatched keywords
2012-08-27 17:12:20 -04:00
David Ormsbee
d2e64d1354
Merge pull request #551 from MITx/feature/victor/slash-in-url_names
...
Allow location url_names to contain ':', mapping to / on file load
2012-08-27 13:34:52 -07:00
Calen Pennington
01d0697165
Eagerly load modulestores on server startup
2012-08-27 16:26:35 -04:00
kimth
b53327a6a4
Correctmap state debugging continued...
2012-08-27 15:14:12 -04:00
kimth
ff38f5b390
Debugging correctmap state
2012-08-27 14:50:03 -04:00
kimth
b50f9759e1
Catch queuekey --> queuestate KeyError in conversion
2012-08-27 14:08:57 -04:00
Victor Shnayder
f81f94ec67
Allow location url_names to contain ':', mapping to / on file load
...
* New format: {tag}://{org}/{course}/{category}/{name}[@{revision}]
* Updated tests, code
* Added test chapter with : in url_name in toy course
* added test html page with : in url_name
* added a note to docs
2012-08-27 11:37:22 -04:00
Victor Shnayder
7e2e90cfa5
move comment into function re: #549
2012-08-27 11:29:13 -04:00
Calen Pennington
5bd919b5dc
Merge pull request #549 from MITx/feature/victor/unique-names
...
Feature/victor/unique names
2012-08-27 08:25:31 -07:00
Matthew Mongeau
8d747e4423
Conditionally show calculator
2012-08-27 10:15:30 -04:00
