Commits · 95339311b0981fe844c8c0c78fdb36b3c462f44e · edx / edx-platform · GitLab

09 Sep, 2015 1 commit
- Respond to AJAX errors in Teams UI. · 95339311
```
TNL-3042
```
  Peter Fogg committed Sep 09, 2015
  95339311 Browse Files
04 Sep, 2015 23 commits
- Merge pull request #9626 from edx/peter-fogg/disable-flaky-video-test · c2197608
```
Skip extra-flaky video test.
```
  Peter Fogg committed Sep 04, 2015
  c2197608 Browse Files
- Merge pull request #9607 from edx/diana/teams-event-tracking · deacfebd
```
Add teams eventing and tests.
```
  Diana Huang committed Sep 04, 2015
  deacfebd Browse Files
- Merge pull request #9591 from edx/ned/pylint-for-inherited-tests · d567e5e3
```
Update edx-lint to 0.2.6
```
  Ned Batchelder committed Sep 04, 2015
  d567e5e3 Browse Files
- Merge pull request #9628 from edx/sarina/20150904-update-translations · 88e380a3
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Sep 04, 2015
  88e380a3 Browse Files
- Update translations (autogenerated message) · 03f55521
  Sarina Canelake committed Sep 04, 2015
  
  03f55521 Browse Files
- Add teams eventing and tests. · a743f4a6
  Diana Huang committed Sep 04, 2015
  
  a743f4a6 Browse Files
- Merge pull request #8930 from ubc/wmono/lti-sso · 7c62d09e
```
Feature: LTI third-party-auth providers
```
  Calen Pennington committed Sep 04, 2015
  7c62d09e Browse Files
- Merge pull request #9596 from edx/ziafazal/MAYN-118 · 9cc1859e
```
MAYN-118: load header extra file
```
  Matt Drayer committed Sep 04, 2015
  9cc1859e Browse Files
- Merge pull request #9594 from edx/cdodge/edx-proctoring-0.8.0 · ff0bacde
```
Update requirements of edx-proctoring to 0.8.x
```
  chrisndodge committed Sep 04, 2015
  ff0bacde Browse Files
- Merge pull request #9608 from edx/jibsheet/lti-provider-admin-ui · 57a0356b
```
Add details to the admin listing of LTI Consumers
```
  Kevin Falcone committed Sep 04, 2015
  57a0356b Browse Files
- Merge pull request #9550 from edx/asadiqbal08/SOL-1157 · 43da9f06
```
SOL-1157 Certs: Additional Studio UI cleanup
```
  Matt Drayer committed Sep 04, 2015
  43da9f06 Browse Files
- Merge pull request #9475 from mitocw/fix/aq/email_ccx_non_members · 70d3868b
```
Fixed CCX display name issue in enrollment/unenrollment email templates for non EDX members
```
  Peter Pinch committed Sep 04, 2015
  70d3868b Browse Files
- Skip extra-flaky video test. · ae006cff
  Peter Fogg committed Sep 04, 2015
  
  ae006cff Browse Files
- Merge pull request #8692 from edx/derf/pymongo_2.8 · b69c1629
```
upgrade to pymongo 2.8 to support updated authenticated method SCRAM-SHA-1 for mongodb-server 3.0
```
  Fred Smith committed Sep 04, 2015
  b69c1629 Browse Files
- Merge pull request #9615 from edx/release-2015-09-02-merge-to-master · 05e33677
```
Release 2015 09 02 merge to master
```
  Calen Pennington committed Sep 04, 2015
  05e33677 Browse Files
- Merge pull request #9478 from edx/mjevtic/SOL-1105 · ede89744
```
(SOL-1154) Enabling search in devstack
```
  Marko Jevtić committed Sep 04, 2015
  ede89744 Browse Files
- Merge pull request #9580 from edx/ammar/update-django-nose · 2df75851
```
Update Django-nose
```
  Muhammad Ammar committed Sep 04, 2015
  2df75851 Browse Files
- Resolve conflicts in merge to master · dbfa6daf
  Calen Pennington committed Sep 04, 2015
  
  dbfa6daf Browse Files
- Update requirements of edx-proctoring to 0.8.x · d3474f28
  Chris Dodge committed Sep 04, 2015
  
  d3474f28 Browse Files
