Commits · 9a362d90334fe48cc050463ea04d0ff3503724c2 · edx / edx-platform

12 Apr, 2016 6 commits
- Merge pull request #12116 from edx/mattdrayer/rc2016-04-12/revert-theming · 9a362d90
```
Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"
```
  Matt Drayer committed Apr 12, 2016
  9a362d90 Browse Files
- Merge pull request #12121 from edx/diana/revert-final-check · 16ac76d0
```
Revert "Make it impossible to click "final check" without selecting a…
```
  Diana Huang committed Apr 12, 2016
  16ac76d0 Browse Files
- Merge pull request #12120 from edx/revert/contentserver-instrumentation · c26c52e6
```
Revert "[PERF-274] Add NewRelic instrumentation to contentserver."
```
  Toby Lawrence committed Apr 12, 2016
  c26c52e6 Browse Files
- Revert "Make it impossible to click "final check" without selecting a choice" · fa61c048
```
This reverts commit 4c83a2f0.
```
  Diana Huang committed Apr 12, 2016
  fa61c048 Browse Files
- Revert "[PERF-274] Add NewRelic instrumentation to contentserver." · 95fde6d5
```
This reverts commit 09586d8a.
```
  Toby Lawrence committed Apr 12, 2016
  95fde6d5 Browse Files
- Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming" · 392ee7d2
```
This reverts commit a796b563.

Conflicts:
	lms/envs/common.py
	openedx/core/djangoapps/theming/models.py
	pavelib/assets.py
	pavelib/paver_tests/test_assets.py
```
  Matt Drayer committed Apr 12, 2016
  392ee7d2 Browse Files
11 Apr, 2016 11 commits
- Added AWS_S3_CUSTOM_DOMAIN · 8f25c81a
```
This setting is necessary to avoid django-storages applying a security token to S3 URLs.

ECOM-4081
```
  Clinton Blackburn committed Apr 11, 2016
  8f25c81a Browse Files
- Merge pull request #12115 from edx/naa/fix-dashboard-xss · e343fbe9
```
Fix dashboard safe template issues
```
  Nimisha Asthagiri committed Apr 11, 2016
  e343fbe9 Browse Files
- Fix Dashboard safe template. · 59b8bb54
  Nimisha Asthagiri committed Apr 11, 2016
  
  59b8bb54 Browse Files
- Fix Safe template issues (again) · 8e591f63
  Nimisha Asthagiri committed Apr 11, 2016
  
  8e591f63 Browse Files
- Stripping auth querystring from S3 URLs · d6ba8839
```
We use S3 for a number of uploads. Boto, by default, includes a auth querystring on the returned URLs. Since these uploads are public, there is no need for this querystring. Additionally, the long length URLs cause problems when API consumers need to store the URLs. This commit resolves this problem by removing the auth querystring.

- Updated to latest versions of boto and django-storages-redux packages
- Added AWS_QUERYSTRING_AUTH setting to remove the querystring values

ECOM-4081
```
  Clinton Blackburn committed Apr 11, 2016
  d6ba8839 Browse Files
- Merge pull request #12113 from edx/douglashall/upgrade_xblock_lti_consumer · 69db1e74
```
Upgraded xblock-lti-consumer to 1.0.5
```
  Douglas Hall committed Apr 11, 2016
  69db1e74 Browse Files
- Upgraded xblock-lti-consumer to 1.0.5 · 2d3a0346
  Douglas Hall committed Apr 11, 2016
  
  2d3a0346 Browse Files
- Merge pull request #12111 from edx/bderusha/revert-wiki-mako-changes · f51f7eab
```
Revert "Safe Templatize: wiki templates"
```
  Bill DeRusha committed Apr 11, 2016
  f51f7eab Browse Files
- Revert "Safe Templatize: wiki templates" · f4208e7c
```
This reverts commit e6edba18.
```
  Bill DeRusha committed Apr 11, 2016
  f4208e7c Browse Files
- Merge pull request #12110 from edx/bbeggs/ccx-fix-MA-2258 · 17d8fdb5
```
Fix sequence navigation issues for CCX courses
```
  Brian Beggs committed Apr 11, 2016
  17d8fdb5 Browse Files
- Fix sequence navigation issues for CCX courses · 7d43e399
```
MA-2258
```
  Nimisha Asthagiri committed Apr 11, 2016
  7d43e399 Browse Files
