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
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
ichuang
926763a3d6
Merge pull request #351 from MITx/edit-link-fix
...
Edit link fix
2012-08-06 15:44:34 -07: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
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
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
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
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
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
Brittany Cheng
5e9dfabfda
comment info
2012-08-06 14:33:37 -04:00
ichuang
8a1747770a
redirect to course_about page if hit internal course page unregistered for
2012-08-06 14:30:53 -04:00
ichuang
b1ddff838c
add comment about course start date logic
2012-08-06 14:23:55 -04:00
ichuang
6f894c816c
use jquery for error msg in course_about
2012-08-06 14:19:45 -04:00
ichuang
871ed954be
ACCESS_REQUIRE_STAFF_FOR_COURSE default False in lms.envs.dev
2012-08-06 14:16:11 -04:00
ichuang
3484f5382c
isinstance instead of type
2012-08-06 14:10:00 -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
Brittany Cheng
307ebed8f6
reorganize css
2012-08-06 12:41:45 -04:00
Brittany Cheng
8346804aaf
reorganize css
2012-08-06 12:06:34 -04:00
Brittany Cheng
9ab745c331
reorganize css
2012-08-06 12:04:15 -04:00
kimth
c950d437e5
Add comments on CodeResponse.get_score
2012-08-06 11:58:00 -04:00
Brittany Cheng
27eaffe246
sort styles
2012-08-06 11:47:16 -04:00
kimth
881cafb88d
Moved default parameter assignment to function def, parse_xreply util function
2012-08-06 09:14:09 -04:00
ichuang
7607444286
fix bug: course staff group based on dir_name, not course number
2012-08-05 23:26:31 -04:00
ichuang
553f7046b4
suggested username for ssl auth is conjoined name with no spaces
2012-08-05 21:12:56 -04:00
ichuang
0347eb498c
add MITX_FEATURES flags to enable textbook and discussion,
...
and modify course_navigation correspondingly
2012-08-05 20:24:00 -04:00
