Rocky Duan
|
0ae68e7324
|
Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
|
2012-08-06 22:38:31 -04:00 |
|
kimth
|
d3f4746f57
|
Don't contact queueing server on Django load
|
2012-08-06 19:02:40 -04:00 |
|
kimth
|
18a7f58735
|
Handle xreply parsing errors more gracefully
|
2012-08-06 17:44:07 -04:00 |
|
kimth
|
b6e9e7a4bb
|
Handle network errors more gracefully
|
2012-08-06 17:36:38 -04:00 |
|
kimth
|
ae11f91880
|
Queue submission reports queue length
|
2012-08-06 16:56:44 -04:00 |
|
kimth
|
00486819c2
|
Make CodeMirror more pleasant for 6.00
|
2012-08-06 16:47:24 -04:00 |
|
kimth
|
c2e351523f
|
Update ModuleSystem
|
2012-08-06 16:28:15 -04:00 |
|
kimth
|
4e6808bb47
|
Merge master
|
2012-08-06 16:26:25 -04:00 |
|
kimth
|
41e7d72ea8
|
Xqueue interface is embedded in ModuleSystem
|
2012-08-06 16:13:35 -04:00 |
|
kimth
|
7cc502c886
|
Refactor list of inputs in ajax
|
2012-08-06 15:44:27 -04:00 |
|
Calen Pennington
|
24f85bf202
|
Merge pull request #340 from MITx/kimth/lms-coderesponse
Kimth/lms coderesponse
|
2012-08-06 12:17:15 -07:00 |
|
kimth
|
110637c023
|
XqueueInterface is a singleton instantiated object
|
2012-08-06 15:06:19 -04:00 |
|
ichuang
|
a46a37d1c0
|
log.debug -> log.exception; revert log change in xml_module
|
2012-08-06 13:58:42 -04:00 |
|
kimth
|
6c875206bc
|
Simplify file submission front end
|
2012-08-06 12:44:19 -04:00 |
|
kimth
|
c950d437e5
|
Add comments on CodeResponse.get_score
|
2012-08-06 11:58:00 -04:00 |
|
kimth
|
881cafb88d
|
Moved default parameter assignment to function def, parse_xreply util function
|
2012-08-06 09:14:09 -04:00 |
|
ichuang
|
3c23235885
|
fix for some broken github edit links - avoids symlinks
|
2012-08-05 11:39:56 -04:00 |
|
Rocky Duan
|
7c58fd27a1
|
Merge branch 'master' of github.com:MITx/mitx
Conflicts:
lms/templates/profile.html
|
2012-08-04 18:07:27 -04:00 |
|
ichuang
|
7fe75030cc
|
fix staff edit link in module content display (goes to github)
|
2012-08-04 17:52:14 -04:00 |
|
ichuang
|
d50af5765e
|
make university profile pages also use get_courses_by_university
|
2012-08-04 11:03:54 -04:00 |
|
ichuang
|
84ed806f0d
|
start on lms migration path: view for loaded modules, and reload method
|
2012-08-03 20:20:35 -04:00 |
|
kimth
|
8aef6a0e75
|
Ajax doesn't complain about FormData if there's no file to be uploaded
|
2012-08-03 17:38:34 -04:00 |
|
kimth
|
8eff9f7caa
|
Upload to xqueue
|
2012-08-03 17:11:55 -04:00 |
|
kimth
|
9d52c43286
|
Add 'value' to filesubmission template
|
2012-08-03 15:49:30 -04:00 |
|
kimth
|
c25eded4fc
|
Move xqueue_interface to lib/capa
|
2012-08-03 15:32:02 -04:00 |
|
Victor Shnayder
|
94e24c1626
|
Leftover name->url_name fixes
|
2012-08-03 14:45:43 -04:00 |
|
kimth
|
604596843c
|
Time to think about file interface with xqueue
|
2012-08-03 14:39:30 -04:00 |
|
kimth
|
473bb817e8
|
File objects passed to responsetype only if responsetype explicitly allows filesubmissions
|
2012-08-03 14:34:48 -04:00 |
|
kimth
|
bfd441255a
|
Every path except for 'get_score' gets filename instead of file object
|
2012-08-03 14:16:20 -04:00 |
|
kimth
|
cbb377d383
|
Answer dict values remain unicode, rather than str
|
2012-08-03 14:10:22 -04:00 |
|
kimth
|
afcd6fb1d7
|
Safe logging of File-included answers
|
2012-08-03 14:02:49 -04:00 |
|
kimth
|
eeaa1e0440
|
Capa util function to turn File objects in dict to filename (string)
|
2012-08-03 13:54:33 -04:00 |
|
Victor Shnayder
|
b46172da9b
|
Rename module.name and descriptor.name to url_name
* update templates and code references
* also a display_name property that defaults to cleaned url_name
|
2012-08-03 11:36:54 -04:00 |
|
Rocky Duan
|
7ab137328f
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-08-03 10:16:35 -04:00 |
|
kimth
|
f023dc6e26
|
xqueue_interface generates hashkeys
|
2012-08-03 10:10:06 -04:00 |
|
kimth
|
3d8ee671b3
|
Adjust comments
|
2012-08-03 09:34:47 -04:00 |
|
kimth
|
e4609f3abe
|
Remove unnecessary hardcode url in CodeResponse
|
2012-08-03 09:30:03 -04:00 |
|
kimth
|
688f8914e3
|
Update filesubmission template to show state
|
2012-08-02 20:32:03 -04:00 |
|
kimth
|
35a461d917
|
Empty file inputs insert empty string as their submission in ajax; LMS reacts accordingly
|
2012-08-02 20:22:33 -04:00 |
|
kimth
|
236c3dc576
|
modx_dispatch handles new/old problem_check ajax
|
2012-08-02 19:34:33 -04:00 |
|
kimth
|
51fc69da52
|
Spelling in comment
|
2012-08-02 19:26:37 -04:00 |
|
kimth
|
5c3c3df1b7
|
Unbreak check_fd callback
|
2012-08-02 19:24:25 -04:00 |
|
kimth
|
988136c401
|
LMS must login before submitting to xqueue
|
2012-08-02 18:34:14 -04:00 |
|
kimth
|
d2db4134cd
|
CodeResponse does basic error handling from xqueue submission
|
2012-08-02 17:28:12 -04:00 |
|
kimth
|
6de2fa5e1e
|
LMS interface to xqueue in separate file
|
2012-08-02 17:10:35 -04:00 |
|
kimth
|
c7084e5240
|
Comments for 'check_fd'
|
2012-08-02 15:35:25 -04:00 |
|
kimth
|
541f5ecdd2
|
Filesubmission frontend
|
2012-08-02 14:32:40 -04:00 |
|
Victor Shnayder
|
2f911fd3b2
|
add error-handling TODOs to capa_problem
|
2012-08-02 14:28:44 -04:00 |
|
Victor Shnayder
|
987b9c11a9
|
Use url_name for chapters and sections in lms views
* got rid of the hackish conversions between ' ' and '_'
* use url_name and display_name where appropriate
* update templates to match.
|
2012-08-02 14:28:44 -04:00 |
|
Victor Shnayder
|
26ae88faac
|
Factor out get_item_error() into a new ModuleStoreBase class
* may be temporary if we move errors into the items themselves.
|
2012-08-02 13:41:54 -04:00 |
|