Commits · 000a745c6ee87efbe6c4e6e0dc6c27556f7e4095 · edx / edx-platform · GitLab

30 Aug, 2012 19 commits
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 000a745c
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Aug 30, 2012
  000a745c Browse Files
- merge conflict fixes · a7281341
  Tom Giannattasio committed Aug 30, 2012
  
  a7281341 Browse Files
- Keep active thread active · 31f7d6f4
  Matthew Mongeau committed Aug 30, 2012
  
  31f7d6f4 Browse Files
- Sorting · 074ba9ce
  Matthew Mongeau committed Aug 30, 2012
  
  074ba9ce Browse Files
- added sticky sidebar · da413f6d
  Tom Giannattasio committed Aug 30, 2012
  
  da413f6d Browse Files
- Searching and fixes. · 6ee27d02
  Matthew Mongeau committed Aug 30, 2012
  
  6ee27d02 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 7ece39f3
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Aug 30, 2012
  7ece39f3 Browse Files
- tweaked comment styles · 757c817b
  Tom Giannattasio committed Aug 30, 2012
  
  757c817b Browse Files
- Add new post back in. · 3cc3876b
  Matthew Mongeau committed Aug 30, 2012
  
  3cc3876b Browse Files
- Fix liking. · 476f4fa7
  Matthew Mongeau committed Aug 30, 2012
  
  476f4fa7 Browse Files
- Get math working. · 1acb6185
  Matthew Mongeau committed Aug 30, 2012
  
  1acb6185 Browse Files
- Fix some styles. · afd6126e
  Matthew Mongeau committed Aug 30, 2012
  
  afd6126e Browse Files
- Add ability to create replies. · 6287e43f
  Matthew Mongeau committed Aug 30, 2012
  
  6287e43f Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 5267f03b
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Aug 30, 2012
  5267f03b Browse Files
- Close form · 362bbb17
  Matthew Mongeau committed Aug 30, 2012
  
  362bbb17 Browse Files
- added new post markup, style and basic interactions · 1559b86e
  Tom Giannattasio committed Aug 30, 2012
  
  1559b86e Browse Files
- Formatting around wmd · abc0092f
  Matthew Mongeau committed Aug 30, 2012
  
  abc0092f Browse Files
- Fix load order. · 04e8e537
  Matthew Mongeau committed Aug 30, 2012
  
  04e8e537 Browse Files
- Start responses. · 24c76326
  Matthew Mongeau committed Aug 30, 2012
  
  24c76326 Browse Files
29 Aug, 2012 17 commits
- Hook up comment counts · 3a254380
  Matthew Mongeau committed Aug 29, 2012
  
  3a254380 Browse Files
- Show current following status in list view. · f683d375
  Matthew Mongeau committed Aug 29, 2012
  
  f683d375 Browse Files
- Comment details and comment voting. · f23c8fa0
  Matthew Mongeau committed Aug 29, 2012
  
  f23c8fa0 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 30a42dd5
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Aug 29, 2012
  30a42dd5 Browse Files
- tweaked sidebar styles; added temp javascript functionality for sidebar · 5db29b87
  Tom Giannattasio committed Aug 29, 2012
  
  5db29b87 Browse Files
- Move user to window. Mark followed threads in list view. · d6bece9b
  Matthew Mongeau committed Aug 29, 2012
  
  d6bece9b Browse Files
- Display comments and active thread. · 4735ce0a
  Matthew Mongeau committed Aug 29, 2012
  
  4735ce0a Browse Files
- Navigating threads. · 13ae85ac
  Matthew Mongeau committed Aug 29, 2012
  
  13ae85ac Browse Files
- fixed sidebar styles · 1026a173
  Tom Giannattasio committed Aug 29, 2012
  
  1026a173 Browse Files
- added new post button to primary nav · d19dc6a9
  Tom Giannattasio committed Aug 29, 2012
  
  d19dc6a9 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · f12022b7
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Aug 29, 2012
  f12022b7 Browse Files
- started adding updated styles · d75bb87b
  Tom Giannattasio committed Aug 29, 2012
  
  d75bb87b Browse Files
- Move views and models out. · fb1368af
  Matthew Mongeau committed Aug 29, 2012
  
  fb1368af Browse Files
- Hook up list to voting. · 46d0d4c4
  Matthew Mongeau committed Aug 29, 2012
  
  46d0d4c4 Browse Files
- Follow a thread · 19b14f44
  Matthew Mongeau committed Aug 29, 2012
  
  19b14f44 Browse Files
- Remove log · a5b1abb2
  Matthew Mongeau committed Aug 29, 2012
  
  a5b1abb2 Browse Files
- Get voting hooked up · e1113d9c
  Matthew Mongeau committed Aug 29, 2012
  
  e1113d9c Browse Files
27 Aug, 2012 4 commits
- Initial work on single thread view. · 82c9d045
  Matthew Mongeau committed Aug 27, 2012
  
  82c9d045 Browse Files
- Style fixes · 5d67e01f
  Matthew Mongeau committed Aug 27, 2012
  
  5d67e01f Browse Files
- Initial sidebar · 91c5b882
  Matthew Mongeau committed Aug 27, 2012
  
  91c5b882 Browse Files
- xml format docs! · 25c83bbb
  Victor Shnayder committed Aug 26, 2012
  
  25c83bbb Browse Files