Commit Graph

5423 Commits

Author SHA1 Message Date
Tom Giannattasio
003281891e Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-05 11:58:17 -04:00
Tom Giannattasio
80c6366d46 moved closed thread notice 2012-09-05 11:58:09 -04:00
Matthew Mongeau
dcf1b1db01 Timeago comments correctly. 2012-09-05 11:53:40 -04:00
Matthew Mongeau
38b9b53a50 Redo how rendering of list items is done. Better memory, faster rendering. 2012-09-05 11:25:31 -04:00
Tom Giannattasio
a2cdd012b3 arrow key navigation on topic drop for filtered items 2012-09-05 11:18:25 -04:00
Tom Giannattasio
6e0ddf14c5 prevent scrolling when topic menu is dropped 2012-09-05 10:42:37 -04:00
Tom Giannattasio
32b07d5648 fixed grey button on drop 2012-09-05 10:30:04 -04:00
Tom Giannattasio
098e7022cf simpler sidebar width setting 2012-09-05 10:23:25 -04:00
Tom Giannattasio
925caac649 mark styling added 2012-09-05 10:19:24 -04:00
Tom Giannattasio
c4495e4d8f fixed drop filter bug 2012-09-05 10:06:42 -04:00
Ibrahim Awwal
4b7e5b7c2c Fix typo. 2012-09-05 02:44:11 -07:00
Ibrahim Awwal
742f4c03ef Expanding and collapsing threads on inline forums works, but it could use a little styling. Also fixed responding to threads which I may have broken in the commit prior to this one. 2012-09-05 02:41:16 -07:00
Ibrahim Awwal
5c64945e0a Make appended_id for WMD editor a little less hacky by getting it from data-id of the 'reply-body' element instead of from _id of the wrapper. 2012-09-05 00:04:00 -07:00
Ibrahim Awwal
39185ce191 Fix WMD editor reply boxes on embedded discussions, although I think the way it's implemented is something of a hack. 2012-09-04 23:49:56 -07:00
Rocky Duan
ebf47996a1 fixed commenting to new responses 2012-09-04 20:23:29 -07:00
Rocky Duan
4f62245031 fixed null text error 2012-09-04 20:16:37 -07:00
Rocky Duan
0c6f05f45c oops previous commit breaks comments (now fixed) 2012-09-04 20:13:55 -07:00
Rocky Duan
5e58480bc7 clear response pane after posting 2012-09-04 20:06:01 -07:00
Rocky Duan
9f3a95a30e make delete work for responses 2012-09-04 19:53:16 -07:00
Rocky Duan
e6721941e0 only bind delete events to threads but not responses 2012-09-04 19:41:25 -07:00
Rocky Duan
2143835659 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
Conflicts:
	lms/static/coffee/src/discussion/views/discussion_thread_view.coffee
	lms/static/coffee/src/discussion/views/thread_list_item_view.coffee
2012-09-04 19:41:03 -07:00
Rocky Duan
1bbb411136 delete threads 2012-09-04 19:13:53 -07:00
Matthew Mongeau
1caef344c3 Fix sidebar alignment 2012-09-04 17:46:57 -04:00
Tom Giannattasio
a51ae8cfbb Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 17:27:51 -04:00
Tom Giannattasio
3b07fd366e added keyboard nav to dropdown; doesn't work yet when filtered 2012-09-04 17:27:41 -04:00
Matthew Mongeau
d8e3108a25 Sidebar positioning and height. 2012-09-04 17:25:57 -04:00
Matthew Mongeau
9da7a337a8 Sorting should keep trace of comment and like updates. 2012-09-04 15:27:55 -04:00
Matthew Mongeau
2380e7fff4 Change default text to All. 2012-09-04 14:35:46 -04:00
Matthew Mongeau
0129be36c9 Get highlighting working. 2012-09-04 14:27:01 -04:00
Tom Giannattasio
ffab52be36 fixed typo on profile page and reworded button text 2012-09-04 14:11:24 -04:00
Tom Giannattasio
4778002b68 fixed merge conflict 2012-09-04 14:05:48 -04:00
Tom Giannattasio
4a3f85b417 styled closed post notice 2012-09-04 14:05:09 -04:00
Arjun Singh
fb88df4508 Merge underscore template 2012-09-04 10:45:50 -07:00
Tom Giannattasio
0a1361842c Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 13:40:39 -04:00
Tom Giannattasio
398e79dc8c simple blank slate view 2012-09-04 13:40:21 -04:00
Arjun Singh
0e1b247a7b courseware context links in discussion 2012-09-04 10:38:28 -07:00
Rocky Duan
bb13a613f2 added moderator buttons for thread responses 2012-09-04 10:30:36 -07:00
Rocky Duan
e149951382 fixed close threads 2012-09-04 10:27:59 -07:00
Rocky Duan
245bb7ce96 oops fixed following 2012-09-04 10:15:41 -07:00
Rocky Duan
2e45f2d95f Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 10:06:19 -07:00
Rocky Duan
8b0e459256 fixed endorse 2012-09-04 10:06:03 -07:00
Tom Giannattasio
78ae73cf3d tweaked dogear and discussion column styles 2012-09-04 13:05:51 -04:00
Tom Giannattasio
b5df53f9d5 fixed merge conflict 2012-09-04 13:01:08 -04:00
Tom Giannattasio
5c66924fd5 fixed drop filter 2012-09-04 12:59:45 -04:00
Arjun Singh
91aec6d38f Including courseware context in threads for non inline discussion 2012-09-04 09:55:18 -07:00
Arjun Singh
8680be38a7 Including courseware context in _ template 2012-09-04 09:53:54 -07:00
Arjun Singh
8475ffef20 merge 2012-09-04 09:49:00 -07:00
Arjun Singh
ebae40a392 fix search 2012-09-04 09:21:21 -07:00
Matthew Mongeau
10887ab117 Fix voting. 2012-09-04 11:53:07 -04:00
Tom Giannattasio
00abf08dc3 new icons for new post; fixed icons on reply 2012-09-04 11:22:46 -04:00