Commits · dfa9fcd3a00601cb40c7d201f1e0b825e15e141c · edx / edx-platform · GitLab

30 Aug, 2012 13 commits
- 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 17 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
- Move views and models out. · 5f361bf8
  Matthew Mongeau committed Aug 29, 2012
  
  5f361bf8 Browse Files
- Hook up list to voting. · 5ec864f7
  Matthew Mongeau committed Aug 29, 2012
  
  5ec864f7 Browse Files
- Follow a thread · ee7ade41
  Matthew Mongeau committed Aug 29, 2012
  
  ee7ade41 Browse Files
- Remove log · 46f7302a
  Matthew Mongeau committed Aug 29, 2012
  
  46f7302a Browse Files
- Get voting hooked up · 7dd4d6c7
  Matthew Mongeau committed Aug 29, 2012
  
  7dd4d6c7 Browse Files
27 Aug, 2012 4 commits
- Initial work on single thread view. · 505fb681
  Matthew Mongeau committed Aug 27, 2012
  
  505fb681 Browse Files
- Style fixes · 4215f0e4
  Matthew Mongeau committed Aug 27, 2012
  
  4215f0e4 Browse Files
- Initial sidebar · 348ec3d2
  Matthew Mongeau committed Aug 27, 2012
  
  348ec3d2 Browse Files
- xml format docs! · a7ae8791
  Victor Shnayder committed Aug 26, 2012
  
  a7ae8791 Browse Files
26 Aug, 2012 1 commit
- Merge pull request #562 from MITx/feature/rocky/discussion · b566a456
```
fixed a tiny bug that loading icon sometimes doesn't appear at the right place / doesn't go away
```
  David Ormsbee committed Aug 26, 2012
  b566a456 Browse Files
25 Aug, 2012 5 commits
- fixed a tiny bug that loading icon sometimes doesn't appear at the right place / doesn't go away · a54940d1
  Rocky Duan committed Aug 25, 2012
  
  a54940d1 Browse Files
- Merge pull request #561 from MITx/feature/change_wiki_repo · 5f282dd5
```
Switch django-wiki dependency to a clone in our org
```
  jarv committed Aug 25, 2012
  5f282dd5 Browse Files
- Switch django-wiki dependency to a clone in our org so that local changes are easier to make · 2f7c106a
  David Ormsbee committed Aug 25, 2012
  
  2f7c106a Browse Files
- Merge pull request #554 from MITx/feature/victor/fix-staff-profile-view · ad7a2fb4
```
Set request.user = student when impersonating a student
```
  David Ormsbee committed Aug 25, 2012
  ad7a2fb4 Browse Files
- Merge pull request #560 from MITx/rocha/master · 2d281cb9
```
Important fix! Remove HTML tags from Markdown code.
```
  David Ormsbee committed Aug 25, 2012
  2d281cb9 Browse Files