Commits · 955dc94711c64d89e31facfe126ee824cb5eaf39 · edx / edx-platform · GitLab

25 Aug, 2012 3 commits
- 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 28 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
- fix inline discussion · f7e299d0
  Arjun Singh committed Aug 24, 2012
  
  f7e299d0 Browse Files
- Fixed WikiPath regexp. It was incorrectly matching [Title](Link) on the same line. · 2bc9d08b
  Carlos Andrés Rocha committed Aug 24, 2012
  
  2bc9d08b Browse Files
- Re-enabling link to wiki 'see all children'. The bug for which this was disabled is already fixed. · 8e9211d2
  Bridger Maxwell committed Aug 24, 2012
  
  8e9211d2 Browse Files
- fixed merge conflict · 9cab1d9d
  Tom Giannattasio committed Aug 24, 2012
  
  9cab1d9d Browse Files
- pulled temp data from gradebook · b72ec725
  Tom Giannattasio committed Aug 24, 2012
  
  b72ec725 Browse Files
- Merge pull request #547 from MITx/feature/rocky/discussion · d0f2f310
```
fixed profiled user id (toggle moderator status)
```
  David Ormsbee committed Aug 24, 2012
  d0f2f310 Browse Files
- Merge pull request #534 from MITx/feature/kfiedler/wiki · 10c953e8
```
fix wiki falsh message
```
  Tom Giannattasio committed Aug 24, 2012
  10c953e8 Browse Files
- Merge pull request #542 from MITx/feature/ichuang/fix-admin-page-url-load · 2ac5b0a3
```
admin page should be loaded based on settings.DEBUG not askbot
```
  Calen Pennington committed Aug 24, 2012
  2ac5b0a3 Browse Files
- Make profile page look reasonable · eb4068cc
  Arjun Singh committed Aug 24, 2012
  
  eb4068cc Browse Files
- Removing stray return statement · eb65b952
  Arjun Singh committed Aug 24, 2012
  
  eb65b952 Browse Files
- reconstruct after editing · fe74f9bc
  Rocky Duan committed Aug 24, 2012
  
  fe74f9bc Browse Files
- fixed appearance of loading icon near sort bar · cc5fbdd5
  Rocky Duan committed Aug 24, 2012
  
  cc5fbdd5 Browse Files
- use escape html everywhere and only send discussion data relavent · 80195176
  Rocky Duan committed Aug 24, 2012
  
  80195176 Browse Files
- don't use raw html when rendering · 88a3e828
  Rocky Duan committed Aug 24, 2012
  
  88a3e828 Browse Files
23 Aug, 2012 9 commits
- fixed profiled user id (toggle moderator status) · 7e6656f2
  Rocky Duan committed Aug 23, 2012
  
  7e6656f2 Browse Files
- Merge pull request #546 from MITx/feature/rocky/discussion · 5a1c7927
```
hide reply button after closing thread
```
  David Ormsbee committed Aug 23, 2012
  5a1c7927 Browse Files
- hide reply button after closing thread · 3761b02c
  Rocky Duan committed Aug 23, 2012
  
  3761b02c Browse Files
- Merge pull request #539 from MITx/feature/rocky/blank_slate_fix · 575a91e2
```
remove blank slate after new post
```
  David Ormsbee committed Aug 23, 2012
  575a91e2 Browse Files
- Merge pull request #545 from MITx/feature/rocky/discussion · 9cf9165b
```
some tiny bug fixes (delete & update follow)
```
  David Ormsbee committed Aug 23, 2012
  9cf9165b Browse Files
- some tiny bug fixes · ca09c742
  Rocky Duan committed Aug 23, 2012
  
  ca09c742 Browse Files
- Merge branch 'master' into feature/tomg/fall-design · 27729db1
  Tom Giannattasio committed Aug 23, 2012
  
  27729db1 Browse Files
- added simple table filtering to gradebook · 2783ff7e
  Tom Giannattasio committed Aug 23, 2012
  
  2783ff7e Browse Files
- started new gradebook functionality · b494441e
  Tom Giannattasio committed Aug 23, 2012
  
  b494441e Browse Files