Commits · ef9935d2afce1b0c1e42df584fbf93dcb741c3dc · edx / edx-platform

26 Jul, 2017 5 commits
- Merge pull request #15591 from edx/Learner-1254 · ef9935d2
```
Background color changed for microsoft button in social auth login
```
  hamzamunir7300 committed Jul 26, 2017
  ef9935d2 Browse Files
- Merge pull request #15661 from edx/schen/learner-1521 · 9b15f580
```
Move the user_attribute creation for site 
```
  Simon Chen committed Jul 26, 2017
  9b15f580 Browse Files
- fix for the quality tests failing · 3f9f0781
  Hamza Munir committed Jul 26, 2017
  
  3f9f0781 Browse Files
- Merge pull request #15667 from edx/afzaledx/get_programs_with_type_fix · c96c1c8e
```
Added a missing parameter.
```
  Afzal Wali Naushahi committed Jul 26, 2017
  c96c1c8e Browse Files
- Added a missing parameter. · ec1473f8
  Afzal Wali committed Jul 26, 2017
  
  ec1473f8 Browse Files
25 Jul, 2017 17 commits
- Merge pull request #15662 from edx/bbaker/EDUCATOR-760 · 53d9f87d
```
EDUCATOR-760
```
  Brandon Baker committed Jul 25, 2017
  53d9f87d Browse Files
- EDUCATOR-760 · 8e06cdbf
```
Change partitions logic to include partitions with one deleted group
```
  bbaker6225 committed Jul 25, 2017
  8e06cdbf Browse Files
- Merge pull request #15659 from edx/release-mergeback-to-master · f625e032
```
Merge release back to master
```
  edx-pipeline-bot committed Jul 25, 2017
  f625e032 Browse Files
- Merge branch 'master' into release-mergeback-to-master · a934e9e4
  Feanil Patel committed Jul 25, 2017
  
  a934e9e4 Browse Files
- Move the user_attribute creation for site from within the user creation transaction to outside · 20a16f24
```
learner-1521
```
  Simon Chen committed Jul 25, 2017
  20a16f24 Browse Files
- Merge pull request #15658 from edx/efischer/fix_leaks · 0f2279d3
```
CMS memory leak fix
```
  Eric Fischer committed Jul 25, 2017
  0f2279d3 Browse Files
- Merge pull request #15633 from edx/jibsheet/remove-pre-insights-analytics-config · 228356dc
```
Remove these unused config settings
```
  Kevin Falcone committed Jul 25, 2017
  228356dc Browse Files
- Merge pull request #15649 from edx/release-candidate · 2f6fef58
```
Release candidate
```
  Feanil Patel committed Jul 25, 2017
  2f6fef58 Browse Files
- Use bulk_operations when loading items · d4943c53
```
This has been causing a huge memory leak, wrapping the call in this
context manager properly cleans up the 'records' entries.

EDUCATOR-274
```
  Eric Fischer committed Jul 25, 2017
  d4943c53 Browse Files
- Merge pull request #15653 from edx/tobz/DE-209 · 62094215
```
[DE-209] Switch to the PyPI-based version of eventtracking.
```
  Toby Lawrence committed Jul 25, 2017
  62094215 Browse Files
- Merge pull request #15636 from edx/clintonb/multi-tenant-programs-fix · 0d7305bc
```
Resolved multi-tenant program issues
```
  Afzal Wali Naushahi committed Jul 25, 2017
  0d7305bc Browse Files
- Merge pull request #15651 from edx/release-mergeback-to-master · acad210d
```
Merge release back to master
```
  edx-pipeline-bot committed Jul 25, 2017
  acad210d Browse Files
- Merge pull request #15656 from edx/LEARNER-1726 · 5c476321
```
LEARNER-1726 CSS/JS fixes to Track Selection V3 Test
```
  Matthew Piatetsky committed Jul 25, 2017
  5c476321 Browse Files
- Revert "Merge pull request #15593 from edx/efischer/edu-274_logging" · bc6d7980
```
This reverts commit 2d6b477e, reversing
changes made to 7799c4ad.
```
  Eric Fischer committed Jul 25, 2017
  bc6d7980 Browse Files
- Resolved multi-tenant program issues · 9efa7770
```
A site must be passed so the system knows which URL to use to contact
the Discovery Service.
```
  Clinton Blackburn committed Jul 25, 2017
  9efa7770 Browse Files
- CSS/JS fixes to Track Selection V3 Test · bfa8f4f4
```
LEARNER-1726
```
  Matthew Piatetsky committed Jul 25, 2017
  bfa8f4f4 Browse Files
