Rocky Duan
b1e1cd57d8
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
2012-08-08 10:45:04 -04:00
Rocky Duan
18fcdc4be2
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
2012-08-08 10:44:24 -04:00
Mike Chen
b2a048e6fc
limit permissions of a role to courses and fix bugs
2012-08-08 10:42:29 -04:00
Mike Chen
e9c970e399
revert permanent link for comments
2012-08-07 18:45:26 -04:00
Rocky Duan
547114a823
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
2012-08-07 11:31:26 -04:00
Rocky Duan
6c2f53a495
to make it appear at least normal..
2012-08-07 11:28:52 -04:00
Rocky Duan
25c05e702e
Merge branch 'brittany' of github.com:dementrock/mitx
2012-08-07 11:23:19 -04:00
Rocky Duan
0c311b8f13
search for similar posts without any styling..
2012-08-07 11:22:41 -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
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
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
Mike Chen
50228fc2d6
added permanent link for threads
2012-08-06 18:09:35 -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
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
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
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
