Arjun Singh
96746721c4
Fixed incorrect default argument so that tests run; however the new value is incorrect and needs to be fixed.
2012-08-07 00:11:39 -04:00
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
Bridger Maxwell
69ba80bf63
Merge branch 'master' into MITx/feature/bridger/fast_course_grading
2012-08-06 18:51:59 -04:00
Arjun Singh
2f84e0ca78
Merge master
2012-08-06 18:48:17 -04:00
Arjun Singh
99e7d0076e
Adding a method of executing scripts fetched via AJAX in IE8+. Also adds inputtype-specific handlers so that javascript can be executed when an inputtype is encountered.
2012-08-06 18:11:23 -04:00
Kyle Fiedler
99c3a7996a
Fix color of speed dropdown
2012-08-06 16:49:29 -04:00
Bridger Maxwell
4fedca5bf9
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
2012-08-06 16:49:05 -04:00
Bridger Maxwell
baa2b14405
Changed interface of StudentModuleCache. Other changes from code review.
2012-08-06 16:36:53 -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
Bridger Maxwell
d7cab471f2
Accidentally had left a print statement commented out.
2012-08-06 14:00:45 -04:00
ichuang
a46a37d1c0
log.debug -> log.exception; revert log change in xml_module
2012-08-06 13:58:42 -04:00
Bridger Maxwell
ba42c0225d
Moved the generation of the 'grading context' to a lazy property in course descriptor.
2012-08-06 13:57:41 -04:00
kimth
6c875206bc
Simplify file submission front end
2012-08-06 12:44:19 -04:00
Bridger Maxwell
2348f71cc6
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
...
Conflicts:
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/views.py
2012-08-06 11:48:42 -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
Bridger Maxwell
694520ebb2
StudentModuleCache now allows a list of descriptors. This speeds up grading significantly.
2012-08-03 17:00:04 -04:00
Victor Shnayder
94e24c1626
Leftover name->url_name fixes
2012-08-03 14:45:43 -04:00
kimth
afcd6fb1d7
Safe logging of File-included answers
2012-08-03 14:02:49 -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
3d8ee671b3
Adjust comments
2012-08-03 09:34:47 -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
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
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
Victor Shnayder
64346d727b
todos and comments
2012-08-02 11:33:53 -04:00
Victor Shnayder
31b8270cfb
remove too-clever lazy dictionary
2012-08-02 10:14:35 -04:00
Victor Shnayder
41eca8a0a5
Move files into xmodule module per comment on #326
...
* move html_checker.py
* move stringify.py
* move tests into module
* remove duplicate progress.py
* fix module imports
2012-08-02 10:13:58 -04:00
Brittany Cheng
8febbf249f
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-08-02 10:06:43 -04:00
Victor Shnayder
fc0f938eae
Responding to comments on pull #326
...
* cleaned up error module:
- only one template
- save error message in xml and reload
* better display of problem definition and metadata to staff
* save error messages as string, not exception objects.
2012-08-02 09:56:01 -04:00
Victor Shnayder
e2ce54612c
remove debugging assert from test
2012-08-01 19:25:47 -04:00
Victor Shnayder
652e2aa24c
fix for inheriting metadata bug
...
* problem was on import to json--got all the metadata,
but didn't preserve the _inherited_metadata
* added own_metadata property, use it instead
2012-08-01 19:25:47 -04:00
Victor Shnayder
82899323e8
Add metadata inherit test
...
* also make a placeholder roundtrip export test
2012-08-01 19:25:47 -04:00
Brittany Cheng
ae89aac6ce
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-08-01 18:07:52 -04:00
Kyle Fiedler
cdd37eeb92
Strip down sequence navigaiton and more stripping of the courseware nav
2012-08-01 17:36:10 -04:00
Rocky Duan
0dccfc0a8d
forgot to change template name
2012-08-01 16:47:20 -04:00
Rocky Duan
5d3b187540
Merge branch 'master' of github.com:MITx/mitx
2012-08-01 16:45:21 -04:00
