Commits · 22eda46e5ff29782f4c12f6876837cb38c57a7d8 · edx / edx-platform

28 Jan, 2016 20 commits
- Merge pull request #11368 from edx/hotfix/2016-01-28_release_into_master · 22eda46e
```
Merging release into master
```
  Douglas Hall committed Jan 28, 2016
  22eda46e Browse Files
- Merge pull request #11366 from edx/peter-fogg/reenable-course-home-checks · 1603a1ab
```
Reenable course home improvements check.
```
  Peter Fogg committed Jan 28, 2016
  1603a1ab Browse Files
- Merge pull request #11365 from edx/ned/add-note-to-edx-private · 5ec74b7c
```
Add a note to the top of edx-private.txt
```
  Ned Batchelder committed Jan 28, 2016
  5ec74b7c Browse Files
- Merge branch 'release' into hotfix/2016-01-28_release_into_master · 22430f61
  Douglas Hall committed Jan 28, 2016
  
  22430f61 Browse Files
- Merge pull request #11362 from edx/hotfix/2016-01-28 · cc01391a
```
HOTFIX for PHX-245 Updated proctored/timed exam text
```
  Douglas Hall committed Jan 28, 2016
  cc01391a Browse Files
- Reenable course home improvements check. · 6e6c3977
```
This was disabled some time ago due to PLAT-900, which caused cached
objects to be unpickled and used in new code which could expect to
find new fields that didn't exist on the old objects. That issue is
now fixed.

ECOM-2853
```
  Peter Fogg committed Jan 28, 2016
  6e6c3977 Browse Files
- Add a note to the top of edx-private.txt · a193fd0f
  Ned Batchelder committed Jan 28, 2016
  
  a193fd0f Browse Files
- Updated proctored/timed exam header bar text; Upgraded edx-proctoring to pull in… · 2447540d
```
Updated proctored/timed exam header bar text; Upgraded edx-proctoring to pull in additional text changes
```
  Douglas Hall committed Jan 28, 2016
  2447540d Browse Files
- Merge pull request #11130 from edx/clytwynec/ac-75 · 092eae9f
```
AC-75 and AC-73
```
  Christine Lytwynec committed Jan 28, 2016
  092eae9f Browse Files
- Merge pull request #11347 from edx/ahsan/credentials-feature-changes · 0c55f17d
```
Credentials Feature changes reverted in release
```
  Ahsan Ulhaq committed Jan 28, 2016
  0c55f17d Browse Files
- Merge pull request #11335 from edx/aj/tnl4049-studio-dashbord-update-2 · fc3511d7
```
Render CMS course listing Using CourseSummary for user with org access role
```
  Awais Jibran committed Jan 28, 2016
  fc3511d7 Browse Files
- Add jwt auth in LMS · 92204209
```
ECOM-3419
```
  Ahsan Ulhaq committed Jan 28, 2016
  92204209 Browse Files
- Merge pull request #11346 from edx/aj/ecom-3525-add-logging-in-remove-user-from-cert-exception · 7d8936e3
```
Add logging when user is removed from exception list
```
  Awais Jibran committed Jan 28, 2016
  7d8936e3 Browse Files
- Update 'certificate_url' field for view certificate on learner dashboard. · 394601f3
```
ECOM-3281
```
  Tasawer committed Jan 28, 2016
  394601f3 Browse Files
- caching for requests to credentials service · 70eaf189
```
ECOM-3278
```
  Ahsan Ulhaq committed Jan 28, 2016
  70eaf189 Browse Files
- Show message for earned programs credentials · 51815136
```
ECOM-3015
```
  Ahsan Ulhaq committed Jan 28, 2016
  51815136 Browse Files
- Added configuration model for credentials · 8a280559
```
ECOM-3033
```
  Ahsan Ulhaq committed Jan 28, 2016
  8a280559 Browse Files
- Create placeholder django apps for credentials · b11e312d
```
ECOM-3057
```
  Ahsan Ulhaq committed Jan 28, 2016
  b11e312d Browse Files
- Merge pull request #11357 from edx/clintonb/ccx-fix · 0b8145ee
```
Resolved ccx-keys dependency on edx-opaque-keys
```
  Clinton Blackburn committed Jan 27, 2016
  0b8145ee Browse Files
- Merge pull request #11361 from edx/ned/update-translations · d66f8d45
```
Update translations (autogenerated message)
```
  Ned Batchelder committed Jan 27, 2016
  d66f8d45 Browse Files
27 Jan, 2016 20 commits
- Updated edx-user-state-client dependency · d6f7fa18
```
New version uses edx-opaque-keys instead of opaque-keys.
```
  Clinton Blackburn committed Jan 27, 2016
  d6f7fa18 Browse Files
