Rocky Duan
|
2fb02f1a73
|
Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
lms/urls.py
|
2012-08-07 16:58:14 -04:00 |
|
Rocky Duan
|
272c7b8b0c
|
Merge branch 'master' into merge
|
2012-08-07 16:49:54 -04:00 |
|
Brittany Cheng
|
338a6788c8
|
recent activity
|
2012-08-07 16:11:24 -04:00 |
|
Brittany Cheng
|
39dc6a63da
|
cleanup css
|
2012-08-07 14:41:28 -04:00 |
|
Brittany Cheng
|
ed8595ad95
|
error styles
|
2012-08-07 14:31:04 -04:00 |
|
Brittany Cheng
|
7962813014
|
info styles
|
2012-08-07 13:53:57 -04:00 |
|
Brittany Cheng
|
49840933c0
|
error handling
|
2012-08-07 13:48:43 -04:00 |
|
Rocky Duan
|
dbb467365b
|
fixed error field for new post
|
2012-08-07 12:08:38 -04:00 |
|
Rocky Duan
|
aeb2d73cba
|
Merge branch 'discussion3' of github.com:dementrock/mitx
|
2012-08-07 12:05:52 -04:00 |
|
Rocky Duan
|
a9b171c81f
|
Merge branch 'discussion3' of github.com:dementrock/mitx
Conflicts:
lms/static/coffee/src/discussion/templates.coffee
|
2012-08-07 12:05:46 -04:00 |
|
Brittany Cheng
|
391d173018
|
similar posts styles
|
2012-08-07 12:05:01 -04:00 |
|
Rocky Duan
|
0560bb7eb7
|
add hide similar post button
|
2012-08-07 12:03:41 -04:00 |
|
Kyle Fiedler
|
dd6ec19e80
|
Make the modal window work in the courseware
|
2012-08-07 11:59:49 -04:00 |
|
Brittany Cheng
|
4b9358fb72
|
similar posts styles
|
2012-08-07 11:55:31 -04:00 |
|
Brittany Cheng
|
5bec964606
|
Merge branch 'master' of github.com:dementrock/mitx into discussion3
|
2012-08-07 11:36:34 -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 |
|
Brittany Cheng
|
1fb0e352b4
|
blank slate
|
2012-08-07 11:10:24 -04:00 |
|
Brittany Cheng
|
87019c4bcb
|
Merge branch 'master' of github.com:dementrock/mitx into discussion3
|
2012-08-07 10:07:30 -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
|
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 |
|
Brittany Cheng
|
92ca7ff240
|
link styles
|
2012-08-06 18:42:00 -04:00 |
|
Brittany Cheng
|
981fc90afb
|
new post styles
|
2012-08-06 17:59:10 -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 |
|
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 |
|
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 |
|
Mike Chen
|
af656fcf21
|
use permissions to check if one can edit or relp
|
2012-08-06 15:08:47 -04:00 |
|
Brittany Cheng
|
24a69a7409
|
thread styles
|
2012-08-06 14:57:56 -04:00 |
|
Brittany Cheng
|
45cc349d40
|
comment info
|
2012-08-06 14:51:44 -04:00 |
|
Brittany Cheng
|
5e9dfabfda
|
comment info
|
2012-08-06 14:33:37 -04:00 |
|
Mike Chen
|
3f1534eab7
|
added permission framework.
|
2012-08-06 12:58:20 -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 |
|
Brittany Cheng
|
27eaffe246
|
sort styles
|
2012-08-06 11:47:16 -04:00 |
|
Rocky Duan
|
1f5aa5e68b
|
fixed new post editor position
|
2012-08-05 15:33:18 -04:00 |
|