Commits · 2ba03b6dcfa7abf9ab5cdf427b81714b31af2816 · edx / edx-platform · GitLab

24 Aug, 2012 17 commits
- 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
- 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 23 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
- some tiny bug fixes · e6aa422b
  Rocky Duan committed Aug 23, 2012
  
  e6aa422b Browse Files
- Merge pull request #544 from MITx/feature/arjun/fix_password_reset_domain · ae632f1b
```
making password reset email link have the current site's domain rather than edx.org hardcoded.
```
  David Ormsbee committed Aug 23, 2012
  ae632f1b Browse Files
- Merge pull request #543 from MITx/feature/arjun/fix_activation_domain · 14dcaf2e
```
use the request's hostname rather than settings.SITE_NAME for activation emails
```
  David Ormsbee committed Aug 23, 2012
  14dcaf2e Browse Files
- making password reset email link have the current site's domain rather than edx.org hardcoded. · a79e979d
  Arjun Singh committed Aug 23, 2012
  
  a79e979d Browse Files
- use the request's hostname rather than settings.SITE_NAME for activation emails · 2394ca35
  Arjun Singh committed Aug 23, 2012
  
  2394ca35 Browse Files
- disable subdomain filtering in dev_ike (should allow non-fall2012 courses) · 79c20f8c
  ichuang committed Aug 23, 2012
  
  79c20f8c Browse Files
- the admin page should be loaded based on settings.DEBUG, not askbot · 55270802
  ichuang committed Aug 23, 2012
  
  55270802 Browse Files
- Merge pull request #540 from MITx/feature/arjun/fix_discussion_syncing · bd0b9aca
```
getting rid of terrible hack in favor of re enabling the dispatcher to sync w/ the comment service
```
  David Ormsbee committed Aug 23, 2012
  bd0b9aca Browse Files
- remove blank slate after new post · 5f107cce
  Rocky Duan committed Aug 23, 2012
  
  5f107cce Browse Files
- Merge pull request #538 from MITx/feature/arjun/fix_partial_credit · 8e7db1c5
```
partial credit for an inputfield

May want to couple this (in the future) with some UI feedback to indicate partial credit was awarded.  
```
  ichuang committed Aug 23, 2012
  8e7db1c5 Browse Files
- getting rid of terrible hack in favor of re enabling the dispatcher to sync w/ the comment service · 703211d6
  Arjun Singh committed Aug 23, 2012
  
  703211d6 Browse Files
- partial credit for an inputfield · de70121a
  Arjun Singh committed Aug 23, 2012
  
  de70121a Browse Files
- Merge pull request #537 from MITx/feature/cale/xqueue_callback_url_proto · 1033d881
```
Pull the http or https from the forwarded proto for the xqueue callback ...
```
  Calen Pennington committed Aug 23, 2012
  1033d881 Browse Files
- Pull the http or https from the forwarded proto for the xqueue callback url · dfbac0fe
  Calen Pennington committed Aug 23, 2012
  
  dfbac0fe Browse Files
- Merge pull request #536 from MITx/feature/fix_404 · eced0d99
```
Can't return Http404, have to raise it.
```
  Calen Pennington committed Aug 23, 2012
  eced0d99 Browse Files
- Can't return Http404, have to raise it. · ee718716
  David Ormsbee committed Aug 23, 2012
  
  ee718716 Browse Files
- Merge pull request #532 from MITx/feature/bridger/new_wiki · 861b60ba
```
Updated django-wiki to better handle relative wiki links.
```
  David Ormsbee committed Aug 23, 2012
  861b60ba Browse Files
- Merge pull request #535 from MITx/feature/forum_unicode · b2c064f5
```
fix unicode error on forum profile view page
```
  David Ormsbee committed Aug 23, 2012
  b2c064f5 Browse Files