Tom Giannattasio
2135ed5015
added vote arrows
2012-08-07 10:16:08 -04:00
ichuang
462d75936a
Merge pull request #357 from MITx/hotfix-registration
...
fix typo in registration button jquery
2012-08-07 07:11:53 -07:00
ichuang
4b2091b173
fix typo in registration button jquery
2012-08-07 10:09:55 -04:00
Brittany Cheng
87019c4bcb
Merge branch 'master' of github.com:dementrock/mitx into discussion3
2012-08-07 10:07:30 -04:00
kimth
cb2fbfa54c
Added test for answers file-to-filename conversion
2012-08-07 09:38:36 -04:00
kimth
ceeea66417
Fix overrzealous file_to_filename conversion and fix CapaProblem unit tests
2012-08-07 09:24:17 -04:00
Calen Pennington
c5fa6bac89
Merge pull request #353 from MITx/ichuang/showhide-staff-debug
...
make the staff debug information appear in a show/hide span
2012-08-07 05:43:14 -07:00
Bridger Maxwell
3dffcaca1c
Fixed capitalization in gradebook css.
2012-08-07 08:42:08 -04:00
Calen Pennington
e14ebaafc3
Merge pull request #345 from MITx/MITx/feature/bridger/fast_course_grading
...
Fast grading
2012-08-07 05:39:18 -07:00
Bridger Maxwell
3a52e86a87
Fixed weighting of individual problems. Unmodified problems have weight None, not 1.
2012-08-07 08:00:06 -04:00
Bridger Maxwell
8287e5a13f
Fixed grading bug where list comprehension variable overrode local variable.
2012-08-07 07:33:35 -04:00
Arjun Singh
0c4ad3b152
Converting seed to str to allow for using Mock objects as a seed during tests.
2012-08-07 04:30:19 -04:00
Arjun Singh
332dd8c99e
Adding tests for javascript response; required copying files that would exist in other places in the main LMS to test_files because the test environment is fragile. This tests the code, but not the environment.
2012-08-07 04:29:45 -04:00
Arjun Singh
7cd8ffff3d
Cleans up node calls and (barely) improves security as subprocess.Popen will escape arguments properly. This means that instructors cannot set the grader/generator to ;/bin/rm -rf *; however, the python and node environments are not sandboxed at all and so instructors can still run arbitrarily malicious code.
2012-08-07 03:55:01 -04:00
Arjun Singh
fb6dbb120e
Fixing dependency system for javascriptresponses. In particular, adding a location for node-only packages (that are never sent to the client) in lms/lib/node_modules and adding lms/static/js, lms/static/coffee/* to the NODE_PATH, along with the course's data directory.
2012-08-07 03:28:35 -04:00
Arjun Singh
19fa50a882
Removing the <text> wrapper around choice text for radiogroup and checkboxgroup.
2012-08-07 02:38:23 -04:00
kimth
49b1678bf4
Merge pull request #354 from MITx/arjun/grading_fix
...
arjun/grading fix
2012-08-06 22:28:57 -07:00
Arjun Singh
323fb18c74
Poor fix for a breaking change in which student answers that were arrays (e.g. those resulting from a checkbox group) would be converted to strings and graded incorrectly.
2012-08-07 00:14:48 -04:00
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
77900bd761
simple blank slate
2012-08-06 23:17:38 -04:00
Rocky Duan
42cab65903
make behavior consistent with normal mathjax
2012-08-06 23:05:05 -04:00
Rocky Duan
26a80f2d9b
fixed escape recovering bug
2012-08-06 23:00:38 -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
Rocky Duan
5679b0da5d
sort by activity
2012-08-06 22:25:15 -04:00
Rocky Duan
c2e2cd40a4
fixed display mode single character bug
2012-08-06 22:21:10 -04:00
Rocky Duan
d33ddec470
fixed multiple renderer bug
2012-08-06 22:20:56 -04:00
ichuang
fa8bf7f371
make the staff debug information appear in a show/hide span
2012-08-06 21:54:29 -04:00
Rocky Duan
fe02d04f07
use raw title
2012-08-06 21:46:33 -04:00
Rocky Duan
bd4a386d93
highlighting while skipping code and mathjax (ugly and slow solution)
2012-08-06 21:43:43 -04:00
kimth
0940a3cc83
Merge pull request #352 from MITx/kimth/lms-coderesponse
...
Don't contact queueing server on Django load
2012-08-06 16:09:56 -07:00
kimth
d3f4746f57
Don't contact queueing server on Django load
2012-08-06 19:02:40 -04:00
Bridger Maxwell
69ba80bf63
Merge branch 'master' into MITx/feature/bridger/fast_course_grading
2012-08-06 18:51:59 -04:00
Bridger Maxwell
873f1431ec
Put back dynamic grade cutoffs and final grade rounding (from stable-end-of-course)
2012-08-06 18:51:11 -04:00
Arjun Singh
88d672e862
Add hashlib back into responsetypes temporarily.
2012-08-06 18:49:59 -04:00
Arjun Singh
2f84e0ca78
Merge master
2012-08-06 18:48:17 -04:00
ichuang
926763a3d6
Merge pull request #351 from MITx/edit-link-fix
...
Edit link fix
2012-08-06 15:44:34 -07:00
Brittany Cheng
92ca7ff240
link styles
2012-08-06 18:42:00 -04:00
Mike Chen
d9ffca2a31
vote_for_comment typo
2012-08-06 18:41:37 -04:00
ichuang
6dfbb222ab
Merge branch 'master' of github.com:MITx/mitx
2012-08-06 18:41:18 -04:00
ichuang
ff5773c0d9
Merge pull request #348 from MITx/kimth/lms-coderesponse
...
merging this now because the it looks ok, and it fixes some bugs introduced by the last xserver merge, which are preventing the LMS from running in the current version of master.
2012-08-06 15:40:56 -07:00
Mike Chen
6bc69ff97b
added permanent link for comments
2012-08-06 18:38:04 -04:00
ichuang
9728b429b7
Merge branch 'kimth/lms-coderesponse' of github.com:MITx/mitx
2012-08-06 18:36:11 -04:00
ichuang
f47ab30c3f
small fix to xmodule_modifiers to fix case when filename missing
2012-08-06 18:34:54 -04:00
Tom Giannattasio
6cdd3a7ec2
started thread styles
2012-08-06 18:17:21 -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
Arjun Singh
2337eeba1e
Adding javascriptresponse. This responsetype is a framework for problems that are entirely controlled by javascript and graded by Node.js on the server.
2012-08-06 18:11:23 -04:00
Mike Chen
50228fc2d6
added permanent link for threads
2012-08-06 18:09:35 -04:00
Arjun Singh
869e638e07
Removing compiled js files in data directories before recompiling them; this causes compilation errors to fail loudly.
2012-08-06 18:08:07 -04:00
Arjun Singh
833e7777db
Watching xmodule js
2012-08-06 18:08:07 -04:00
Brittany Cheng
981fc90afb
new post styles
2012-08-06 17:59:10 -04:00
