Commits · 9436edf856b912d77dbb449f694abfe2cf85e2cc · edx / edx-platform

02 Feb, 2017 6 commits
- Merge pull request #14446 from edx/beryl/grades-mongo-query · 9436edf8
```
Fix mongo query count for Grades API
```
  Nimisha Asthagiri committed Feb 02, 2017
  9436edf8 Browse Files
- Merge pull request #14428 from edx/TNL-6419-change-in-code · f7aed5cb
```
TNL-6419 Fix in file-checking code in Xmodule.
```
  Attiya Ishaque committed Feb 02, 2017
  f7aed5cb Browse Files
- TNL-6419 Fix in file-checking code in Xmodule. · 0869df22
  attiyaishaque committed Feb 02, 2017
  
  0869df22 Browse Files
- Merge pull request #14429 from edx/mjevtic/WL-963 · 43ffe63f
```
[WL-963] Mark test as flaky
```
  Marko Jevtić committed Feb 02, 2017
  43ffe63f Browse Files
- Merge pull request #14440 from edx/hasnain-naveed/instructor-info-in-courseoverview/WL-912 · f9365a24
```
WL-912 | Added instructor info in course overview model.
```
  Hasnain Naveed committed Feb 02, 2017
  f9365a24 Browse Files
- [WL-963] Mark test as flaky · a83ac7d8
  Marko Jevtic committed Feb 02, 2017
  
  a83ac7d8 Browse Files
01 Feb, 2017 23 commits
- Merge pull request #14015 from open-craft/haikuginger/add-swift-settings-to-cms · 0e90ee5f
```
Add swift settings to CMS
```
  Jillian Vogel committed Feb 02, 2017
  0e90ee5f Browse Files
- Fix mongo query count for Grades API · 7cc08399
  Nimisha Asthagiri committed Feb 01, 2017
  
  7cc08399 Browse Files
- Adds OpenStack settings to CMS environment · 9d5db5ae
```
and a comment and explaining why we import aws.* in the openstack settings.
```
  Jesse Shapiro committed Feb 02, 2017
  9d5db5ae Browse Files
- Merge pull request #14438 from edx/beryl/cohort_integrity_error · 1912176c
```
Fix cohort IntegrityErrors
```
  Nimisha Asthagiri committed Feb 01, 2017
  1912176c Browse Files
- Merge pull request #14441 from fghaas/color-default · 1c6cfb0b
```
FEDX-300 Set !default on Sass colors
```
  Andy Armstrong committed Feb 01, 2017
  1c6cfb0b Browse Files
- Merge pull request #14425 from edx/revert-14200-jmbowman/async_course_import · d1012a77
```
Revert "PLAT-1104 Import courses asynchronously"
```
  Jesse Zoldak committed Feb 01, 2017
  d1012a77 Browse Files
- Merge pull request #14442 from edx/revert-14439-beryl/grades-mongo-query · 94b78ecb
```
Revert "Fix mongo query count for Grades API"
```
  Jesse Zoldak committed Feb 01, 2017
  94b78ecb Browse Files
- Revert "Fix mongo query count for Grades API" · b0647e7d
  Jesse Zoldak committed Feb 01, 2017
  
  b0647e7d Browse Files
- Merge pull request #14439 from edx/beryl/grades-mongo-query · 0f89af8a
```
Fix mongo query count for Grades API
```
  Nimisha Asthagiri committed Feb 01, 2017
  0f89af8a Browse Files
- Merge pull request #14437 from edx/bjacobel/wmd-disabled-undo-redo · e8a60f7d
```
Add aria-disabled to WMD undo/redo buttons
```
  Brian Jacobel committed Feb 01, 2017
  e8a60f7d Browse Files
- Merge pull request #14408 from edx/clintonb/automated-refunds · 62241b2b
```
Automating Refund Approvals
```
  Clinton Blackburn committed Feb 01, 2017
  62241b2b Browse Files
- Fix mongo query count for Grades API · 704a16ad
  Nimisha Asthagiri committed Feb 01, 2017
  
  704a16ad Browse Files
- Merge pull request #14436 from edx/estute/pin-astroid-for-pylint-dependency · c0a64c2b
```
pin astroid version 1.3.8 for pylint dep
```
  Stu Young committed Feb 01, 2017
  c0a64c2b Browse Files
- v1 Sass (CMS): set !default on all colors · 64fd3929
```
Colors should be overridable.
See https://openedx.atlassian.net/browse/PLAT-1181

This sets all color variables to !default for v1 (pre-Pattern Library)
Sass in Studio.
```
  Florian Haas committed Feb 01, 2017
  64fd3929 Browse Files
