Commits · b5d6b210fd37fdd560e35833eeec5eb454c80484 · edx / edx-platform · GitLab

09 Sep, 2015 21 commits
- Merge pull request #9681 from edx/release · b5d6b210
```
Release 2015-09-09
```
  Clinton Blackburn committed Sep 09, 2015
  b5d6b210 Browse Files
- Merge pull request #9597 from edx/cdodge/adjust-log-level · f5057b84
```
reduce logging severity from exception to error
```
  chrisndodge committed Sep 09, 2015
  f5057b84 Browse Files
- Merge pull request #9630 from edx/rc/2015-09-09 · 020e1649
```
Release 2015-09-09
```
  Clinton Blackburn committed Sep 09, 2015
  020e1649 Browse Files
- Merge pull request #9590 from openfun/openfun/fix-dropdown-problem-template · 7eb41ed8
```
Fix correct answer position in dropdown problem template.
```
  Sarina Canelake committed Sep 09, 2015
  7eb41ed8 Browse Files
- Merge pull request #9670 from edx/sarina/fix-inherited-tests · c5bca132
```
Fix Pylint warning for monkey_patch tests
```
  Sarina Canelake committed Sep 09, 2015
  c5bca132 Browse Files
- Merge pull request #9664 from edx/clytwynec/AC-166 · 8d0bc488
```
Remove unicode quotes in courseware html attrs
```
  Christine Lytwynec committed Sep 09, 2015
  8d0bc488 Browse Files
- Fix pylint issues in spoc_gradebook test · b19a0e71
  Sarina Canelake committed Sep 09, 2015
  
  b19a0e71 Browse Files
- Fix Pylint warning for monkey_patch tests · 3a05726e
  Sarina Canelake committed Sep 09, 2015
  
  3a05726e Browse Files
- Merge pull request #9622 from edx/muzaffar/upgrade-django-sekizai · 4aa38330
```
Upgrading django-sekizai
```
  Muzaffar yousaf committed Sep 09, 2015
  4aa38330 Browse Files
- Upgrading django-sekizai · e33d1dc5
```
TNL-2811
```
  muzaffaryousaf committed Sep 09, 2015
  e33d1dc5 Browse Files
- Merge pull request #9645 from edx/muzaffar/upgrade-django-ses · d17bff1c
```
Upgrading django-ses
```
  Muzaffar yousaf committed Sep 09, 2015
  d17bff1c Browse Files
- Add Julien Paillé to AUTHORS. · b8c33e7b
  jpaille committed Sep 09, 2015
  
  b8c33e7b Browse Files
- Fix dropdown problem (optioninput) template. · ef2a855e
```
The correct answer is now correctly displayed after `show answer` is pressed.
```
  jpaille committed Sep 09, 2015
  ef2a855e Browse Files
- Upgrading django-ses · 86553c2f
```
TNL-2811
```
  muzaffaryousaf committed Sep 09, 2015
  86553c2f Browse Files
- Merge pull request #9573 from edx/muzaffar/upgrade-mock-django · 0ee2112b
```
Upgrade mock-django in platform & released version for edx-search.
```
  Muzaffar yousaf committed Sep 09, 2015
  0ee2112b Browse Files
- Merge pull request #9447 from… · de6d4970
```
Merge pull request #9447 from edx/ahsan/ECOM-2118-Credit-Eligible-Assessments-Appear-in-Incorrect-Order

Credit-Eligible Assessments Appearing in Incorrect Order
```
  Ahsan Ulhaq committed Sep 09, 2015
  de6d4970 Browse Files
- Upgrading edx-search version in platform · 0ed729b0
```
TNL-3136
```
  muzaffaryousaf committed Sep 09, 2015
  0ed729b0 Browse Files
- Upgrade mock-django to 0.6.9. · 6be65f65
  muzaffaryousaf committed Sep 09, 2015
  
  6be65f65 Browse Files
- Merge pull request #9617 from edx/muzaffar/django-upgrade-simple-history · 4c2dc816
```
Upgrading django-simple-history to 1.6.3
```
  Muzaffar yousaf committed Sep 09, 2015
  4c2dc816 Browse Files
- Merge pull request #9669 from edx/bderusha/teams-search-flag · 6c09ceae
```
Add ENABLE_SEARCH_TEAMS flag to tests
```
  Bill DeRusha committed Sep 08, 2015
  6c09ceae Browse Files
