Commits · b566a456eed69991c9436fef0d2006b54f2b269b · edx / edx-platform · GitLab

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 6 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
- Important fix! Remove HTML tags from Markdown code. · 9f381be3
  Carlos Andrés Rocha committed Aug 25, 2012
  
  9f381be3 Browse Files
24 Aug, 2012 28 commits
- Merge pull request #556 from MITx/kimth/course-replace-in-infopage · b25a9794
```
Do URL replacement in course info page
```
  David Ormsbee committed Aug 24, 2012
  b25a9794 Browse Files
- Merge pull request #557 from MITx/feature/tomg/courseware_signin · eeadfb29
```
Added a log in button to the courseware when unauthenticated
```
  David Ormsbee committed Aug 24, 2012
  eeadfb29 Browse Files
- Fix access control for impersonation case · bd63b24f
```
- only relevant in tests due to start dates
- still irritatingly intricate logic...
```
  Victor Shnayder committed Aug 24, 2012
  bd63b24f Browse Files
- Use reverse for course_info url replacement · 17e49568
  kimth committed Aug 24, 2012
  
  17e49568 Browse Files
- Merge branch 'master' into feature/tomg/courseware_signin · 42b66a96
  Tom Giannattasio committed Aug 24, 2012
  
  42b66a96 Browse Files
- added log in button to unauthenticated courseware · f9735421
  Tom Giannattasio committed Aug 24, 2012
  
  f9735421 Browse Files
- Set request.user = student when impersonating a student · 0bbdb9e3
```
* currently only in the staff view of student progress page

[Fix #34379687]
```
  Victor Shnayder committed Aug 24, 2012
  0bbdb9e3 Browse Files
- Do URL replacement in course info page · 96089887
  kimth committed Aug 24, 2012
  
  96089887 Browse Files
- Merge pull request #555 from MITx/jarv/empty-defaults-for-comments-params · a6f9bbf1
```
empty default for comments_service_key and comments_url because it was b...
```
  David Ormsbee committed Aug 24, 2012
  a6f9bbf1 Browse Files
- empty default for comments_service_key and comments_url because it was breaking… · 2ba03b6d
```
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
  2ba03b6d Browse Files
- Merge pull request #553 from MITx/feature/bridger/new_wiki · 6f73f60d
```
Added SECURE_PROXY_SSL_HEADER to env/aws. Re-enabled wiki directories
```
  Calen Pennington committed Aug 24, 2012
  6f73f60d Browse Files
- Merge pull request #550 from MITx/rocha/master · 512f46ae
```
Fixed WikiPath regexp.
```
  bridger committed Aug 24, 2012
  512f46ae Browse Files
- Added SECURE_PROXY_SSL_HEADER to env/aws. · 58439c1a
  Bridger Maxwell committed Aug 24, 2012
  
  58439c1a Browse Files
- Merge pull request #552 from MITx/feature/arjun/fix_inline_disc · d9d28755
```
fix inline discussion
```
  David Ormsbee committed Aug 24, 2012
  d9d28755 Browse Files
- fix inline discussion · aac8e28c
  Arjun Singh committed Aug 24, 2012
  
  aac8e28c Browse Files
- Fixed WikiPath regexp. It was incorrectly matching [Title](Link) on the same line. · c136f62c
  Carlos Andrés Rocha committed Aug 24, 2012
  
  c136f62c Browse Files
- Re-enabling link to wiki 'see all children'. The bug for which this was disabled is already fixed. · c43ca0c7
  Bridger Maxwell committed Aug 24, 2012
  
  c43ca0c7 Browse Files
- fixed merge conflict · 8b655239
  Tom Giannattasio committed Aug 24, 2012
  
  8b655239 Browse Files
- pulled temp data from gradebook · f35b5992
  Tom Giannattasio committed Aug 24, 2012
  
  f35b5992 Browse Files
- Merge pull request #547 from MITx/feature/rocky/discussion · dc5df0e1
```
fixed profiled user id (toggle moderator status)
```
  David Ormsbee committed Aug 24, 2012
  dc5df0e1 Browse Files
- Merge pull request #534 from MITx/feature/kfiedler/wiki · 068955c8
```
fix wiki falsh message
```
  Tom Giannattasio committed Aug 24, 2012
  068955c8 Browse Files
- Merge pull request #542 from MITx/feature/ichuang/fix-admin-page-url-load · d33113f4
```
admin page should be loaded based on settings.DEBUG not askbot
```
  Calen Pennington committed Aug 24, 2012
  d33113f4 Browse Files
- Make profile page look reasonable · 753b6cd4
  Arjun Singh committed Aug 24, 2012
  
  753b6cd4 Browse Files
- Removing stray return statement · 259098dd
  Arjun Singh committed Aug 24, 2012
  
  259098dd Browse Files
- reconstruct after editing · 5d4927fc
  Rocky Duan committed Aug 24, 2012
  
  5d4927fc Browse Files
- fixed appearance of loading icon near sort bar · 60c41413
  Rocky Duan committed Aug 24, 2012
  
  60c41413 Browse Files
- use escape html everywhere and only send discussion data relavent · 4555efd2
  Rocky Duan committed Aug 24, 2012
  
  4555efd2 Browse Files
- don't use raw html when rendering · f8c52dc7
  Rocky Duan committed Aug 24, 2012
  
  f8c52dc7 Browse Files
23 Aug, 2012 5 commits
- fixed profiled user id (toggle moderator status) · 2c9f1807
  Rocky Duan committed Aug 23, 2012
  
  2c9f1807 Browse Files
- Merge pull request #546 from MITx/feature/rocky/discussion · a7951f01
```
hide reply button after closing thread
```
  David Ormsbee committed Aug 23, 2012
  a7951f01 Browse Files
- hide reply button after closing thread · d7daa5a9
  Rocky Duan committed Aug 23, 2012
  
  d7daa5a9 Browse Files
- Merge pull request #539 from MITx/feature/rocky/blank_slate_fix · b97c6545
```
remove blank slate after new post
```
  David Ormsbee committed Aug 23, 2012
  b97c6545 Browse Files
- Merge pull request #545 from MITx/feature/rocky/discussion · 1465c807
```
some tiny bug fixes (delete & update follow)
```
  David Ormsbee committed Aug 23, 2012
  1465c807 Browse Files