- v1 Sass (LMS): remove duplicate color definition · b7f996af
```
The double definition of $blue-d1, $blue-d2, and $blue-d4 is
superfluous, so remove the second instance of each.
```
  Florian Haas committed Feb 01, 2017
  b7f996af Browse Files
- v2 Sass (LMS): Set !default on all colors · 85a8e221
```
Colors should be overridable.
See https://openedx.atlassian.net/browse/PLAT-1181

This sets all color variables to !default for v2 (Pattern Library)
Sass.
```
  Florian Haas committed Feb 01, 2017
  85a8e221 Browse Files
- v1 Sass (LMS): set !default on all colors · 688c3f39
```
Colors should be overridable.
See https://openedx.atlassian.net/browse/PLAT-1181

This sets all color variables to !default for v1 (pre-Pattern Library)
Sass.
```
  Florian Haas committed Feb 01, 2017
  688c3f39 Browse Files
- Added instructor info in course overview. · 180cf299
  Hasnain committed Feb 01, 2017
  
  180cf299 Browse Files
- Merge pull request #14427 from edx/ziafazal/TNL-6400 · 4a41b6f0
```
updated lti_consumer xblock to latest version
```
  Zia Fazal committed Feb 01, 2017
  4a41b6f0 Browse Files
- Automated refund approval process · 7c39978b
```
Refunds are now processed automatically. If the automated processing fails, the system falls back to the previous behavior of notifying the Support Team. Additionally, these calls are all made by the service user rather than the learner.

ECOM-6541
```
  Clinton Blackburn committed Feb 01, 2017
  7c39978b Browse Files
- Removed references to ECOMMERCE_API_SIGNING_KEY · 1189867d
```
We should not be using custom signing keys for each service at this time. We may want to return to this strategy in the future; but, this is not the direction any of our other services are going in.

ECOM-6541
```
  Clinton Blackburn committed Feb 01, 2017
  1189867d Browse Files
- comment astroid dependency · 43329ade
  stu committed Jan 31, 2017
  
  43329ade Browse Files
- Fix cohort Integrity Errors · 95b4cbbc
```
TNL-5725
```
  Nimisha Asthagiri committed Jan 31, 2017
  95b4cbbc Browse Files
31 Jan, 2017 11 commits
- Merge pull request #14433 from edx/clintonb/docker-devstack-test · e5112bd3
```
Simplified Docker Devstack test settings
```
  Clinton Blackburn committed Jan 31, 2017
  e5112bd3 Browse Files
- Add aria-disabled to WMD undo/redo buttons · ecc9afa1
  Brian Jacobel committed Jan 31, 2017
  
  ecc9afa1 Browse Files
- Simplified Docker Devstack test settings · 6b2ca065
```
The only value that needs to be overridden is the Mongo host. The duplicated values can be imported.
```
  Clinton Blackburn committed Jan 31, 2017
  6b2ca065 Browse Files
- Merge pull request #14430 from edx/renzo/backpopulation-from-catalog · 8a53f3b6
```
Use the catalog for program certificate backpopulation
```
  Renzo Lucioni committed Jan 31, 2017
  8a53f3b6 Browse Files
- pin astroid version 1.3.8 for pylint dep · 4b60f133
  stu committed Jan 31, 2017
  
  4b60f133 Browse Files
- Merge pull request #14432 from edx/christina/quality · 255af25a
```
Fix safe template warning.
```
  Christina Roberts committed Jan 31, 2017
  255af25a Browse Files
- Use the catalog for program certificate backpopulation · 4027dd84
```
This command is used to backfill missing program certificates. Formerly, it used the programs service. It now uses the catalog service exclusively.

ECOM-4422
```
  Renzo Lucioni committed Jan 31, 2017
  4027dd84 Browse Files
- Fix safe template warning. · 0f3eb6e9
  cahrens committed Jan 31, 2017
  
  0f3eb6e9 Browse Files
- Merge pull request #14416 from edx/feature/consistent-hashing · 823a4316
```
Include django-memcached-hashring to support consistent hashing.
```
  Toby Lawrence committed Jan 31, 2017
  823a4316 Browse Files
- Merge pull request #14415 from edx/christina/tnl-6357 · feb1c82d
```
Show checkmarks when "Show Answer" is clicked.
```
  Christina Roberts committed Jan 31, 2017
  feb1c82d Browse Files
- Show checkmarks when "Show Answer" is clicked. · 55712d11
```
TNL-6357
```
  cahrens committed Jan 31, 2017
  55712d11 Browse Files