Commits · 36648510172166fdc9476666d3b220765e42a936 · edx / edx-platform · GitLab

15 Apr, 2016 1 commit
- make tests pass by creating staticfiles directories · 36648510
  Fred Smith committed Apr 15, 2016
  
  36648510 Browse Files
07 Apr, 2016 16 commits
- clear existing assets before copying new assets · 9ff39385
  Fred Smith committed Apr 07, 2016
  
  9ff39385 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
- 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
- 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
- Moving choices to admin form instead of models. · c3cd2db3
```
TNL-4296
```
  muzaffaryousaf committed Apr 07, 2016
  c3cd2db3 Browse Files
- Make migrations in-sync with models · e2d9ecc0
  muzaffaryousaf committed Apr 07, 2016
  
  e2d9ecc0 Browse Files
- Unit test to check the migrations are in sync. · 90c670c0
  muzaffaryousaf committed Apr 07, 2016
  
  90c670c0 Browse Files
- Merge pull request #12048 from edx/robrap/linter-revert-include · 68ae1325
```
TNL-4345: Remove include linting
```
  Robert Raposa committed Apr 06, 2016
  68ae1325 Browse Files
06 Apr, 2016 22 commits
- remove unused CERTIFICATES_ENABLED feature flag · e0ca1eca
```
ECOM-4040
```
  Jim Abramson committed Apr 06, 2016
  e0ca1eca Browse Files
- Merge pull request #12062 from edx/diana/ora-version-bump · ec08b91e
```
Bump ORA version.
```
  Diana Huang committed Apr 06, 2016
  ec08b91e Browse Files
- Merge pull request #12063 from edx/ned/update-translations · 530d61e6
```
Update translations (autogenerated message)
```
  Ned Batchelder committed Apr 06, 2016
  530d61e6 Browse Files
- Update translations (autogenerated message) · 88e3634d
  Ned Batchelder committed Apr 06, 2016
  
  88e3634d Browse Files
- Bump ORA version. · efc1f968
  Diana Huang committed Apr 06, 2016
  
  efc1f968 Browse Files
- Remove outdated safe template recommendations · a6ac06f2
```
- Remove <%include> linting
- Remove dump_html_escaped_json
```
  Robert Raposa committed Apr 06, 2016
  a6ac06f2 Browse Files
- Merge pull request #12061 from edx/revert-11374-omar/verified-coursemode-price · 6bfb94cd
```
Revert "Disallow free verified course modes"
```
  Jesse Zoldak committed Apr 06, 2016
  6bfb94cd Browse Files
- Revert "Disallow free verified course modes" · c9e4a1d9
  Ben Patterson committed Apr 06, 2016
  
  c9e4a1d9 Browse Files
- Verification Upgrade Deadline panel on course home page should not show if user is already verified · 03925474
  Awais Jibran committed Apr 06, 2016
  
  03925474 Browse Files
- Fix certificate exception view. · 1799634c
```
ECOM-3910
```
  Awais Jibran committed Apr 06, 2016
  1799634c Browse Files
- make sure email from addresses don't exceed 320 characters (TNL-4264) · a254d754
```
clean up and fix quality violations

since get_course can never return None, we can remove these lines
```
  Adam Palay committed Apr 06, 2016
  a254d754 Browse Files
- Enable Azure AD third party auth provider by default · 60f4f1ac
  Braden MacDonald committed Apr 06, 2016
  
  60f4f1ac Browse Files
- Add azuread SSO button style · c5072d63
  Omar Khan committed Apr 06, 2016
  
  c5072d63 Browse Files
- Custom icons for third party auth login buttons · 07892a75
```
- Icon images can be uploaded from the django admin
- Test coverage improved
```
  Omar Khan committed Apr 06, 2016
  07892a75 Browse Files
- Add --save_screenshots option to paver test_bokchoy · c09a4c47
  Omar Khan committed Apr 06, 2016
  
  c09a4c47 Browse Files
- Merge pull request #11374 from open-craft/omar/verified-coursemode-price · e0995b80
```
Disallow free verified course modes
```
  Simon Chen committed Apr 06, 2016
  e0995b80 Browse Files
- asadiqbal08/WL-388: ModuleI18nService for Descriptor System · 7ae40dce
```
mattdrayer: Default to XBlock class if no unmixed class
```
  asadiqbal committed Apr 06, 2016
  7ae40dce Browse Files
- Merge pull request #12007 from edx/PERF-274 · fc149abf
```
[PERF-274] Add NewRelic instrumentation to contentserver.
```
  Toby Lawrence committed Apr 06, 2016
  fc149abf Browse Files
- [PERF-274] Add NewRelic instrumentation to contentserver. · 09586d8a
```
This includes the course key/path for a given contentserver request,
whether or not the asset is locked, cacheable, has been modified, etc.

This should give us some better insight as to what sort of requests are
coming into the contentserver to figure out whether or use of a CDN in
front of these assets is as efficient as effective as it could be.
```
  Toby Lawrence committed Apr 06, 2016
  09586d8a Browse Files
- Merge pull request #11021 from StraNNiKK/LTI-9 · a9a330a0
```
LTI-9 - Bug with sending back grades for a non-leaf blocks on devstack
```
  Douglas Hall committed Apr 06, 2016
  a9a330a0 Browse Files
- Merge pull request #12036 from edx/waheed/ecom-3127-fix-grade-requirements · 058a7e84
```
Fixed progress page grade requirements text.
```
  Waheed Ahmed committed Apr 06, 2016
  058a7e84 Browse Files
- Fixed progress page grade requirements text. · 6a9157e4
```
ECOM-3127
```
  Waheed Ahmed committed Apr 06, 2016
  6a9157e4 Browse Files
05 Apr, 2016 1 commit
- Merge pull request #11957 from edx/andya/pattern-library-test-page · 34cecaee
```
Introduce Pattern Library test pages
```
  Andy Armstrong committed Apr 05, 2016
  34cecaee Browse Files