Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,405 Commits 1 Branch 0 Tags
3fcc904eaeabfbc84bb25de321fab49d76022fcc
Commit Graph

1392 Commits

Author SHA1 Message Date
Clinton Blackburn
f0030334af Added enrollment hash to login cookie 
This will allow the marketing site to determine if locally-stored enrollment data needs to be refreshed.

ECOM-4896
 2016-11-18 13:56:48 -05:00
Max Rothman
0f7f83ac1b Merge pull request #14024 from edx/release 
Merging release into master for hotfix-2016-11-17
 2016-11-18 11:34:47 -05:00
Robert Raposa
06b3b401ea Upgrade cryptography library. 2016-11-17 12:08:43 -05:00
cahrens
9196615322 Update ORA version 2016-11-15 13:18:15 -05:00
Eugeny Kolpakov
4e773095c3 Merge pull request #13941 from edx/hash-update/drag-and-drop-v2 
Hash update: Bumped DnDv2 to v2.0.12
 2016-11-14 10:17:19 +03:00
Christopher Lee
1ec55113af Merge pull request #13969 from edx/release 
Release hotfix-2016-11-08 patch-2016-11-10
 2016-11-10 12:51:51 -05:00
Jeremy Bowman
f05899b2ba Merge pull request #13930 from edx/PLAT-1074 
PLAT-1074 Add support for django-user-tasks
 2016-11-09 15:11:26 -05:00
Jeremy Bowman
3ee8fc130c PLAT-1074 Add support for django-user-tasks 2016-11-09 14:12:09 -05:00
Christopher Lee
2da026996d Merge pull request #13938 from open-craft/hotfix/2016-11-08 
Updates problem-builder to v2.6.1
 2016-11-09 13:20:06 -05:00
E. Kolpakov
f6ac90e873 Bumped DnDv2 to v2.0.12 (+fixed grading test, as DnDv2 now properly participates in scoring) 2016-11-09 12:35:57 +03:00
Brian Beggs
07b2b1a919 Merge pull request #13944 from edx/bbeggs/pillow-upgrade 
Upgrade Pillow CVE-2016-9190 CVE-2016-9189
 2016-11-08 23:46:32 -05:00
Brian Beggs
55e4813f3a Upgrade Pillow CVE-2016-9190 CVE-2016-9189 2016-11-08 16:58:34 -05:00
christopher lee
d3c3a9a63d Merge branch 'release' into release-2016-11-08-conflict 2016-11-08 14:23:57 -05:00
Jillian Vogel
8d6243ff0f Updates problem-builder to v2.6.1, which fixes the instructor_task import errors. 
Ref https://github.com/open-craft/problem-builder/pull/128
 2016-11-08 10:45:01 +10:30
Diana Huang
23a0099f6a Update to latest proctoring release. 2016-11-07 11:11:00 -05:00
Kevin Falcone
34ee0e050b Revert "Updates problem-builder version to use 2.6.0" 
https://openedx.atlassian.net/browse/TNL-5903

This reverts commit d6787cd13b.
This reverts commit 0016d1af4e.
 2016-11-07 10:31:15 -05:00
Matthew Piatetsky
586c9480a8 Merge pull request #13896 from edx/ECOM-5769_enable_jwt 
ECOM-5769 Add JWT auth and hidden flag to course_api for retrieving hidden courses
 2016-11-04 10:26:57 -04:00
Matthew Piatetsky
af976a0ef5 Add JWT auth and hidden flag to course_api 2016-11-03 17:35:45 -04:00
Max Rothman
68bf1c5263 Merge pull request #13890 from edx/max/nodeenv 
Switch to using nodeenv
 2016-11-03 11:03:33 -04:00
Diana Huang
1dde6bddbb Update xblock-lti-consumer version. 2016-11-02 15:56:26 -04:00
Kevin Falcone
0016d1af4e problem-builder's tags are vX.Y.Z not X.Y.Z 2016-11-02 11:34:04 -04:00
Max Rothman
1f22f47534 Switch to using nodeenv 2016-11-02 10:28:54 -04:00
Jillian Vogel
d6787cd13b Updates problem-builder version to use 2.6.0 
Ref: https://github.com/open-craft/problem-builder/pull/119
 2016-11-02 11:03:01 +10:30
