Commits · fb88df4508973a2bc6f68ac04fb53aea53bbc105 · edx / edx-platform · GitLab

04 Sep, 2012 37 commits
- 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
- 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
- Comment should pass endorsed to template. · e63f591d
  Matthew Mongeau committed Sep 04, 2012
  
  e63f591d Browse Files
- improve date search, fix respnding, make sidebar expand when discussion column does · 91379aa9
  Arjun Singh committed Sep 04, 2012
  
  91379aa9 Browse Files
- Somewhat compacted the embedded thread view, but it probably needs a more thorough redesign. · c4eec80e
  Ibrahim Awwal committed Sep 04, 2012
  
  c4eec80e Browse Files
- minor sidebar fix · 9064f81b
  Arjun Singh committed Sep 04, 2012
  
  9064f81b Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 2ca51f06
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Arjun Singh committed Sep 04, 2012
  2ca51f06 Browse Files
- fix up sidebar jitter · 890c5e50
  Arjun Singh committed Sep 04, 2012
  
  890c5e50 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · b2821c53
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Sep 04, 2012
  b2821c53 Browse Files
- fit permission into new discussion view structure; admin actions not working yet · d39e3de5
  Rocky Duan committed Sep 04, 2012
  
  d39e3de5 Browse Files
- Oops, this was needed for replies to be rendered in the main forum view. · e8ac5860
  Ibrahim Awwal committed Sep 04, 2012
  
  e8ac5860 Browse Files
- Embedded discussions displayed with the new style but without replying yet. · 32ccf51e
```
Needs different CSS to make it more appropriate in the embedded view.
```
  Ibrahim Awwal committed Sep 04, 2012
  32ccf51e Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · dbfe3b35
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Arjun Singh committed Sep 03, 2012
  dbfe3b35 Browse Files
- add all filter · 52e780e0
  Arjun Singh committed Sep 03, 2012
  
  52e780e0 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 6bae1609
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Sep 03, 2012
  6bae1609 Browse Files
- allowing for 0 top level topics · 629a8e7e
  Arjun Singh committed Sep 03, 2012
  
  629a8e7e Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 9a7afb58
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Sep 03, 2012
  9a7afb58 Browse Files
- Top level discussions · 098b90eb
  Arjun Singh committed Sep 03, 2012
  
  098b90eb Browse Files
- fixed wmd editor / tag for new post · d9e7c5d9
  Rocky Duan committed Sep 03, 2012
  
  d9e7c5d9 Browse Files
03 Sep, 2012 1 commit
- Temporary fix for topictext issues. · 99ad4c0b
  Matthew Mongeau committed Sep 03, 2012
  
  99ad4c0b Browse Files
02 Sep, 2012 2 commits
- Pull out discussion-thread-list-template into its own file. · 722ce53e
  Ibrahim Awwal committed Sep 02, 2012
  
  722ce53e Browse Files
- Fix discussions in xmodules · 81bfdddc
```
Conflicts:

	lms/static/coffee/src/discussion/main.coffee
```
  Arjun Singh committed Sep 02, 2012
  81bfdddc Browse Files