- Merge pull request #9568 from edx/bbeggs/lettuce-1.8-upgrade · bc685451
```
Update lettuce to work with Django 1.4 - 1.8
```
  Brian Beggs committed Sep 08, 2015
  bc685451 Browse Files
08 Sep, 2015 19 commits
- Add ENABLE_SEARCH_TEAMS flag to tests · 8bfa4e9c
  Bill DeRusha committed Sep 08, 2015
  
  8bfa4e9c Browse Files
- Merge pull request #9665 from edx/bderusha/teams-search-config · fb874f48
```
Add search specific feature flag in front of search features
```
  Bill DeRusha committed Sep 08, 2015
  fb874f48 Browse Files
- Add search specific feature flag in front of search features · 49807ab6
  Bill DeRusha committed Sep 08, 2015
  
  49807ab6 Browse Files
- Merge pull request #9059 from edx/andya/faster-update-assets · a08fe9fb
```
Don't package or optimize assets on devstack
```
  Andy Armstrong committed Sep 08, 2015
  a08fe9fb Browse Files
- Merge pull request #9640 from edx/jibsheet/lti-consumer-default-token · ee7d47c7
```
Use the oauth provider utils to ship a generated key/secret
```
  Kevin Falcone committed Sep 08, 2015
  ee7d47c7 Browse Files
- Merge pull request #9497 from edx/clytwynec/AC-155 · 9a45e831
```
Add role="presentation" to .course-wrapper to prevent table
```
  Christine Lytwynec committed Sep 08, 2015
  9a45e831 Browse Files
- updating lettuce to work with Django 1.4 - 1.8 · b7006533
  Brian Beggs committed Sep 08, 2015
  
  b7006533 Browse Files
- Remove unicode quotes in courseware html attrs · 3aff7702
  Christine Lytwynec committed Sep 08, 2015
  
  3aff7702 Browse Files
- Merge pull request #9632 from edx/diana/teams-changed-event · 0b78ffdf
```
Add events for tracking when teams are edited.
```
  Diana Huang committed Sep 08, 2015
  0b78ffdf Browse Files
- Merge pull request #9657 from edx/ammar/remove-django-robots-from-requiremtns.txt · c45b8a17
```
Remove django-robots from docs/shared/requirements.txt
```
  Brian Beggs committed Sep 08, 2015
  c45b8a17 Browse Files
- Merge pull request #9652 from edx/ammar/remove-django-kombu · ef032e9a
```
Remove django-kombu
```
  Brian Beggs committed Sep 08, 2015
  ef032e9a Browse Files
- Merge pull request #9644 from edx/ammar/remove-django-masquerade · 2557e471
```
Remove django-masquerade
```
  Brian Beggs committed Sep 08, 2015
  2557e471 Browse Files
- reduce logging severity from exception to error · 56f00438
  Chris Dodge committed Sep 08, 2015
  
  56f00438 Browse Files
- Merge pull request #9661 from edx/bderusha/teams-search-index · ade47343
```
Add more defensive code around elasticsearch connection
```
  Bill DeRusha committed Sep 08, 2015
  ade47343 Browse Files
- Merge pull request #9643 from edx/ammar/remove-django-settings-context-processor · c430422f
```
Remove django-settings-context-processor
```
  Brian Beggs committed Sep 08, 2015
  c430422f Browse Files
- Merge pull request #9620 from edx/ammar/update-django-ratelimit-backend · be55e36d
```
update django-ratelimit-backend
```
  Brian Beggs committed Sep 08, 2015
  be55e36d Browse Files
- Merge pull request #9646 from edx/muhhshoaib/SOL-1171-return-display-string-from-backbone-view · 815a3d6c
```
SOL-1171
```
  chrisndodge committed Sep 08, 2015
  815a3d6c Browse Files
- Merge pull request #9638 from jolyonb/fixspace · 3015c4a5
```
Fixing spacing in tooltip
```
  Sarina Canelake committed Sep 08, 2015
  3015c4a5 Browse Files
- Add more defensive code around elasticsearch connection · 62ef4b5b
  Bill DeRusha committed Sep 08, 2015
  
  62ef4b5b Browse Files