Kevin Falcone
aae4bce3af Upgrade to django 1.8.16 for the security release 
https://www.djangoproject.com/weblog/2016/nov/01/security-releases/
 2016-11-01 11:29:03 -04:00
Andy Armstrong
afee725fb1 Allow authors to remove option for unproctored exams 
TNL-5084
 2016-10-31 16:58:15 -04:00
Diana Huang
5bb4fd1b8b Merge pull request #13859 from edx/release 
Merge Release back into master
 2016-10-28 09:42:18 -04:00
Eugeny Kolpakov
1dc7567282 Merge pull request #13723 from edx/ekolpakov/enterprise_app 
Enterprise Customer: model and admin integration
 2016-10-28 12:51:22 +03:00
Calen Pennington
2a3f8c9cf0 Upgrade django-babel-underscore and markey 2016-10-27 11:50:10 -04:00
Calen Pennington
a630cbe8bc Pin markey to 0.7 2016-10-27 11:05:02 -04:00
Diana Huang
804b302b4e Update proctoring version. 2016-10-26 13:23:20 -04:00
Jesse Zoldak
29cf6be876 Merge pull request #13821 from edx/zoldak/TE-1673 
Only install python coverage prereqs for coverage paver tasks  TE-1673
 2016-10-26 11:47:21 -04:00
Jesse Zoldak
fea64a66ff Only install python coverage prereqs for coverage paver tasks TE-1673 2016-10-26 10:15:08 -04:00
stu
a5420b11a1 add testing requirements file 2016-10-25 16:29:14 -04:00
E. Kolpakov
aab3ad5c35 Addded enterpirse app 2016-10-21 20:15:41 +03:00
George Song
f62eadaa17 Pin sqlparse to 0.2.x 2016-10-19 16:45:31 -07:00
Jesse Shapiro
6ccb74c7d5 Merge pull request #13323 from open-craft/upgrade-django-storage-swift 
Upgrading django-storage-swift module to take advantage of pending PR
 2016-10-19 09:27:23 -04:00
Jesse Shapiro
e431459cb5 Upgrade django-storage-swift to 1.2.12 2016-10-19 08:16:37 -04:00
Tim Krones
907801d6e4 Merge pull request #13611 from open-craft/itsjeyd/update-xblock-drag-and-drop-v2 
Update DnDv2 to v2.0.11.
 2016-10-19 09:02:34 +02:00
Nimisha Asthagiri
6e7f131c40 Merge pull request #13790 from edx/release 
Merge Release to Master
 2016-10-18 19:23:23 -04:00
Tim Krones
bbbf86e14a Update xblock-drag-and-drop-v2 to v2.0.11. 2016-10-18 09:41:10 +02:00
Brandon DeRosier
0fe1bde7d1 Update python-saml to latest version. 
For more details, see the release document: https://github.com/onelogin/python-saml/releases/tag/v2.2.0

(cherry picked from commit bec0aeeb42d9b30580eed51efcde2b089e3693c5)
 2016-10-17 17:32:51 -04:00
Deepa
f9c8e38df6 Update django-countries to the latest supported version 2016-10-17 21:48:19 +05:30
Eric Fischer
c98f3d74c0 Merge pull request #13636 from edx/efischer/ora_1.1.9 
ORA version update
 2016-10-13 15:01:55 -04:00
Nimisha Asthagiri
9ed598e607 Merge pull request #13708 from edx/jeskew/move_config_models_to_external_repo 
Remove config_models & use external config_models repo instead.
 2016-10-13 08:55:01 -04:00
John Eskew
9c3a1eba77 Change over to PyPI version of django-config-models. 2016-10-11 16:54:57 -04:00
Joel Barciauskas
9fa126dfac Merge pull request #13642 from edx/jbarciauskas/upgrade-dop-1.1.4-add-index 
Upgrade django-oauth2-provider to 1.1.4
 2016-10-11 12:42:18 -04:00
John Eskew
4fb3da23e4 Remove config_models & use external config_models repo instead. 2016-10-07 14:13:10 -04:00
John Eskew
60294f2739 Updating edx-django-release-util requirement to version 0.1.2 2016-10-07 10:20:16 -04:00
muhammad-ammar
c3b6b10478 Problem (capa) feedback UX revamp. 
TNL-4877
 2016-10-06 17:34:43 -04:00
Andy Armstrong
ecf4515b6e Introduce id verification step for proctored exams 
TNL-5083
 2016-10-05 17:22:35 -04:00