Brittany Cheng
|
ec258a6346
|
follow button
|
2012-08-03 13:36:14 -04:00 |
|
Brittany Cheng
|
b73e329dd8
|
follow button
|
2012-08-03 13:33:40 -04:00 |
|
Brittany Cheng
|
15fa639e8b
|
merge conflict
|
2012-08-03 12:31:28 -04:00 |
|
Brittany Cheng
|
69475c63c8
|
move follow, remove hover
|
2012-08-03 12:30:21 -04:00 |
|
Rocky Duan
|
e59ea854ca
|
ajax submit new post
|
2012-08-03 12:29:45 -04:00 |
|
Rocky Duan
|
0b96d0091b
|
ajax reply & why am I on discussion2..
|
2012-08-03 12:15:45 -04:00 |
|
Rocky Duan
|
89c28115b4
|
some archived stuff for later
|
2012-08-03 11:03:58 -04:00 |
|
Rocky Duan
|
f7e9746eb3
|
Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2
|
2012-08-03 10:16:45 -04:00 |
|
Brittany Cheng
|
dac28f800b
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-08-03 10:11:43 -04:00 |
|
Rocky Duan
|
51961c1cf1
|
Merge branch 'master' into discussion2
|
2012-08-02 18:41:15 -04:00 |
|
Rocky Duan
|
cc477138cd
|
some refactoring on error handling
|
2012-08-02 18:41:07 -04:00 |
|
Rocky Duan
|
5ba879fc13
|
refactored some code
|
2012-08-02 18:23:50 -04:00 |
|
Brittany Cheng
|
2238137df8
|
sort styles
|
2012-08-02 18:09:37 -04:00 |
|
Brittany Cheng
|
cf4ac2ef89
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-08-02 17:21:08 -04:00 |
|
Rocky Duan
|
d183e91f3f
|
Merge branch 'master' into discussion2
|
2012-08-02 17:08:24 -04:00 |
|
Rocky Duan
|
6a23e910c2
|
small fic
|
2012-08-02 17:08:05 -04:00 |
|
Brittany Cheng
|
f649084ab2
|
rocky's coffee edits
|
2012-08-02 17:05:00 -04:00 |
|
Rocky Duan
|
88a98ef548
|
refactored discussion.coffee into separate files
|
2012-08-02 17:03:10 -04:00 |
|
Rocky Duan
|
bad84669b7
|
Merge branch 'master' into discussion2
|
2012-08-02 16:01:41 -04:00 |
|
Rocky Duan
|
0375710d22
|
i meant sort before...this time it's search ajax
|
2012-08-02 16:01:27 -04:00 |
|
Brittany Cheng
|
55ce53f984
|
reply styles
|
2012-08-02 15:50:14 -04:00 |
|
Brittany Cheng
|
4a605ab9c8
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-08-02 15:43:51 -04:00 |
|
Brittany Cheng
|
7f0282a222
|
paginator styles
|
2012-08-02 15:43:05 -04:00 |
|
Rocky Duan
|
7b65663e2b
|
ajax search in inline view
|
2012-08-02 15:34:29 -04:00 |
|
Brittany Cheng
|
fffad764b3
|
styles
|
2012-08-02 15:31:04 -04:00 |
|
Rocky Duan
|
1da86a782f
|
oops
|
2012-08-02 15:16:59 -04:00 |
|
Rocky Duan
|
2811f50466
|
hide the annoying staff info for now
|
2012-08-02 15:15:35 -04:00 |
|
Rocky Duan
|
381fe9514b
|
make cancel/submit work and hide watch discussion
|
2012-08-02 15:12:55 -04:00 |
|
Rocky Duan
|
7b66cae380
|
Merge branch 'discussion2' of github.com:dementrock/mitx
|
2012-08-02 15:02:20 -04:00 |
|
Rocky Duan
|
fd1e91aef2
|
display show comments button
|
2012-08-02 15:02:10 -04:00 |
|
Brittany Cheng
|
10c1366510
|
reply styles
|
2012-08-02 14:56:00 -04:00 |
|
Rocky Duan
|
1e7e2f25ad
|
Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2
|
2012-08-02 14:42:12 -04:00 |
|
Rocky Duan
|
380c6f86e7
|
random fixes
|
2012-08-02 14:41:45 -04:00 |
|
Brittany Cheng
|
7d414346d6
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-08-02 14:21:15 -04:00 |
|
Brittany Cheng
|
b47edaa9c9
|
styles
|
2012-08-02 14:21:09 -04:00 |
|
Rocky Duan
|
de2f48b3bf
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-08-02 12:55:09 -04:00 |
|
Rocky Duan
|
f1b3f69656
|
retrieve threads by ajax
|
2012-08-02 12:54:09 -04:00 |
|
Brittany Cheng
|
2d54aa07f3
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-08-02 11:55:28 -04:00 |
|
Brittany Cheng
|
907e763606
|
sort styles
|
2012-08-02 11:55:21 -04:00 |
|
David Ormsbee
|
73fb8f5464
|
Merge branch 'hotfix/1.0.3'
Conflicts:
lms/urls.py
|
2012-08-02 11:51:50 -04:00 |
|
Brittany Cheng
|
b2ddef99be
|
padding and margins of discussion containers
|
2012-08-01 18:14:59 -04:00 |
|
Brittany Cheng
|
03d9b7a928
|
merge kyle's style fixes
|
2012-08-01 18:09:27 -04:00 |
|
Brittany Cheng
|
ae89aac6ce
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-08-01 18:07:52 -04:00 |
|
Brittany Cheng
|
6c214fc4bd
|
basic paginator styles
|
2012-08-01 18:03:36 -04:00 |
|
Kyle Fiedler
|
b90aa2e2db
|
Added more styles for the info page and added headers for the updates and handouts so they will be consistant for every class
|
2012-08-01 17:36:11 -04:00 |
|
Kyle Fiedler
|
6c3ec99f9e
|
Start to change to ems and remove all of cream
|
2012-08-01 17:36:10 -04:00 |
|
Kyle Fiedler
|
cdd37eeb92
|
Strip down sequence navigaiton and more stripping of the courseware nav
|
2012-08-01 17:36:10 -04:00 |
|
Brittany Cheng
|
dac66a998e
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-08-01 17:06:37 -04:00 |
|
Brittany Cheng
|
01ac251c2b
|
styles and staff
|
2012-08-01 17:06:32 -04:00 |
|
Rocky Duan
|
ce15faf6a0
|
Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2
|
2012-08-01 16:52:06 -04:00 |
|