Commits · 553804d7d893aaed2c9110bd944019e89b73de21 · edx / edx-platform · GitLab

21 Sep, 2015 1 commit
- Merge pull request #9834 from edx/talbs/fix-xmodule-scss · 553804d7
```
Simplifying needed sass assets for xmodule sass compilation
```
  Brian Talbot committed Sep 21, 2015
  553804d7 Browse Files
18 Sep, 2015 1 commit
- fixup! simplifying needed sass assets for xmodule sass compilation · 2797ebc0
  Brian Talbot committed Sep 18, 2015
  
  2797ebc0 Browse Files
17 Sep, 2015 20 commits
- Import the correct scss files for xmodule styling · 027a5719
  Ned Batchelder committed Sep 17, 2015
  
  027a5719 Browse Files
- A test for optional_include_mako · 200adfaa
  Ned Batchelder committed Sep 17, 2015
  
  200adfaa Browse Files
- Remove unneeded .write() method · e1c898ff
  Ned Batchelder committed Sep 17, 2015
  
  e1c898ff Browse Files
- Fix mako argument syntax · bc13f450
  Ned Batchelder committed Sep 17, 2015
  
  bc13f450 Browse Files
- Document disparity between footer.html and themable-footer.html · 0d35f6a8
  David Baumgold committed Sep 17, 2015
  
  0d35f6a8 Browse Files
- Rename google_analytics.html to use a hyphen instead. · 1d6e9140
  Ned Batchelder committed Sep 17, 2015
  
  1d6e9140 Browse Files
- Comprehensive Theming: setting sass !default flag on themeable LMS base variables · cb921fd7
  Brian Talbot committed Sep 17, 2015
  
  cb921fd7 Browse Files
- Comprehensive Theming: re-organizing/minor simplifying of existing LMS Sass variables · b815a86e
  Brian Talbot committed Sep 17, 2015
  
  b815a86e Browse Files
- Use sass interpolation instead of concatenation for -path · c0856232
  Ned Batchelder committed Sep 17, 2015
  
  c0856232 Browse Files
- Minor changes, responding to pull request comments · 5d64f9a8
  Ned Batchelder committed Sep 17, 2015
  
  5d64f9a8 Browse Files
- Use the proper 'off' default for COMP_THEME_DIR. · a8dd9ca9
  Ned Batchelder committed Sep 17, 2015
  
  a8dd9ca9 Browse Files
- Comprehensive theming · 6ebf2515
```
This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e
```
  David Baumgold committed Sep 17, 2015
  6ebf2515 Browse Files
- Merge pull request #9650 from edx/gabe/fix-backend-order · 034570b3
```
Fix order of tracking backends
```
  Gabe Mulley committed Sep 17, 2015
  034570b3 Browse Files
- Merge pull request #9739 from edx/clee/dapi-vote-bug-2 · 655b02a5
```
fixed vote bug in discussion api
```
  Christopher Lee committed Sep 17, 2015
  655b02a5 Browse Files
- Merge pull request #9488 from edx/dsjen/courses-via-overview · 305f88f6
```
Optimize OpenID Course Claims for users.
```
  Dennis Jen committed Sep 17, 2015
  305f88f6 Browse Files
- Optimize OpenID Course Claims for users. · 844edac4
```
- Course overviews will cache courses upon publish.
- Added management command to warm up cache.
- OAuth2 handler returns courses via course overviews.
```
  Dennis Jen committed Sep 17, 2015
  844edac4 Browse Files
- MA-1149 fixed vote bug in discussion api · ccc921bc
```
An incorrect response was being returned when voting for a comment
or thread.
```
  christopher lee committed Sep 17, 2015
  ccc921bc Browse Files
- Merge pull request #9767 from edx/benp/pin-coveralls · d0b6d181
```
Pin coveralls to specific version.
```
  Ben Patterson committed Sep 17, 2015
  d0b6d181 Browse Files
