Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,952 Commits 1 Branch 0 Tags
08a2bc9620d194ad4e4792afbaad5f98469dce22
Commit Graph

34952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nimisha Asthagiri
08a2bc9620 Merge pull request #11358 from edx/release 
Hotfix for MA-1981 and safe sessions
 2016-01-27 15:53:20 -05:00
Nimisha Asthagiri
233deb27be Merge pull request #11340 from edx/hotfix/2016-01-26 
Hotfix for MA-1981 and safe sessions
 2016-01-27 14:51:09 -05:00
Peter Pinch
806048d4bb Merge pull request #11166 from mitocw/gdm_feature_ccx_actual_apis_#119 
CCX REST APIs
 2016-01-27 14:43:30 -05:00
Andy Armstrong
71c24efb6c Merge pull request #11353 from edx/andya/ignore_node_modules 
Ignore node_modules when checking Python quality
 2016-01-27 14:41:18 -05:00
Andy Armstrong
4839bf4c21 Ignore node_modules when checking Python quality 2016-01-27 13:41:27 -05:00
Ben Patterson
f43e19615b Merge pull request #11333 from edx/benp/mgmt-command-enroll-in-course 
Enroll already-existing user to a course via management command.
 2016-01-27 12:39:39 -05:00
Ben Patterson
551eaaf706 Enroll already-existing user to a course via management command. 
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.
 2016-01-27 11:49:31 -05:00
Giovanni Di Milia
e63194c1cd Added CCX REST APIs 
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
 2016-01-27 11:04:28 -05:00
Bill DeRusha
f59144b7e3 Merge pull request #11207 from edx/bderusha/yob-fix 
Update age calculation to be more conservative.
 2016-01-27 10:48:47 -05:00
Christine Lytwynec
9378c8ff28 Merge pull request #11245 from edx/clytwynec/tnl-4040 
Fix file upload in IE
 2016-01-27 09:44:11 -05:00
Douglas Hall
349b83f072 Merge pull request #11344 from edx/douglashall/PHX-241/upgrade_xblock_lti_consumer 
PHX-241 Upgrade xblock_lti_consumer
 2016-01-27 09:25:53 -05:00
Toby Lawrence
531347b463 Merge pull request #11277 from edx/PERF-251 
Add the basis of configuring a cache TTL for course assets.
 2016-01-27 08:38:16 -05:00
Ahsan Ulhaq
7c8de429d9 Merge pull request #11337 from edx/ahsan/Update-edx-organizations-version 
Add latest edx-organization version in the platform
 2016-01-27 14:14:11 +05:00
Ahsan Ulhaq
18c1f86a67 Add latest edx-organization version in the platform 2016-01-27 13:27:46 +05:00
Clinton Blackburn
aed41b1556 Merge pull request #11332 from edx/clintonb/opaque-keys-update 
Installing edx-opaque-keys from PyPI
 2016-01-26 21:57:54 -05:00
Toby Lawrence
01a9ad2369 Add support to enhance the cacheability of course assets. 
This introduces a mechanism to control the time-to-live for an unlocked
course asset, which will allow browsers and intermediate proxies/caches
to cache these course assets, determinstically.

Locked assets, with their nature of requiring authorization, are not
eligible for caching.
 2016-01-26 21:09:18 -05:00
Nimisha Asthagiri
e76e05fa77 Specially handle login redirect for mobile apps 2016-01-26 17:23:04 -05:00
Nimisha Asthagiri
f3cb692472 Safe Session Cookies Middleware 2016-01-26 17:23:03 -05:00
Cliff Dyer
44e4569d49 Merge pull request #11343 from edx/cdyer/derped-oauth-settings 
Call dict.get properly in settings.
 2016-01-26 16:51:07 -05:00
Douglas Hall
8bc41cb3e2 Upgrade xblock_lti_consumer to pull in responsive modal launch improvements 2016-01-26 16:43:56 -05:00
J. Cliff Dyer
9798d2e1db Call dict.get properly in settings. 2016-01-26 21:39:29 +00:00
Clinton Blackburn
341d00dbcd Installing edx-opaque-keys from PyPI 
The package formerly known as opaque-keys now lives on PyPI as edx-opaque-keys. Additionally, the zendesk requirement has been moved to the correct location.
 2016-01-26 15:46:40 -05:00
Nimisha Asthagiri
3a6fbae60c Reorder transformers to fix MA-1981. 2016-01-26 15:46:15 -05:00
Eric Fischer
7d773df52d Merge pull request #11171 from edx/andya/fix-discussion-more-icons 
Fix bug with discussion response "More..." actions
 2016-01-26 15:08:41 -05:00
