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
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
Mike Chen
16e86fe5b0
show searched tag
2012-08-06 17:28:58 -04:00
Tom Giannattasio
43a70d8994
a few main discussion page tweaks
2012-08-06 17:04:24 -04:00
Tom Giannattasio
0ec7e3d3cd
added "top" sort type
2012-08-06 17:04:07 -04:00
Tom Giannattasio
fa7d1745dc
removed extraneous elements (page title, search within)
2012-08-06 17:03:49 -04:00
kimth
ae11f91880
Queue submission reports queue length
2012-08-06 16:56:44 -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
kimth
00486819c2
Make CodeMirror more pleasant for 6.00
2012-08-06 16:47:24 -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
Mike Chen
dc29570189
Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation
2012-08-06 16:16:44 -04:00
Rocky Duan
39ae9343e8
merged brittany's branch & fixed stuff
2012-08-06 16:15:36 -04:00
kimth
41e7d72ea8
Xqueue interface is embedded in ModuleSystem
2012-08-06 16:13:35 -04:00
Kyle Fiedler
e90103abdf
Reset styles for profile page and some for the info page
2012-08-06 16:08:41 -04:00
Kyle Fiedler
ac960ab9df
Add images for book and fix styles for wiki
2012-08-06 16:08:40 -04:00
Kyle Fiedler
a090d62339
Add styles for next last page in textbook
2012-08-06 16:08:40 -04:00
Kyle Fiedler
e40c6b3812
Reset some styles for the textbook
2012-08-06 16:08:40 -04:00
Kyle Fiedler
29b8577346
Fix styles in the handouts sidebar
2012-08-06 16:08:40 -04:00
Mike Chen
fca5ab9a08
added delete link
2012-08-06 16:01:41 -04:00
Mike Chen
7e8b1992f0
show endorsed checkmark based on permissions
2012-08-06 15:51:33 -04:00
kimth
7cc502c886
Refactor list of inputs in ajax
2012-08-06 15:44:27 -04:00
Rocky Duan
427a871456
Merge branch 'discussion2' of github.com:dementrock/mitx
2012-08-06 15:21:54 -04:00
Rocky Duan
1805ed8a7c
search highlighting
2012-08-06 15:21:48 -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
Mike Chen
af656fcf21
use permissions to check if one can edit or relp
2012-08-06 15:08:47 -04:00
kimth
110637c023
XqueueInterface is a singleton instantiated object
2012-08-06 15:06:19 -04:00
Brittany Cheng
24a69a7409
thread styles
2012-08-06 14:57:56 -04:00
Calen Pennington
291cbac838
Merge pull request #342 from MITx/lms-migration
...
LMS migration
2012-08-06 11:51:50 -07:00
Brittany Cheng
45cc349d40
comment info
2012-08-06 14:51:44 -04:00
ichuang
9805ed8962
cleanup syntax, split long if into two lines
2012-08-06 14:37:17 -04:00
