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

1418 Commits

Author SHA1 Message Date
Matjaz Gregoric
3c3b4f442f Merge pull request #14044 from open-craft/mtyaka/problem-builder-bump 
Bump problem-builder to v2.6.5
 2016-12-13 07:51:27 +01:00
Brian Mesick
cc91ec7d79 Merge pull request #14115 from edx/bmedx/django-1.8.17 
PLAT1122 - Upgrade Django to 1.8.17
 2016-12-12 13:48:25 -05:00
Matjaz Gregoric
86177cba7f Bump problem-builder to v2.6.5. 
It includes support for course keys longer than 50 characters.

See: https://github.com/open-craft/problem-builder/pull/131
 2016-12-12 18:01:55 +01:00
Jesse Shapiro
fc814aee95 Add data sharing consent features for EnterpriseCustomer 2016-12-12 09:30:38 -05:00
Eric Fischer
d0be0ae8ec ORA2 and edx-submissions releases 2016-12-09 13:46:34 -05:00
Sven Marnach
6e801631d8 Merge pull request #14104 from open-craft/smarnach/enterprise-enrollment 
Changes required for the Enterprise app enrollment feature.
 2016-12-09 16:01:27 +01:00
Sven Marnach
2690a77151 Changes required for the Enterprise app enrollment feature. 2016-12-08 17:53:31 +01:00
Mushtaq Ali
bbcb6c1344 Merge pull request #14113 from edx/mushtaq/edxval-version-bump-fix 
Fix edx-val version upgrade string
 2016-12-08 12:01:32 +05:00
bmedx
a29b936d1d PLAT1122 - Upgrade Django to 1.8.17 2016-12-07 13:32:24 -05:00
Tim Krones
ff7c2f8c85 Merge pull request #14085 from open-craft/itsjeyd/xblock-poll-update 
Update xblock-poll to v1.2.3
 2016-12-07 14:15:37 +01:00
Mushtaq Ali
bd557e14ac Fix edx-val version upgrade string 2016-12-07 11:59:02 +05:00
Brittney Exline
5d4514d716 Merge pull request #14099 from edx/release 
Hotfix Dec-1-2016 and Release Dec-6-2016
 2016-12-06 15:59:46 -05:00
Jeremy Bowman
7a7c73de85 Merge pull request #14109 from edx/user_tasks_upgrade 
Upgrade django-user-tasks to resolve makemigrations issue
 2016-12-06 09:29:47 -05:00
Mushtaq Ali
313493b75c edx-val version bump to 0.0.11 -TNL-6094 2016-12-06 15:24:16 +05:00
Tim Krones
d57aab99b4 Update xblock-poll. 2016-12-06 10:06:53 +01:00
jmbowman
56defd4872 Upgrade django-user-tasks to resolve makemigrations issue 2016-12-05 21:46:18 +00:00
Max Rothman
30051a9e2c Merge pull request #14082 from edx/edx-django-release-util/0.2.0 
Change edx-django-release-util version.
 2016-12-05 11:07:42 -05:00
Calen Pennington
b24c22804e Merge pull request #14047 from cpennington/safer-opaque-keys 
Safer opaque keys
 2016-12-02 10:44:36 -05:00
Calen Pennington
fd0d69594a Upgrade to the latest version of opaque-keys 2016-12-01 13:04:31 -05:00
Brian Beggs
6d593b5c07 Updating edx-django-release-util requirement to version 0.2.0 2016-12-01 10:36:45 -05:00
Gregory Martin
41e852fed5 Merge pull request #14059 from edx/yro_fix-montevideo-tz 
Yro fix montevideo tz
 2016-11-30 15:25:31 -05:00
Eric Fischer
264d1940bf Merge pull request #13989 from proversity-org/proversity/fix-removed-in-django-19-warning-studio 
Remove warning RemovedInDjango19Warnings in Studio
 2016-11-30 15:06:30 -05:00
Gregory Martin
83cfeb9d88 update pytz, update ora-2 2016-11-30 11:44:48 -05:00
Kevin Falcone
2b88cf8300 7 Months of bugfixes and features 
https://docs.newrelic.com/docs/release-notes/agent-release-notes/python-release-notes
 2016-11-30 10:50:03 -05:00
jagonzalr
e9b121b8cd prevent RemovedInDjango19Warnings 2016-11-30 10:06:13 -05:00
muhammad-ammar
dd45991926 soft delete video from video uploads page 
TNL-5899
 2016-11-21 15:14:57 +05:00
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