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
Victor Shnayder
cbfc117e8b
a few edits to the xml format docs
2012-08-28 19:53:46 -04:00
David Ormsbee
1a97a1ced0
Merge pull request #582 from MITx/feature/arjun/jsresponse_compilation
...
Disable jsresponse file compilation; done manually for now.
2012-08-28 12:56:37 -07: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
David Ormsbee
6255fe5a79
Merge pull request #563 from MITx/kimth/check-grader-html
...
Check grader message has proper XML structure
2012-08-28 10:47:28 -07:00
David Ormsbee
1b3c84ace7
Merge pull request #579 from MITx/sarina/fix_video_title
...
Fix display titles on video pages
2012-08-28 10:39:36 -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
David Ormsbee
521521c66b
Merge pull request #559 from MITx/kimth/send-idhash
...
Kimth/send idhash
2012-08-28 10:15:24 -07: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
Calen Pennington
bf6fe1022f
Merge pull request #578 from MITx/feature/cale/django-under-wsgi
...
Add a wsgi file for the lms that loads the modulestores immediately afte...
2012-08-28 09:31:16 -07:00
Sarina Canelake
44cff00f50
Fix display titles on video pages
2012-08-28 12:20:36 -04:00
Calen Pennington
5c17366cd5
Add a wsgi file for the lms that loads the modulestores immediately after the application starts
2012-08-28 12:01:05 -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
David Ormsbee
5ba76a505f
Merge pull request #572 from MITx/feature/arjun/fix_progress_scores_order
...
Fixing order that problem scores are displayed on the progress page
2012-08-28 08:06:32 -07: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
David Ormsbee
18127cf967
Merge pull request #569 from MITx/feature/rocha/wiki-cheatsheet
...
Refactored wiki cheatsheet code.
2012-08-28 07:59:05 -07:00
Calen Pennington
1fe0ccbf25
Merge pull request #576 from MITx/feature/victor/fix-trailing-location-url
...
Remove trailing slash from ajax url in ModuleSystem
2012-08-28 07:21:47 -07:00
Victor Shnayder
bd2374b6fe
Remove trailing slash from ajax url in ModuleSystem
...
* also add a check for valid location in modx_dispatch
2012-08-28 10:22:08 -04: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
3842c39f8a
Fixing order that problem scores are displayed in
2012-08-27 23:52:27 -07:00
Arjun Singh
8ed9ab44e7
Contextualizing javascript parameters
2012-08-27 23:49:07 -07:00
pmitros
113535dbdf
Merge pull request #570 from MITx/johnhess/unique_students
...
updated admin_dashboard to show count of unique students
2012-08-27 17:35:35 -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
John Hess
2cf4b28cf7
added additional query to show number of users with any given number of registrations (power users)
2012-08-27 19:22:19 -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
John Hess
a9a73561f4
updated admin_dashboard to show count of unique students
2012-08-27 19:05:00 -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
jarv
828e169a49
Merge pull request #568 from MITx/feature/cale/eagerly-load-modulestores
...
Feature/cale/eagerly load modulestores
2012-08-27 15:52:53 -07:00
