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 |
|
Rocky Duan
|
f1b3f69656
|
retrieve threads by ajax
|
2012-08-02 12:54:09 -04:00 |
|
Brittany Cheng
|
907e763606
|
sort styles
|
2012-08-02 11:55:21 -04:00 |
|
Rocky Duan
|
efc0cc7ca7
|
oops
|
2012-08-01 21:31:06 -04:00 |
|
Rocky Duan
|
e05faef88a
|
fixed tag url
|
2012-08-01 21:26:14 -04:00 |
|
Rocky Duan
|
a8e23dcc53
|
Merge branch 'master' into discussion2
Conflicts:
lms/templates/discussion/_forum.html
lms/templates/discussion/_inline.html
|
2012-08-01 19:46:52 -04:00 |
|
Rocky Duan
|
9a31d7a9b4
|
basic sorting
|
2012-08-01 19:44:07 -04:00 |
|
Brittany Cheng
|
6c214fc4bd
|
basic paginator styles
|
2012-08-01 18:03:36 -04:00 |
|
Rocky Duan
|
ce15faf6a0
|
Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2
|
2012-08-01 16:52:06 -04:00 |
|
Rocky Duan
|
17d11a6391
|
pagination
|
2012-08-01 16:45:08 -04:00 |
|
Brittany Cheng
|
845ca43ea1
|
inline and forum styles
|
2012-08-01 16:42:09 -04:00 |
|
Rocky Duan
|
f204e9888f
|
renamed files
|
2012-08-01 13:09:19 -04:00 |
|
Rocky Duan
|
51772c04f3
|
use separate templates for forum view and inline view
|
2012-08-01 13:02:57 -04:00 |
|
Rocky Duan
|
7d9d790c5d
|
endorse comments
|
2012-08-01 12:43:57 -04:00 |
|
Brittany Cheng
|
29d75057f2
|
fix font inheritance, update post control styles
|
2012-07-31 16:25:27 -04:00 |
|
Brittany Cheng
|
b12d887309
|
font sizing
|
2012-07-31 15:41:03 -04:00 |
|
Brittany Cheng
|
3d389c099e
|
new post control button and link styles
|
2012-07-31 15:05:07 -04:00 |
|
Rocky Duan
|
c43d5d236a
|
Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2
Conflicts:
lms/static/coffee/src/discussion.coffee
|
2012-07-31 13:43:53 -04:00 |
|
Rocky Duan
|
401f57b81a
|
show new post form after clicking button
|
2012-07-31 13:40:26 -04:00 |
|
Brittany Cheng
|
ddce6d8cb6
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-07-31 13:39:13 -04:00 |
|
Brittany Cheng
|
48674d6fa5
|
search button style
|
2012-07-31 13:23:35 -04:00 |
|
Rocky Duan
|
c39b2db678
|
retrieve inline discussion by ajax
|
2012-07-31 13:22:25 -04:00 |
|
Rocky Duan
|
701f8716f7
|
only show edit button when user can edit
|
2012-07-31 12:31:59 -04:00 |
|
Rocky Duan
|
e301be4a80
|
modify anonymity handling; display comments count
|
2012-07-31 11:54:02 -04:00 |
|
Rocky Duan
|
a08d4b808b
|
fix raw tag data bug
|
2012-07-31 10:47:42 -04:00 |
|
Rocky Duan
|
6f44001813
|
basic editing functionality
|
2012-07-31 10:11:51 -04:00 |
|
Rocky Duan
|
24610899cf
|
fix accordion
|
2012-07-30 18:34:47 -04:00 |
|
Rocky Duan
|
d6b7707725
|
refactored reply rendering by using mustache
|
2012-07-30 18:19:04 -04:00 |
|
Rocky Duan
|
5fcc12136e
|
fixed bug caused by rearranging stuff
|
2012-07-30 17:20:30 -04:00 |
|
Rocky Duan
|
6c8214051f
|
Merge branch 'discussion2' of github.com:dementrock/mitx
|
2012-07-30 17:17:32 -04:00 |
|
Rocky Duan
|
941ae0f068
|
basic error handling
|
2012-07-30 17:16:44 -04:00 |
|
Rocky Duan
|
2869de16dd
|
refactored thread.html
|
2012-07-30 17:15:53 -04:00 |
|
Brittany Cheng
|
1b7e2b356e
|
edit layout of search box
|
2012-07-30 15:22:40 -04:00 |
|
Rocky Duan
|
ab339239f8
|
use single js dependencies for discussion in forum / courseware
|
2012-07-30 13:44:00 -04:00 |
|
Brittany Cheng
|
65730c2268
|
Merge branch 'master' of github.com:dementrock/mitx into discussion
|
2012-07-30 10:45:04 -04:00 |
|
Rocky Duan
|
8e3251c915
|
basic tag autocomplete
|
2012-07-29 17:32:00 -04:00 |
|
Rocky Duan
|
b92a180d25
|
add tags to threads & view threads by tags
|
2012-07-29 15:24:15 -04:00 |
|
Brittany Cheng
|
f6a3842fd8
|
merging inline html
|
2012-07-28 18:18:47 -04:00 |
|
Rocky Duan
|
1ad838ace8
|
fix random js stuff; tag fields; override mathjax config for now
|
2012-07-28 18:15:37 -04:00 |
|
Rocky Duan
|
0790a3add4
|
image uploading & render markdown
|
2012-07-27 17:50:38 -04:00 |
|
Brittany Cheng
|
4535188099
|
style changes
|
2012-07-27 17:20:37 -04:00 |
|
Brittany Cheng
|
148d499bfe
|
Merge branch 'master' of github.com:dementrock/mitx into discussion
|
2012-07-27 14:43:43 -04:00 |
|
Brittany Cheng
|
aff57bf855
|
mostly font edits
|
2012-07-27 14:43:33 -04:00 |
|
Rocky Duan
|
03898f4ab7
|
fixed unmatched div tag
|
2012-07-26 17:57:37 -04:00 |
|
Rocky Duan
|
fc4e21d4c4
|
use wmd editor for comments
|
2012-07-26 17:35:09 -04:00 |
|
Rocky Duan
|
f0ce33c951
|
make mathjax working with the editor
|
2012-07-26 15:34:22 -04:00 |
|
Rocky Duan
|
1a57ac50f4
|
custom mathjax setup
|
2012-07-26 11:09:33 -04:00 |
|
Rocky Duan
|
7103bd0071
|
moved vendor js files to common
|
2012-07-25 20:57:38 -04:00 |
|