Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

658 Commits

Author SHA1 Message Date
Tom Giannattasio
d0c2d31558 new show/hide button for inline discussions 2012-09-10 12:12:46 -07:00
Arjun Singh
aa7af4e6fe Make thread view with subview work 2012-09-10 11:40:52 -07:00
Arjun Singh
80a9620a84 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-07 14:20:03 -10:00
Tom Giannattasio
a0c887cd5f new inline post styles 2012-09-07 16:24:25 -04:00
Tom Giannattasio
319d7e149e restyled inline new post form 2012-09-07 14:43:44 -04:00
David Ormsbee
db0549be78 Merge pull request #594 from MITx/feature/ibrahim/discussion_distinguish_instructors 
Feature/ibrahim/discussion distinguish instructors
 2012-09-07 06:52:15 -07:00
Arjun Singh
e1c3696b3f Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-07 02:06:18 -10:00
Ibrahim Awwal
b2f3eee93b Pagination in inline discussion views. 2012-09-07 03:37:19 -07:00
Arjun Singh
4b74354973 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-06 22:43:17 -10:00
Ibrahim Awwal
c3e3fee963 Convert expand/collapse into buttons and change default sort order to date. Buttons should be styled better but I don't know how to do it. 2012-09-06 23:37:43 -07:00
Arjun Singh
36b3524552 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-06 18:22:15 -10:00
Ibrahim Awwal
c4c956dbbb Fix accidental code formatting of abbreviated posts and put administrative buttons in the expanded content. 2012-09-06 18:09:09 -07:00
Tom Giannattasio
9923323fdc styled new post error messages 2012-09-06 17:22:00 -04:00
Tom Giannattasio
2b5718a98b fixed blank slate sidebar resize glitch 2012-09-06 14:02:23 -04:00
Ibrahim Awwal
58f4f01ecd Fix follow dogear causing page to scroll up on click. 2012-09-06 04:49:38 -07:00
Ibrahim Awwal
2811822b93 Attach the discussion_id to posts made from the embedded discussion forum. 2012-09-06 02:11:47 -07:00
Ibrahim Awwal
00d21acd79 Add newly posted threads to the inline thread list. 2012-09-06 01:33:40 -07:00
Ibrahim Awwal
2eb763e4ce New post form on inline discussion, works, with some bugs in styling. 2012-09-06 00:25:54 -07:00
Ibrahim Awwal
00a6526fd0 Make voting render properly in inline discussions. Also might have fixed 
following if it wasn't working before.
 2012-09-05 17:58:18 -07:00
Arjun Singh
bf5eba4d76 Change new post copy 2012-09-05 15:09:08 -07:00
Ibrahim Awwal
79fedc0bb7 Replace unicode characters with entities for now - it breaks xmodule rendering otherwise. 2012-09-05 14:40:01 -07:00
Tom Giannattasio
dad22a1a3f fixed discussionBodyTop error 2012-09-05 15:12:57 -04:00
Tom Giannattasio
80c6366d46 moved closed thread notice 2012-09-05 11:58:09 -04: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
0c6f05f45c oops previous commit breaks comments (now fixed) 2012-09-04 20:13:55 -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
Matthew Mongeau
2380e7fff4 Change default text to All. 2012-09-04 14:35:46 -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
Arjun Singh
8680be38a7 Including courseware context in _ template 2012-09-04 09:53:54 -07:00
Matthew Mongeau
10887ab117 Fix voting. 2012-09-04 11:53:07 -04:00
Ibrahim Awwal
c4eec80e5e Somewhat compacted the embedded thread view, but it probably needs a more thorough redesign. 2012-09-04 02:34:27 -07:00
Arjun Singh
2ca51f066b Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 02:29:38 -07:00
Rocky Duan
b2821c5354 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 01:54:59 -07:00
Rocky Duan
d39e3de51b fit permission into new discussion view structure; admin actions not working yet 2012-09-04 01:54:39 -07:00
Ibrahim Awwal
32ccf51e97 Embedded discussions displayed with the new style but without replying yet. 
Needs different CSS to make it more appropriate in the embedded view.
 2012-09-04 01:14:18 -07:00
Arjun Singh
dbfe3b35f0 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-03 23:29:30 -07:00
Arjun Singh
52e780e0b2 add all filter 2012-09-03 23:28:44 -07:00
Rocky Duan
9a7afb5889 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-03 23:02:58 -07:00