08 Apr, 2016 5 commits
- Merge pull request #12098 from edx/feanil/add_migration_dependency · 0173642f
```
Update migration to add a dependency.
```
  Feanil Patel committed Apr 08, 2016
  0173642f Browse Files
- Update migration to add a dependency. · 35928197
```
Because this migration depends on enrollment code and that code relies on a new table.
```
  Feanil Patel committed Apr 08, 2016
  35928197 Browse Files
- Merge pull request #12089 from edx/revert-pattern-lib-css-changes · 15ea5ece
```
Revert "Introduce Pattern Library test pages"
```
  Brian Jacobel committed Apr 08, 2016
  15ea5ece Browse Files
- Revert "Introduce Pattern Library test pages" · 36917398
```
This reverts commit 845e3708.
```
  Brian Jacobel committed Apr 08, 2016
  36917398 Browse Files
- Merge pull request #12041 from edx/mzfr/fixup-safe-templates · 31ca2a63
```
Safe  template for edxnotes.
```
  Muzaffar yousaf committed Apr 08, 2016
  31ca2a63 Browse Files
07 Apr, 2016 18 commits
- Merge pull request #12080 from edx/ron/theme-work · b2a8fb77
```
Add registerd trademarked logo to footer.
```
  Ron Mulero committed Apr 07, 2016
  b2a8fb77 Browse Files
- Add registerd trademarked logo to footer of edx.org and edge.edx.org. · 12f8edc2
  Ron Mulero committed Apr 07, 2016
  
  12f8edc2 Browse Files
- Merge pull request #12077 from edx/efischer/merge-release-to-master · 141be63b
```
Efischer/merge release to master
```
  Eric Fischer committed Apr 07, 2016
  141be63b Browse Files
- Fix conflict, 1.1.3 is correct · 813b50ae
  Eric Fischer committed Apr 07, 2016
  
  813b50ae Browse Files
- Merge pull request #12073 from edx/hotfix/2016-04-07 · ff2a9398
```
Bump ora2 version
```
  Eric Fischer committed Apr 07, 2016
  ff2a9398 Browse Files
- Merge pull request #11369 from edx/clrux/ac-223 · 0571103b
```
AC-223 updating transcript skip links
```
  clrux committed Apr 07, 2016
  0571103b Browse Files
- Merge pull request #12072 from edx/merge-release-into-master · 810a5a79
```
Merge release into master
```
  Adam committed Apr 07, 2016
  810a5a79 Browse Files
- Bump ora2 version · 16d62e55
  Eric Fischer committed Apr 07, 2016
  
  16d62e55 Browse Files
- LMS: updating transcript skip links · fbe61604
  Chris Rodriguez committed Apr 07, 2016
  
  fbe61604 Browse Files
- Merge pull request #12053 from mitocw/fix/aq/ccx_creating_issue · abba913b
```
Fixed unable to created ccx issue 
```
  John Eskew committed Apr 07, 2016
  abba913b Browse Files
- Merge remote-tracking branch 'origin/release' into merge-release-into-master · 76f0fb0f
  Adam Palay committed Apr 07, 2016
  
  76f0fb0f Browse Files
- Merge pull request #12059 from edx/patch/2015-04-06 · 3853538c
```
Patch/2015 04 06
```
  Adam committed Apr 07, 2016
  3853538c Browse Files
- Merge pull request #11987 from edx/asadiqbal08/xblock_translations · c7552db4
```
asadiqbal08/WL-388: Add ModuleI18nService for Descriptor System
```
  Matt Drayer committed Apr 07, 2016
  c7552db4 Browse Files
- Fixed unable to created ccx even if ccx_conn url is not set · 60b368e2
  Amir Qayyum Khan committed Apr 07, 2016
  
  60b368e2 Browse Files
- semantic task_input for certificate generation ECOM-3505 · 76057fc4
  Syed Hassan Raza committed Apr 07, 2016
  
  76057fc4 Browse Files
- Safe template for edxnotes. · 03c80125
  muzaffaryousaf committed Apr 07, 2016
  
  03c80125 Browse Files
- Merge pull request #11949 from edx/fix-migrations · b9b87f9b
```
Making migrations in-sync with models.
```
  Muzaffar yousaf committed Apr 07, 2016
  b9b87f9b Browse Files
- Bump version for edx/django-oauth2-provider that includes in-sync migrations. · 2e0a9b26
```
TNL-4296
```
  muzaffaryousaf committed Apr 07, 2016
  2e0a9b26 Browse Files