Commits · f23c8fa0d3ab99f197b2a764863b407a2d2e368a · edx / edx-platform · GitLab

29 Aug, 2012 15 commits
- 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
26 Aug, 2012 1 commit
- Merge pull request #562 from MITx/feature/rocky/discussion · c6d06a3a
```
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
  c6d06a3a Browse Files
25 Aug, 2012 6 commits
- fixed a tiny bug that loading icon sometimes doesn't appear at the right place / doesn't go away · eb8ee01d
  Rocky Duan committed Aug 25, 2012
  
  eb8ee01d Browse Files
- Merge pull request #561 from MITx/feature/change_wiki_repo · c1cd0758
```
Switch django-wiki dependency to a clone in our org
```
  jarv committed Aug 25, 2012
  c1cd0758 Browse Files
- Switch django-wiki dependency to a clone in our org so that local changes are easier to make · e7b67d72
  David Ormsbee committed Aug 25, 2012
  
  e7b67d72 Browse Files
- Merge pull request #554 from MITx/feature/victor/fix-staff-profile-view · 955dc947
```
Set request.user = student when impersonating a student
```
  David Ormsbee committed Aug 25, 2012
  955dc947 Browse Files
- Merge pull request #560 from MITx/rocha/master · d042578a
```
Important fix! Remove HTML tags from Markdown code.
```
  David Ormsbee committed Aug 25, 2012
  d042578a Browse Files
- Important fix! Remove HTML tags from Markdown code. · 1f7a1065
  Carlos Andrés Rocha committed Aug 25, 2012
  
  1f7a1065 Browse Files
24 Aug, 2012 14 commits
- Merge pull request #556 from MITx/kimth/course-replace-in-infopage · 9734347c
```
Do URL replacement in course info page
```
  David Ormsbee committed Aug 24, 2012
  9734347c Browse Files
- Merge pull request #557 from MITx/feature/tomg/courseware_signin · 828430d6
```
Added a log in button to the courseware when unauthenticated
```
  David Ormsbee committed Aug 24, 2012
  828430d6 Browse Files
- Fix access control for impersonation case · 7a6fa1dd
```
- only relevant in tests due to start dates
- still irritatingly intricate logic...
```
  Victor Shnayder committed Aug 24, 2012
  7a6fa1dd Browse Files
- Use reverse for course_info url replacement · 115eebdb
  kimth committed Aug 24, 2012
  
  115eebdb Browse Files
- Merge branch 'master' into feature/tomg/courseware_signin · 4a06deca
  Tom Giannattasio committed Aug 24, 2012
  
  4a06deca Browse Files
- added log in button to unauthenticated courseware · 7d14632c
  Tom Giannattasio committed Aug 24, 2012
  
  7d14632c Browse Files
- Set request.user = student when impersonating a student · b8659e08
```
* currently only in the staff view of student progress page

[Fix #34379687]
```
  Victor Shnayder committed Aug 24, 2012
  b8659e08 Browse Files
- Do URL replacement in course info page · 31216ccd
  kimth committed Aug 24, 2012
  
  31216ccd Browse Files
- Merge pull request #555 from MITx/jarv/empty-defaults-for-comments-params · d095b777
```
empty default for comments_service_key and comments_url because it was b...
```
  David Ormsbee committed Aug 24, 2012
  d095b777 Browse Files
- empty default for comments_service_key and comments_url because it was breaking… · 4c21abc4
```
empty default for comments_service_key and comments_url because it was breaking configs that do not have it in env.json
```
  John Jarvis committed Aug 24, 2012
  4c21abc4 Browse Files
- Merge pull request #553 from MITx/feature/bridger/new_wiki · b5c90166
```
Added SECURE_PROXY_SSL_HEADER to env/aws. Re-enabled wiki directories
```
  Calen Pennington committed Aug 24, 2012
  b5c90166 Browse Files
- Merge pull request #550 from MITx/rocha/master · 24de1299
```
Fixed WikiPath regexp.
```
  bridger committed Aug 24, 2012
  24de1299 Browse Files
- Added SECURE_PROXY_SSL_HEADER to env/aws. · 268a8744
  Bridger Maxwell committed Aug 24, 2012
  
  268a8744 Browse Files
- Merge pull request #552 from MITx/feature/arjun/fix_inline_disc · 718e4c24
```
fix inline discussion
```
  David Ormsbee committed Aug 24, 2012
  718e4c24 Browse Files