Commits · ff2a9398786e40b646975223edc395fe4b6eff7e · edx / edx-platform

07 Apr, 2016 4 commits
- Merge pull request #12073 from edx/hotfix/2016-04-07 · ff2a9398
```
Bump ora2 version
```
  Eric Fischer committed Apr 07, 2016
  ff2a9398 Browse Files
- Bump ora2 version · 16d62e55
  Eric Fischer committed Apr 07, 2016
  
  16d62e55 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
- semantic task_input for certificate generation ECOM-3505 · 76057fc4
  Syed Hassan Raza committed Apr 07, 2016
  
  76057fc4 Browse Files
06 Apr, 2016 7 commits
- 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
05 Apr, 2016 6 commits
- Merge pull request #12040 from edx/patch/2016-04-05 · 0fd06e80
```
Patch/2016 04 05
```
  Renzo Lucioni committed Apr 05, 2016
  0fd06e80 Browse Files
- Removing check for edx notes for OAUTH token timeout. · cc7aa349
```
TNL-4336
```
  muzaffaryousaf committed Apr 05, 2016
  cc7aa349 Browse Files
- Fix discussion category map for self-paced courses · 003cbd5a
```
Prevents start date alone from being used to filter out categories in self-paced courses during construction of the category map. ECOM-4017.
```
  Renzo Lucioni committed Apr 05, 2016
  003cbd5a Browse Files
- Add option to bypass course home · 77a90a08
```
Exposes an advanced setting in Studio allowing course teams to bypass the home tab when students arrive from the dashboard, sending them directly to course content. ECOM-3961.
```
  Renzo Lucioni committed Apr 05, 2016
  77a90a08 Browse Files
- Hide chrome and default_tab from advanced settings · 7222f9b0
```
It doesn't make sense to list these LMS block attributes in course-level advanced settings. Doing so is confusing to course teams.
```
  Renzo Lucioni committed Apr 05, 2016
  7222f9b0 Browse Files
- ECOM-3673 Update the course end date description text to remove the reference to… · 649e8b11
```
ECOM-3673 Update the course end date description text to remove the reference to certificate when course enrollment is in audit mode
```
  Simon Chen committed Apr 05, 2016
  649e8b11 Browse Files
31 Mar, 2016 1 commit
- Merge pull request #11877 from edx/cdyer/oauth-toolkit · 69305ce8
```
introducing django-oauth-toolkit and public client refresh tokens
```
  Cliff Dyer committed Mar 31, 2016
  69305ce8 Browse Files
30 Mar, 2016 3 commits

Configure LMS to select oauth2 providing library. · 1df04022

Available backends:

* django-oauth-toolkit (DOT)
* django-oauth2-provider (DOP)

* Use provided client ID to select backend for
  * AccessToken requests
  * third party auth-token exchange
* Create adapters to isolate library-dependent functionality
* Handle django-oauth-toolkit tokens in edX DRF authenticator class

MA-1998
MA-2000

committed Mar 30, 2016

1df04022 Browse Files

Use renamed edx_oauth2_provider throughout. · 88fef8b2
```
MA-1998 Install and configure django_oauth_toolkit to coexist with
existing oauth libraries.
```
J. Cliff Dyer committed Mar 30, 2016
88fef8b2 Browse Files
Merge pull request #11955 from edx/rc/2016-03-29 · 2e2687ba
```
Release Candidate rc/2016-03-29
```
sanfordstudent committed Mar 30, 2016
2e2687ba Browse Files

28 Mar, 2016 1 commit
- Merge pull request #11967 from edx/sstudent/fix-typo · 88d0461b
```
fixing typo in template
```
  sanfordstudent committed Mar 28, 2016
  88d0461b Browse Files
25 Mar, 2016 16 commits
- fixing typo in template · ed7237b6
  Sanford Student committed Mar 25, 2016
  
  ed7237b6 Browse Files