- Merge pull request #9785 from edx/saleem-latif/SOL-1199 · cac9f97e
```
SOL-1199
```
  Matt Drayer committed Sep 17, 2015
  cac9f97e Browse Files
- CSS Animations disabled for test · 3741d065
  Saleem Latif committed Sep 17, 2015
  
  3741d065 Browse Files
16 Sep, 2015 18 commits
- Merge pull request #9790 from edx/clintonb/enrollment-admin · 70866104
```
Built a better course enrollment admin
```
  Clinton Blackburn committed Sep 16, 2015
  70866104 Browse Files
- Merge pull request #9797 from edx/jeskew/resolve_issues_with_release · 22672ed8
```
Resolve issues with release 2015-09-15 merge to master
```
  John Eskew committed Sep 16, 2015
  22672ed8 Browse Files
- Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release · 6b12ec97
  John Eskew committed Sep 16, 2015
  
  6b12ec97 Browse Files
- Merge pull request #9789 from edx/hotfix/2015-09-16 · 2b24d3df
```
Hotfix/2015 09 16
```
  Kevin Falcone committed Sep 16, 2015
  2b24d3df Browse Files
- Fix quality issue. · 684f9017
  John Eskew committed Sep 16, 2015
  
  684f9017 Browse Files
- Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release · 7c0663f2
  John Eskew committed Sep 16, 2015
  
  7c0663f2 Browse Files
- Pin coveralls to specific version. · c88b43b7
```
The latest version is compatible with the new coverage.py.
```
  Ben Patterson committed Sep 16, 2015
  c88b43b7 Browse Files
- Merge pull request #9717 from edx/ziafazal/SOL-1193 · ac0d9264
```
SOL-1193: moved variables from template to view
```
  Matt Drayer committed Sep 16, 2015
  ac0d9264 Browse Files
- Built a better course enrollment admin · 7625c6ee
  Clinton Blackburn committed Sep 16, 2015
  
  7625c6ee Browse Files
- hotfix/2015-09-16-3: Re-enable uglification of JavaScript in production. · 536783e6
  Andy Armstrong committed Sep 16, 2015
  
  536783e6 Browse Files
- hotfix/2015-09-16-2: Credit Fixes · 011062e5
```
- Updated checkout page to disallow purchase of credit seats (the credit payment page is hosted in ecommerce)
- Corrected path to providers endpoint
- Cleaned receipt page styling
- Updated receipt page copy
- Added provider thumbnail to receipt page

ECOM-2172
```
  Clinton Blackburn committed Sep 16, 2015
  011062e5 Browse Files
- hotfix/2015-09-16-1: Removed signatory org char limit · 05a2b54b
  Matt Drayer committed Sep 16, 2015
  
  05a2b54b Browse Files
- Merge pull request #9729 from edx/rc/2015-09-15 · fa39016d
```
Rc/2015 09 15
```
  John Eskew committed Sep 16, 2015
  fa39016d Browse Files
- Merge pull request #9788 from edx/ned/fix-mako-comments · da58885e
```
Mako comments have to be double-hash, or they are included on the page.
```
  Ned Batchelder committed Sep 16, 2015
  da58885e Browse Files
- moved variables from template to view · cf80c07c
```
fixed broken tests and quality violations

moved twitter_url to view also

escaped string for js
```
  Zia Fazal committed Sep 16, 2015
  cf80c07c Browse Files
- Mako comments have to be double-hash, or they are included on the page. · 764cd862
  Ned Batchelder committed Sep 16, 2015
  
  764cd862 Browse Files
- Merge pull request #9558 from edx/max/set-superuser · 628eb866
```
Add management command for granting superuser access
```
  Max Rothman committed Sep 16, 2015
  628eb866 Browse Files
- Merge pull request #9774 from edx/benp/sept2015-bok-choy-shard-rebal · 9751b00b
```
Bok-choy rebalance. Shard 5 is getting long comparatively.
```
  Ben Patterson committed Sep 16, 2015
  9751b00b Browse Files