Commits · 39185ce191cad19b7055fe83aa970164cf2ff246 · edx / edx-platform · GitLab

05 Sep, 2012 9 commits
- Fix WMD editor reply boxes on embedded discussions, although I think the way… · 39185ce1
```
Fix WMD editor reply boxes on embedded discussions, although I think the way it's implemented is something of a hack.
```
  Ibrahim Awwal committed Sep 04, 2012
  39185ce1 Browse Files
- fixed commenting to new responses · ebf47996
  Rocky Duan committed Sep 04, 2012
  
  ebf47996 Browse Files
- fixed null text error · 4f622450
  Rocky Duan committed Sep 04, 2012
  
  4f622450 Browse Files
- oops previous commit breaks comments (now fixed) · 0c6f05f4
  Rocky Duan committed Sep 04, 2012
  
  0c6f05f4 Browse Files
- clear response pane after posting · 5e58480b
  Rocky Duan committed Sep 04, 2012
  
  5e58480b Browse Files
- make delete work for responses · 9f3a95a3
  Rocky Duan committed Sep 04, 2012
  
  9f3a95a3 Browse Files
- only bind delete events to threads but not responses · e6721941
  Rocky Duan committed Sep 04, 2012
  
  e6721941 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 21438356
```
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
```
  Rocky Duan committed Sep 04, 2012
  21438356 Browse Files
- delete threads · 1bbb4111
  Rocky Duan committed Sep 04, 2012
  
  1bbb4111 Browse Files
04 Sep, 2012 31 commits
- Fix sidebar alignment · 1caef344
  Matthew Mongeau committed Sep 04, 2012
  
  1caef344 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · a51ae8cf
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Sep 04, 2012
  a51ae8cf Browse Files
- added keyboard nav to dropdown; doesn't work yet when filtered · 3b07fd36
  Tom Giannattasio committed Sep 04, 2012
  
  3b07fd36 Browse Files
- Sidebar positioning and height. · d8e3108a
  Matthew Mongeau committed Sep 04, 2012
  
  d8e3108a Browse Files
- Sorting should keep trace of comment and like updates. · 9da7a337
  Matthew Mongeau committed Sep 04, 2012
  
  9da7a337 Browse Files
- Change default text to All. · 2380e7ff
  Matthew Mongeau committed Sep 04, 2012
  
  2380e7ff Browse Files
- Get highlighting working. · 0129be36
  Matthew Mongeau committed Sep 04, 2012
  
  0129be36 Browse Files
- fixed typo on profile page and reworded button text · ffab52be
  Tom Giannattasio committed Sep 04, 2012
  
  ffab52be Browse Files
- fixed merge conflict · 4778002b
  Tom Giannattasio committed Sep 04, 2012
  
  4778002b Browse Files
- styled closed post notice · 4a3f85b4
  Tom Giannattasio committed Sep 04, 2012
  
  4a3f85b4 Browse Files
- Merge underscore template · fb88df45
  Arjun Singh committed Sep 04, 2012
  
  fb88df45 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 0a136184
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Sep 04, 2012
  0a136184 Browse Files
- simple blank slate view · 398e79dc
  Tom Giannattasio committed Sep 04, 2012
  
  398e79dc Browse Files
- courseware context links in discussion · 0e1b247a
  Arjun Singh committed Sep 04, 2012
  
  0e1b247a Browse Files
- added moderator buttons for thread responses · bb13a613
  Rocky Duan committed Sep 04, 2012
  
  bb13a613 Browse Files
- fixed close threads · e1499513
  Rocky Duan committed Sep 04, 2012
  
  e1499513 Browse Files
- oops fixed following · 245bb7ce
  Rocky Duan committed Sep 04, 2012
  
  245bb7ce Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 2e45f2d9
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Sep 04, 2012
  2e45f2d9 Browse Files
- fixed endorse · 8b0e4592
  Rocky Duan committed Sep 04, 2012
  
  8b0e4592 Browse Files
- tweaked dogear and discussion column styles · 78ae73cf
  Tom Giannattasio committed Sep 04, 2012
  
  78ae73cf Browse Files
- fixed merge conflict · b5df53f9
  Tom Giannattasio committed Sep 04, 2012
  
  b5df53f9 Browse Files
- fixed drop filter · 5c66924f
  Tom Giannattasio committed Sep 04, 2012
  
  5c66924f Browse Files
- Including courseware context in threads for non inline discussion · 91aec6d3
  Arjun Singh committed Sep 04, 2012
  
  91aec6d3 Browse Files
- Including courseware context in _ template · 8680be38
  Arjun Singh committed Sep 04, 2012
  
  8680be38 Browse Files
- merge · 8475ffef
  Arjun Singh committed Sep 04, 2012
  
  8475ffef Browse Files
- fix search · ebae40a3
  Arjun Singh committed Sep 04, 2012
  
  ebae40a3 Browse Files
- Fix voting. · 10887ab1
  Matthew Mongeau committed Sep 04, 2012
  
  10887ab1 Browse Files
- new icons for new post; fixed icons on reply · 00abf08d
  Tom Giannattasio committed Sep 04, 2012
  
  00abf08d Browse Files
- fixed long lines in the category drop · a574c48c
  Tom Giannattasio committed Sep 04, 2012
  
  a574c48c Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · cc0b0e43
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Sep 04, 2012
  cc0b0e43 Browse Files
- fixed preview text overlapping content · 658d99fa
  Tom Giannattasio committed Sep 04, 2012
  
  658d99fa Browse Files