- Merge pull request #11945 from edx/robrap/linter · 801bb288
```
Add check for multiple page tags
```
  Robert Raposa committed Mar 25, 2016
  801bb288 Browse Files
- Merge pull request #11952 from edx/douglashall/PHX-255/update_lti_consumer_1_0_4 · 6bbcbbf0
```
Upgrade xblock-lti-consumer to 1.0.4 to pull in bug fixes
```
  Douglas Hall committed Mar 25, 2016
  6bbcbbf0 Browse Files
- Merge pull request #11938 from edx/andya/fix-underscore-on-sandboxes · e8f620a2
```
Fix issues with Underscore in the asset pipeline
```
  Andy Armstrong committed Mar 25, 2016
  e8f620a2 Browse Files
- Merge pull request #11943 from edx/schen/FixPageTagsOnDashboardMakoTemplates · 0ad9eb91
```
Fix to remove mulitple page tags on mako templates
```
  Simon Chen committed Mar 25, 2016
  0ad9eb91 Browse Files
- Merge pull request #11946 from edx/dsjen/instr-page-args · f1c700a6
```
Consolidated page tags in instructor analytics template.
```
  Dennis Jen committed Mar 25, 2016
  f1c700a6 Browse Files
- Fix issues with Underscore in the asset pipeline · 6dd09a89
```
FEDX-121

The previous approach for handling NPM assets was
to symlink them into the static directory. This appeared
to cause trouble with the asset pipeline where the files
in question were not installed and then old versions were
picked up instead.

This change instead copies NPM libraries to a new
static directory so that the pipeline can consume them
as with any other file. This new directory is added to
.gitignore so that the files don't get accidentally
checked in.
```
  Andy Armstrong committed Mar 25, 2016
  6dd09a89 Browse Files
- Fix to remove mulitple page tags on mako templates · d15e192b
  Simon Chen committed Mar 25, 2016
  
  d15e192b Browse Files
- Merge pull request #11935 from edx/mzfr/rqst-timeout-tnl2444 · 73c97f4d
```
Setting request timeouts for edx notes.
```
  Muzaffar yousaf committed Mar 25, 2016
  73c97f4d Browse Files
- Upgrade xblock-lti-consumer to 1.0.4 to pull in bug fixes · fb6f3ca5
  Douglas Hall committed Mar 25, 2016
  
  fb6f3ca5 Browse Files
- Setting request timeouts for edx notes. · 1ecba9a9
```
TNL-2444
```
  muzaffaryousaf committed Mar 25, 2016
  1ecba9a9 Browse Files
- Merge pull request #11888 from edx/mkatz/safetemplate · 9ea37a64
```
safe template
```
  Michael Katz committed Mar 25, 2016
  9ea37a64 Browse Files
- Merge pull request #11905 from edx/douglashall/xss_bug_bash · 62ce357b
```
XSS Bug Bash
```
  Douglas Hall committed Mar 25, 2016
  62ce357b Browse Files
- Merge pull request #11827 from… · 402ca836
```
Merge pull request #11827 from edx/waheed/ecom-2947-support-entire-password-reset-flow-in-logistration

Fixed the other half of forgot password flow accourding to logistration.
```
  Waheed Ahmed committed Mar 25, 2016
  402ca836 Browse Files
- Fixed the other half of forgot password flow accourding to logistration. · 4399a5c7
```
ECOM-2947
```
  Waheed Ahmed committed Mar 25, 2016
  4399a5c7 Browse Files
- Make templates safe · f177cb6e
  Douglas Hall committed Mar 24, 2016
  
  f177cb6e Browse Files
24 Mar, 2016 2 commits
- Consolidated page tags in instructor analytics template. · 89f11638
  Dennis Jen committed Mar 24, 2016
  
  89f11638 Browse Files
- Merge pull request #11918 from edx/aleffert/remove-unit-coffee · 91c0517b
```
Remove unused empty file
```
  Akiva Leffert committed Mar 24, 2016
  91c0517b Browse Files