Adam
fa74b9f139 Merge pull request #11339 from edx/merge-release-into-master 
Merge release into master
 2016-01-26 15:00:38 -05:00
Bill DeRusha
77668afa11 Update age calculation to be more conservative. 2016-01-26 13:19:51 -05:00
jsa
46638d7f75 fix reference to reverted test method. 2016-01-26 13:18:00 -05:00
Eric Fischer
d1ef73e90a Don't renderAttrs unnecessarily 
It is unneeded here, and causes bad behavior.
 2016-01-26 13:08:42 -05:00
Andy Armstrong
10ca0a3870 Discussion Test Updates 
Updates discussion tests to not mock out so much. Also adds new
test coverage for the bug being investigated here.
 2016-01-26 13:08:42 -05:00
Adam Palay
c37715a7c7 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt
 2016-01-26 11:25:41 -05:00
Adam
55b7fa4924 Merge pull request #11309 from edx/rc/2016-01-26 
Release Candidate rc/2016-01-26
 2016-01-26 11:12:19 -05:00
Cliff Dyer
40ff300efd Merge pull request #11237 from edx/cdyer/custom-oauth-expires 
Create hooks to customize OAuth2 token lifetimes.
 2016-01-26 10:05:13 -05:00
Adam
5a5b5e8026 Merge pull request #11279 from edx/remove-old-mgmnt-commands 
remove old  management commands
 2016-01-26 09:23:25 -05:00
Matt Drayer
b575d50ae0 Merge pull request #11287 from edx/ziafazal/WL-287 
ziafazal/WL-287: moved IS_EDX_DOMAIN dependent features to edx.org theme
 2016-01-25 22:27:25 -05:00
David Ormsbee
e851db58fe Merge pull request #11325 from edx/ormsbee/remove_old_sass 
Remove unused scss files.
 2016-01-25 17:13:45 -05:00
Cliff Dyer
f0908249ca Merge pull request #11301 from edx/cdyer/exif-rotation 
Preserve EXIF orientation data for profile images. (MA-1559)
 2016-01-25 15:27:17 -05:00
Jesse Zoldak
d6b258fdeb Merge pull request #11265 from edx/zoldak/bok-choy-clean 
Do not clean test files with bok choy testsonly command
 2016-01-25 15:25:03 -05:00
Adam Palay
46066c04af resolve quality violation 2016-01-25 15:04:19 -05:00
Adam
d7c154d923 Merge pull request #11328 from edx/revert-migration-rc 
Revert migration rc
 2016-01-25 14:23:29 -05:00
J. Cliff Dyer
2b6ae74885 fixup: dedupe test code. 2016-01-25 19:22:58 +00:00
Jim Abramson
a48b8b27bf Merge pull request #11318 from edx/jsa/ecom-3523 
Add COURSE_CERT_AWARDED signal and celery task stub
 2016-01-25 14:10:49 -05:00
Diana Huang
640b5d31f4 Merge pull request #10699 from doganov/TNL-3644 
Fixes TNL-3664 by collapsing actions dropdown after an action item is clicked.
 2016-01-25 13:43:24 -05:00
Adam Palay
cfab793cd3 Revert "Merge pull request #11302 from edx/ahsan/ECOM-3486-add-organization-api" 
This reverts commit 8bc8b6cafd, reversing
changes made to c2255ef0d6.
 2016-01-25 13:36:26 -05:00
Ben Patterson
fb9f818445 Merge pull request #11327 from edx/benp/fix-builds-jan2016 
edx-user-state-client is still needed.
 2016-01-25 13:14:34 -05:00
Adam Palay
bb2d75d80e Revert "Merge pull request #11241 from edx/feature/credentials-phase-1" 
This reverts commit 46df454536, reversing
changes made to 039e6cdfe6.
 2016-01-25 12:46:57 -05:00
Adam Palay
6b937a8db3 Revert "Merge pull request #11311 from edx/jsa/fail-safe-reverse" 
This reverts commit 0d1765e190, reversing
changes made to d2eaa63353.
 2016-01-25 12:45:50 -05:00
Adam Palay
c9c8116da7 Revert "Merge pull request #11324 from edx/ahsan/rc-add-service-user-in-cms" 
This reverts commit a84b81113b, reversing
changes made to 0d1765e190.
 2016-01-25 12:45:07 -05:00
Ben Patterson
9a23bb6050 edx-user-state-client is still needed. 2016-01-25 12:08:15 -05:00
clrux
519e292d82 Merge pull request #11294 from edx/clrux/ac-323 
Adjusting .sr mixins for NVDA/JAWS on Windows
 2016-01-25 11:53:11 -05:00
J. Cliff Dyer
2c2f5e3b46 Improve local settings variable name. 2016-01-25 16:25:56 +00:00