- (SOL-1105) Requirement for enabling search in devstack · 080a44b6
  Marko Jevtic committed Sep 04, 2015
  
  080a44b6 Browse Files
- load header extra file if request comes from micro site · 6e0ef385
```
use blank header_extra template instead of if statement
```
  Zia Fazal committed Sep 04, 2015
  6e0ef385 Browse Files
- Avoid losing error messages when inside a frame · 9a83e999
  William Ono committed Sep 03, 2015
  
  9a83e999 Browse Files
- Support LTI third-party-auth providers · 4d119480
```
PR #8930
```
  William Ono committed Sep 03, 2015
  4d119480 Browse Files
03 Sep, 2015 16 commits
- Merge pull request #9612 from edx/peter-fogg/mark-video-control-test-flaky · 97a11c11
```
Mark test_video_control_events as flaky.
```
  Ben Patterson committed Sep 03, 2015
  97a11c11 Browse Files
- Update edx-lint to 0.2.6 · f47a53eb
```
This gets us checking for tests inheriting from other tests.  When that
happens, tests get run more than once, which is pointless.  We have a
few dozen new warnings due to this new check.

This also disables unused-wildcard-import.  That removes a few hundred
warnings.

Together, this means we can reduce the pylint limit to 5999. :)
```
  Ned Batchelder committed Sep 03, 2015
  f47a53eb Browse Files
- Reference appropriate JIRA ticket as a TODO. · dff9f745
  Ben Patterson committed Sep 03, 2015
  
  dff9f745 Browse Files
- Merge master into release-2015-09-02, leaving conflicts · 821cc594
  Calen Pennington committed Sep 03, 2015
  
  821cc594 Browse Files
- Merge pull request #9521 from edx/rc/2015-09-02 · 7b492f1d
```
Rc/2015 09 02
```
  Calen Pennington committed Sep 03, 2015
  7b492f1d Browse Files
- Merge pull request #9604 from edx/asadiqbal08/SOL-1128-enhancement · bf999634
```
SOL-1128 further enhancement
```
  Matt Drayer committed Sep 03, 2015
  bf999634 Browse Files
- Merge pull request #9582 from edx/ormsbee/lti_passback_delay_config · 57085c01
```
Add lms/envs/aws.py entry for LTI_AGGREGATE_SCORE_PASSBACK_DELAY
```
  David Ormsbee committed Sep 03, 2015
  57085c01 Browse Files
- Mark test_video_control_events as flaky. · 447e0cf8
  Peter Fogg committed Sep 03, 2015
  
  447e0cf8 Browse Files
- Add details to the admin listing of LTI Consumers · 406d5a91
```
This mimics the data displayed in our oauth2 client listing and allows
you to search on identifying fields.
```
  Kevin Falcone committed Sep 03, 2015
  406d5a91 Browse Files
- SOL-1128 further enhancement · 725e1866
  asadiqbal committed Sep 03, 2015
  
  725e1866 Browse Files
- Merge pull request #9603 from edx/clrux/rc-2015-09-02-patch · 9ff0a162
```
Overriding white color for messages on dashboard
```
  Calen Pennington committed Sep 03, 2015
  9ff0a162 Browse Files
- Merge pull request #9387 from cpennington/csm-count-requested-blocks · ec49576e
```
Record the number of blocks requested in get_many
```
  Calen Pennington committed Sep 03, 2015
  ec49576e Browse Files
- Merge pull request #9601 from open-craft/smarnach/update-xblock-hash · 2c7c4ba8
```
Update the XBlock commit hash in the requirements to the latest version.
```
  Sven Marnach committed Sep 03, 2015
  2c7c4ba8 Browse Files
- Merge pull request #9546 from edx/dan-f/add-profile-images-to-team-card · 210edb01
```
Add membership thumbnails to team cards
```
  Daniel Friedman committed Sep 03, 2015
  210edb01 Browse Files
- Merge pull request #9585 from edx/raees-fix-chrome-test-user-management · 24c6a885
```
Fixed Chrome test_user_management under LibraryUsersPageTest
```
  raeeschachar committed Sep 03, 2015
  24c6a885 Browse Files
- Overriding white color for messages on dashboard · 1c297634
  Chris Rodriguez committed Sep 03, 2015
  
  1c297634 Browse Files