Commit Graph

93 Commits

Author SHA1 Message Date
Rocky Duan
fd1e91aef2 display show comments button 2012-08-02 15:02:10 -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
f1b3f69656 retrieve threads by ajax 2012-08-02 12:54:09 -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
Rocky Duan
84fcb5ef52 change watch to follow in front end 2012-07-31 16:00:42 -04:00
Brittany Cheng
3d389c099e new post control button and link styles 2012-07-31 15:05:07 -04:00
Brittany Cheng
ff4d0637f5 merging styles 2012-07-31 14:09:06 -04:00
Brittany Cheng
643316a10b tag styles 2012-07-31 14:05:11 -04:00
Rocky Duan
20f958e6be bug fix: resize input for defaulttext (tagsinput) 2012-07-31 14:03:55 -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
Rocky Duan
c39b2db678 retrieve inline discussion by ajax 2012-07-31 13:22:25 -04:00
Brittany Cheng
607bc6b50b Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-07-31 12:51:17 -04:00
Rocky Duan
701f8716f7 only show edit button when user can edit 2012-07-31 12:31:59 -04:00
Brittany Cheng
cf92f356c0 edit styles for tags, discussion votes, etc 2012-07-31 12:03:45 -04:00
Brittany Cheng
278483371b fix merge conflicts 2012-07-31 10:30:26 -04:00
Brittany Cheng
6285f2a2be discussion styles 2012-07-31 10:27:14 -04:00
Rocky Duan
6f44001813 basic editing functionality 2012-07-31 10:11:51 -04:00
Rocky Duan
d6b7707725 refactored reply rendering by using mustache 2012-07-30 18:19:04 -04:00
Rocky Duan
e6776682df ..and fix again bug caused by changing id 2012-07-30 17:25:14 -04:00
Rocky Duan
941ae0f068 basic error handling 2012-07-30 17:16:44 -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
Rocky Duan
0790a3add4 image uploading & render markdown 2012-07-27 17:50:38 -04:00
Rocky Duan
fc4e21d4c4 use wmd editor for comments 2012-07-26 17:35:09 -04:00
Rocky Duan
2e26f84e9b improve for multiple editor on page 2012-07-26 16:20:26 -04:00
Rocky Duan
dbad9338e1 removed unnecessary/commented out lines 2012-07-26 16:01:57 -04:00
Rocky Duan
f0ce33c951 make mathjax working with the editor 2012-07-26 15:34:22 -04:00
Rocky Duan
eb0a9bc9e8 only run customwmd when where's markdown 2012-07-26 11:11:30 -04:00
Rocky Duan
7103bd0071 moved vendor js files to common 2012-07-25 20:57:38 -04:00
Rocky Duan
63633ae1d3 files for wmd editor 2012-07-25 20:47:11 -04:00
Rocky Duan
048deaa87f show news & options when submit comment 2012-07-25 18:16:57 -04:00
Rocky Duan
aab9f8dc1c make course id available in xmodule 2012-07-25 18:15:52 -04:00
Rocky Duan
4b8c3b9b12 watch/unwatch threads; display current vote 2012-07-25 18:15:52 -04:00
Rocky Duan
5e5dda2dfb refactored out thread rendering; vote 2012-07-25 18:15:51 -04:00
Rocky Duan
d49338c948 integrated search; refactored some frontend code 2012-07-25 18:15:51 -04:00
Rocky Duan
3267aa1737 forum view for discussions 2012-07-25 18:14:58 -04:00
Rocky Duan
846a488ef2 create new post 2012-07-25 18:11:00 -04:00
Rocky Duan
d393481b21 some basic functionalities of discussion 2012-07-25 18:11:00 -04:00
Calen Pennington
408726e678 Standardize how JS XModules are instantiated 2012-07-24 16:14:04 -04:00
Calen Pennington
8481937f59 Move Logger and *withPrefix javascript into a common location 2012-07-24 16:14:03 -04:00
Calen Pennington
61446b0544 Make javascript for video previews work correctly 2012-07-24 16:14:01 -04:00
Calen Pennington
5f86fcfbff Standardize how Problem and Video modules are loaded in the LMS and CMS preview pane 2012-07-24 16:14:00 -04:00
Calen Pennington
987fe17358 Load js fragments in order, so that Subview is loaded before the classes that use it 2012-07-24 16:14:00 -04:00
Calen Pennington
3fa636e060 Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory 2012-07-24 16:13:59 -04:00