Commits · d8cb85ebc78485818165a3bb5ec01e6bde95ac6f · edx / edx-platform · GitLab

31 Aug, 2012 4 commits
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · d8cb85eb
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Aug 31, 2012
  d8cb85eb Browse Files
- fixed posted details margin bug · 9ed65aaa
  Tom Giannattasio committed Aug 31, 2012
  
  9ed65aaa Browse Files
- populate dropdown · b09f7d6f
  Arjun Singh committed Aug 31, 2012
  
  b09f7d6f Browse Files
- Display current topic and adjust font size. · 2758a73c
  Matthew Mongeau committed Aug 30, 2012
  
  2758a73c Browse Files
30 Aug, 2012 24 commits
- Hide menu when clicking body. · c55aca4d
  Matthew Mongeau committed Aug 30, 2012
  
  c55aca4d Browse Files
- Show dropdown on click. · 2266775d
  Matthew Mongeau committed Aug 30, 2012
  
  2266775d Browse Files
- Add highlighting back in · ebbce32e
  Matthew Mongeau committed Aug 30, 2012
  
  ebbce32e Browse Files
- Remove loading icon. · 7183991f
  Matthew Mongeau committed Aug 30, 2012
  
  7183991f Browse Files
- Track comment · 6805b325
  Matthew Mongeau committed Aug 30, 2012
  
  6805b325 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 1b5388ab
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Aug 30, 2012
  1b5388ab Browse Files
- merge conflict fixes · 3397e652
  Tom Giannattasio committed Aug 30, 2012
  
  3397e652 Browse Files
- Keep active thread active · 5427d9a5
  Matthew Mongeau committed Aug 30, 2012
  
  5427d9a5 Browse Files
- Sorting · e98f1e87
  Matthew Mongeau committed Aug 30, 2012
  
  e98f1e87 Browse Files
- added sticky sidebar · 46367657
  Tom Giannattasio committed Aug 30, 2012
  
  46367657 Browse Files
- Searching and fixes. · ebaee9e0
  Matthew Mongeau committed Aug 30, 2012
  
  ebaee9e0 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · dfa9fcd3
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Aug 30, 2012
  dfa9fcd3 Browse Files
- tweaked comment styles · 42ff7e8e
  Tom Giannattasio committed Aug 30, 2012
  
  42ff7e8e Browse Files
- Add new post back in. · 648f034b
  Matthew Mongeau committed Aug 30, 2012
  
  648f034b Browse Files
- Fix liking. · 65ffeb5c
  Matthew Mongeau committed Aug 30, 2012
  
  65ffeb5c Browse Files
- Get math working. · 9f59a9a8
  Matthew Mongeau committed Aug 30, 2012
  
  9f59a9a8 Browse Files
- Fix some styles. · 7f0f7195
  Matthew Mongeau committed Aug 30, 2012
  
  7f0f7195 Browse Files
- Add ability to create replies. · 91819ec3
  Matthew Mongeau committed Aug 30, 2012
  
  91819ec3 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 53a49b97
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Aug 30, 2012
  53a49b97 Browse Files
- Close form · 37ece599
  Matthew Mongeau committed Aug 30, 2012
  
  37ece599 Browse Files
- added new post markup, style and basic interactions · 3bea249a
  Tom Giannattasio committed Aug 30, 2012
  
  3bea249a Browse Files
- Formatting around wmd · eb883c84
  Matthew Mongeau committed Aug 30, 2012
  
  eb883c84 Browse Files
- Fix load order. · 554c9d91
  Matthew Mongeau committed Aug 30, 2012
  
  554c9d91 Browse Files
- Start responses. · c9365891
  Matthew Mongeau committed Aug 30, 2012
  
  c9365891 Browse Files
29 Aug, 2012 12 commits
- Hook up comment counts · 7c61945f
  Matthew Mongeau committed Aug 29, 2012
  
  7c61945f Browse Files
- Show current following status in list view. · 41b669d6
  Matthew Mongeau committed Aug 29, 2012
  
  41b669d6 Browse Files
- Comment details and comment voting. · 7f67fc5a
  Matthew Mongeau committed Aug 29, 2012
  
  7f67fc5a Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 395623eb
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Aug 29, 2012
  395623eb Browse Files
- tweaked sidebar styles; added temp javascript functionality for sidebar · ab714572
  Tom Giannattasio committed Aug 29, 2012
  
  ab714572 Browse Files
- Move user to window. Mark followed threads in list view. · 23ee1d88
  Matthew Mongeau committed Aug 29, 2012
  
  23ee1d88 Browse Files
- Display comments and active thread. · 502dc33c
  Matthew Mongeau committed Aug 29, 2012
  
  502dc33c Browse Files
- Navigating threads. · bc3d753b
  Matthew Mongeau committed Aug 29, 2012
  
  bc3d753b Browse Files
- fixed sidebar styles · 15f0123f
  Tom Giannattasio committed Aug 29, 2012
  
  15f0123f Browse Files
- added new post button to primary nav · 1a76b33a
  Tom Giannattasio committed Aug 29, 2012
  
  1a76b33a Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · e209062c
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Aug 29, 2012
  e209062c Browse Files
- started adding updated styles · e38b5f01
  Tom Giannattasio committed Aug 29, 2012
  
  e38b5f01 Browse Files