Commits · 10c953e8a4f8d6e0396dc3ed43962bacec8d68f1 · edx / edx-platform · GitLab

24 Aug, 2012 2 commits
- 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
23 Aug, 2012 38 commits
- 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 pull request #544 from MITx/feature/arjun/fix_password_reset_domain · f9616c6e
```
making password reset email link have the current site's domain rather than edx.org hardcoded.
```
  David Ormsbee committed Aug 23, 2012
  f9616c6e Browse Files
- Merge pull request #543 from MITx/feature/arjun/fix_activation_domain · 65c5a21a
```
use the request's hostname rather than settings.SITE_NAME for activation emails
```
  David Ormsbee committed Aug 23, 2012
  65c5a21a Browse Files
- making password reset email link have the current site's domain rather than edx.org hardcoded. · 202edb0e
  Arjun Singh committed Aug 23, 2012
  
  202edb0e Browse Files
- use the request's hostname rather than settings.SITE_NAME for activation emails · a7f1e7c1
  Arjun Singh committed Aug 23, 2012
  
  a7f1e7c1 Browse Files
- disable subdomain filtering in dev_ike (should allow non-fall2012 courses) · bc63b99a
  ichuang committed Aug 23, 2012
  
  bc63b99a Browse Files
- the admin page should be loaded based on settings.DEBUG, not askbot · 8274aa11
  ichuang committed Aug 23, 2012
  
  8274aa11 Browse Files
- Merge pull request #540 from MITx/feature/arjun/fix_discussion_syncing · afa67599
```
getting rid of terrible hack in favor of re enabling the dispatcher to sync w/ the comment service
```
  David Ormsbee committed Aug 23, 2012
  afa67599 Browse Files
- remove blank slate after new post · 3e6f3430
  Rocky Duan committed Aug 23, 2012
  
  3e6f3430 Browse Files
- Merge pull request #538 from MITx/feature/arjun/fix_partial_credit · ef3ec494
```
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
  ef3ec494 Browse Files
- getting rid of terrible hack in favor of re enabling the dispatcher to sync w/ the comment service · ed6317f3
  Arjun Singh committed Aug 23, 2012
  
  ed6317f3 Browse Files
- partial credit for an inputfield · 48e7966e
  Arjun Singh committed Aug 23, 2012
  
  48e7966e Browse Files
- Merge pull request #537 from MITx/feature/cale/xqueue_callback_url_proto · 4e3d8211
```
Pull the http or https from the forwarded proto for the xqueue callback ...
```
  Calen Pennington committed Aug 23, 2012
  4e3d8211 Browse Files
- Pull the http or https from the forwarded proto for the xqueue callback url · f2c5a064
  Calen Pennington committed Aug 23, 2012
  
  f2c5a064 Browse Files
- Merge pull request #536 from MITx/feature/fix_404 · 9a68d902
```
Can't return Http404, have to raise it.
```
  Calen Pennington committed Aug 23, 2012
  9a68d902 Browse Files
- Can't return Http404, have to raise it. · 0b309ea4
  David Ormsbee committed Aug 23, 2012
  
  0b309ea4 Browse Files
- Merge pull request #532 from MITx/feature/bridger/new_wiki · 50f4fae9
```
Updated django-wiki to better handle relative wiki links.
```
  David Ormsbee committed Aug 23, 2012
  50f4fae9 Browse Files
- Merge pull request #535 from MITx/feature/forum_unicode · d05b3de0
```
fix unicode error on forum profile view page
```
  David Ormsbee committed Aug 23, 2012
  d05b3de0 Browse Files
- fix unicode error on forum profile view page · 2feda846
  David Ormsbee committed Aug 23, 2012
  
  2feda846 Browse Files
- fix wiki falsh message · 773055cf
  Kyle Fiedler committed Aug 23, 2012
  
  773055cf Browse Files
- Updated django-wiki to better handle relative wiki links. · 07eead23
  Bridger Maxwell committed Aug 23, 2012
  
  07eead23 Browse Files
- Merge pull request #531 from MITx/feature/arjun/fix_discussion_sync · 7d7b5be9
```
Feature/arjun/fix discussion sync
```
  David Ormsbee committed Aug 23, 2012
  7d7b5be9 Browse Files
- remove stray import · a075cc79
  Arjun Singh committed Aug 23, 2012
  
  a075cc79 Browse Files
- make discussions work for new users · 7f3a4889
  Arjun Singh committed Aug 23, 2012
  
  7f3a4889 Browse Files
- Merge pull request #530 from MITx/rocha/fix-for-https-video-player · 0a6f5567
```
Retrieving video information from YouTube using https instead of http.
```
  David Ormsbee committed Aug 23, 2012
  0a6f5567 Browse Files
- Merge pull request #529 from MITx/feature/cale/heartbeat-waits-for-courses · ba3df747
```
Make heartbeat url wait for courses to be loaded
```
  jarv committed Aug 23, 2012
  ba3df747 Browse Files
- Retrieving video information from YouTube using https instead of http. · ad2fff29
  Carlos Andrés Rocha committed Aug 23, 2012
  
  ad2fff29 Browse Files
- Put course location urls in heartbeat page, rather than lists · 5af67c1b
  Calen Pennington committed Aug 23, 2012
  
  5af67c1b Browse Files
- Make heartbeat url wait for courses to be loaded · 57444bdd
  Calen Pennington committed Aug 23, 2012
  
  57444bdd Browse Files
- Merge pull request #528 from MITx/jarv/maintenance · 410335ed
```
adding maintenance static data
```
  Calen Pennington committed Aug 23, 2012
  410335ed Browse Files
- adding maintenance static data · f0b60fed
  John Jarvis committed Aug 23, 2012
  
  f0b60fed Browse Files
- Merge pull request #525 from MITx/feature/arjun/comment_depth · d084506d
```
Limiting depth of comments
```
  David Ormsbee committed Aug 23, 2012
  d084506d Browse Files
- Merge pull request #526 from MITx/feature/forum_config · ec94d751
```
Feature/forum config
```
  arjun810 committed Aug 23, 2012
  ec94d751 Browse Files
- read the comment service shared key from django config · ec485880
  David Ormsbee committed Aug 23, 2012
  
  ec485880 Browse Files