- [DE-209] Switch to the PyPI-based version of eventtracking. · 81354a02
  Toby Lawrence committed Jul 24, 2017
  
  81354a02 Browse Files
24 Jul, 2017 17 commits
- Merge pull request #15637 from edx/HarryRein/LEARNER-1652-cleanup · fd224672
```
Updating jasmine tests for course tools.
```
  Harry Rein committed Jul 24, 2017
  fd224672 Browse Files
- Merge pull request #15589 from edx/HarryRein/LEARNER-1894-in-course-messaging-xsy · b523ac3f
```
Adding in-course messages on the home page.
```
  Harry Rein committed Jul 24, 2017
  b523ac3f Browse Files
- Merge pull request #15594 from edx/diana/access-checks · eb987ed6
```
Move prereq checking into course load checks.
```
  Diana Huang committed Jul 24, 2017
  eb987ed6 Browse Files
- Merge pull request #15642 from edx/andya/studio-bootstrap-theme · d5fca9ee
```
Add basic Bootstrap theme to Studio
```
  Andy Armstrong committed Jul 24, 2017
  d5fca9ee Browse Files
- Adding in course messaging to the home page. · 08df53e1
```
LEARNER-1894

This commit adds in course messaging for three use cases. First,
when the user is not signed in, the user is shown a message that
provides a link to sign in or register. If the user is signed in
but not enrolled, they are given a link to do so. If the user is
enrolled but the course has not yet started, they are shown a
message explaining when the course starts and shown a link (not
yet enabled) to add a reminder to their calendar.

The implementation defines a base message class and extends it
for the course home messages as well as the previously implemented
page level messages.
```
  Harry Rein committed Jul 24, 2017
  08df53e1 Browse Files
- Merge pull request #15647 from edx/christina/ed-947 · 081231a7
```
Don't add groups in experiment configurations twice.
```
  Christina Roberts committed Jul 24, 2017
  081231a7 Browse Files
- Merge pull request #15650 from edx/rc-2017-07-24 · 0356845c
```
Rc 2017 07 24
```
  Feanil Patel committed Jul 24, 2017
  0356845c Browse Files
- Updating jasmine tests for course tools. · 7efd5f38
```
LEARNER-1652

Converting test to testing all three Logging events and removing page from the logging object that is submitted.
```
  Harry Rein committed Jul 24, 2017
  7efd5f38 Browse Files
- Merge branch 'release' into rc-2017-07-24 · 3fd17d3d
```
They both contain the same change but as different commits for bumping
the requirements for edx-ora and edx-submissions.
```
  Feanil Patel committed Jul 24, 2017
  3fd17d3d Browse Files
- Merge branch 'release' into release-candidate · abc1aff4
```
They both contain the same change but as different commits for bumping
the requirements for edx-ora and edx-submissions.
```
  Feanil Patel committed Jul 24, 2017
  abc1aff4 Browse Files
- Merge pull request #15604 from edx/jeskew/use_django111_compat_drf_oauth · fc11bdd7
```
Shift to edx fork of drf-oauth module.
```
  John Eskew committed Jul 24, 2017
  fc11bdd7 Browse Files
- Consolidate access checks for prereqs and surveys. · c338b751
  Diana Huang committed Jul 24, 2017
  
  c338b751 Browse Files
- Don't add groups in experiment configurations twice. · 83ae677b
```
EDUCATOR-947
```
  cahrens committed Jul 24, 2017
  83ae677b Browse Files
- Add basic Bootstrap theme to Studio · 95e47ddb
```
LEARNER-1982
```
  Andy Armstrong committed Jul 24, 2017
  95e47ddb Browse Files
- Merge pull request #15645 from edx/mjfrey/vscode-gitignore · 27cd3d19
```
Ignore Visual Studio Code directory.
```
  Michael Frey committed Jul 24, 2017
  27cd3d19 Browse Files
- Ignore Visual Studio Code directory. · 0082f360
  Michael Frey committed Jul 24, 2017
  
  0082f360 Browse Files
- Merge pull request #15624 from open-craft/haikuginger/remove-sso-consent · 91752ad9
```
[ENT-491] Remove SSO consent features; verify fully-populated consent URL generation
```
  Jesse Shapiro committed Jul 24, 2017
  91752ad9 Browse Files
22 Jul, 2017 1 commit
- Merge pull request #15634 from edx/jeskew/bump_submissions_version_for_logging · 4697aab4
```
Bump edx-submissions to v2.0.5 for better logging.
```
  John Eskew committed Jul 22, 2017
  4697aab4 Browse Files