- Updated XModule opaque-keys dependency · 29f0a5b1
```
Using edx-opaque-keys instead of opaque-keys
```
  Clinton Blackburn committed Jan 27, 2016
  29f0a5b1 Browse Files
- Merge pull request #11360 from edx/cdyer/track-push · 6595dfc2
```
Track push notification activity in analytics
```
  Cliff Dyer committed Jan 27, 2016
  6595dfc2 Browse Files
- Resolved ccx-keys dependency on edx-opaque-keys · 0ddf4689
```
ccx-keys has been updated to use the edx-opaque-keys library from PyPI, rather than simply expect the package to be pre-installed. The edx-opaque-keys version has been bumped as it was updated to export test packages needed by ccx-keys.
```
  Clinton Blackburn committed Jan 27, 2016
  0ddf4689 Browse Files
- Update translations (autogenerated message) · 10998f5d
  Ned Batchelder committed Jan 27, 2016
  
  10998f5d Browse Files
- Merge pull request #11358 from edx/release · 08a2bc96
```
Hotfix for MA-1981 and safe sessions
```
  Nimisha Asthagiri committed Jan 27, 2016
  08a2bc96 Browse Files
- Track push notification activity in analytics · 90493ac3
```
When a course is updated, track whether or not a push notification is
sent.
```
  J. Cliff Dyer committed Jan 27, 2016
  90493ac3 Browse Files
- Update translations (autogenerated message) · 1bbc2d0b
  Ned Batchelder committed Jan 27, 2016
  
  1bbc2d0b Browse Files
- Merge pull request #11340 from edx/hotfix/2016-01-26 · 233deb27
```
Hotfix for MA-1981 and safe sessions
```
  Nimisha Asthagiri committed Jan 27, 2016
  233deb27 Browse Files
- Merge pull request #11166 from mitocw/gdm_feature_ccx_actual_apis_#119 · 806048d4
```
CCX REST APIs
```
  Peter Pinch committed Jan 27, 2016
  806048d4 Browse Files
- Update discussion markdown editor add link and image modals · 8c8953fe
  Christine Lytwynec committed Jan 27, 2016
  
  8c8953fe Browse Files
- Merge pull request #11353 from edx/andya/ignore_node_modules · 71c24efb
```
Ignore node_modules when checking Python quality
```
  Andy Armstrong committed Jan 27, 2016
  71c24efb Browse Files
- Ignore node_modules when checking Python quality · 4839bf4c
  Andy Armstrong committed Jan 27, 2016
  
  4839bf4c Browse Files
- Merge pull request #11333 from edx/benp/mgmt-command-enroll-in-course · f43e1961
```
Enroll already-existing user to a course via management command.
```
  Ben Patterson committed Jan 27, 2016
  f43e1961 Browse Files
- Enroll already-existing user to a course via management command. · 551eaaf7
```
Our current sandbox provisioning uses a create_user management command,
which creates and enrolls a user into a course. However, for TE-1128, we
will need a way to enroll the same user to multiple courses (which are
dynamic at time of provisioning). Using the existing management
command is no longer feasible for that, so we are using one that accesses
the enrollment API, which is the new standard for new enrollment capabilities.
```
  Ben Patterson committed Jan 27, 2016
  551eaaf7 Browse Files
- Added CCX REST APIs · e63194c1
```
CCX REST APIs
OAUTH2 authorization for CCX APIs
- oauth2 authorization required for ccx list.
- Course-instructor permission for ccx api endpoint
- Protection for detail view too.

Tests for CCX REST APIs and OAUTH2 authorization
```
  Giovanni Di Milia committed Jan 27, 2016
  e63194c1 Browse Files
- Merge pull request #11207 from edx/bderusha/yob-fix · f59144b7
```
Update age calculation to be more conservative.
```
  Bill DeRusha committed Jan 27, 2016
  f59144b7 Browse Files
- Merge pull request #11245 from edx/clytwynec/tnl-4040 · 9378c8ff
```
Fix file upload in IE
```
  Christine Lytwynec committed Jan 27, 2016
  9378c8ff Browse Files
- Merge pull request #11344 from edx/douglashall/PHX-241/upgrade_xblock_lti_consumer · 349b83f0
```
PHX-241 Upgrade xblock_lti_consumer
```
  Douglas Hall committed Jan 27, 2016
  349b83f0 Browse Files
- Merge pull request #11277 from edx/PERF-251 · 531347b4
```
Add the basis of configuring a cache TTL for course assets.
```
  Toby Lawrence committed Jan 27, 2016
  531347b4 Browse Files