Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,569 Commits 1 Branch 0 Tags
6e10d2a5568580c784eebbf736b304a089a090f1
Commit Graph

1750 Commits

Author SHA1 Message Date
Eric Fischer
179774e107 edx-ora2 2.1.1 2017-09-06 14:40:11 -04:00
Eric Fischer
29f6d5d610 Merge pull request #15954 from edx/ora/2.0.5 
ORA patch release
 2017-09-05 14:55:25 -04:00
Eric Fischer
a67f9ee7ff ORA patch release 2017-09-05 14:03:41 -04:00
Brittney Exline
ba597331d7 ENT-496 Set consent_granted to None when calling enterprise-course-enrollment endpoint 
Since we have a separate call to grant consent, we shouldn't try to set that value on
the enterprise course enrollment anymore, because it causes errors.
 2017-09-05 13:32:24 -04:00
Nimisha Asthagiri
7953322faf PIN version number of ACE 2017-09-01 14:58:48 -04:00
Eric Fischer
44013d700e Revert "Merge pull request #15939 from edx/efischer/ora_204" 
This reverts commit a403fd1491, reversing
changes made to b31287e264.

500 errors on prod, need to rethink this fix.
 2017-09-01 12:57:39 -04:00
Brittney Exline
740aad4c77 Merge pull request #15923 from edx/saleem-latif/ENT-608 
ENT-608: edx-enterprise version upgrade to 0.42.0
 2017-09-01 12:53:57 -04:00
Gabe Mulley
873f7cbd8d restrict ace deps 2017-09-01 10:44:05 -04:00
Saleem Latif
8fe73a9b3e edx-enterprise version upgrade to 0.42.0 2017-09-01 10:24:45 -04:00
Nimisha Asthagiri
c08060a0bb Merge pull request #15745 from edx/ret/triggered-email 
RET triggered emails
 2017-08-31 20:44:43 -04:00
Eric Fischer
d02c580123 edx-ora2 2.0.4 release 2017-08-31 17:21:24 -04:00
Gabe Mulley
6a36eb0183 Use ACE to 'send' Recurring Nudge emails 2017-08-31 16:58:08 -04:00
Uman Shahzad
197c06a1e4 Bump edx-enterprise to 0.41.0. 
This incorporates a migration that copies data
from certain models to another.
 2017-08-31 10:41:45 -04:00
Jeremy Bowman
00c4ede8ee Merge pull request #15831 from edx/jmbowman/PLAT-1710 
PLAT-1710 Support lettuce tests in Docker Devstack
 2017-08-29 13:25:58 -04:00
Ari Rizzitano
19dec17e7b Merge pull request #15806 from edx/ari/ss-review-report 
expand proctored exam report to include violation summary
 2017-08-29 10:10:50 -04:00
Douglas Hall
6904fafc4a Upgrade edx-enterprise to 0.40.7. 
https://github.com/edx/edx-enterprise/compare/0.40.6...0.40.7

ENT-612
 2017-08-24 12:46:47 -04:00
Feanil Patel
d6e75a8523 Merge pull request #15862 from open-craft/cliff/pb-migrate-keys 
Update problem-builder requirement to 2.6.5patch2 to migrate keys.
 2017-08-24 11:57:26 -04:00
Jesse Shapiro
7178c15706 Update Enterprise to 0.40.6 2017-08-23 14:50:52 -04:00
Ari Rizzitano
f39833c709 expand proctored exam report to include violation summary 
EDUCATOR-411

hit new report endpoint
EDUCATOR-411

bad syntax

python join != js join

csv headings list too long for task

fix string formatting

fix wrong set of keys

bump edx-proctoring to 1.2.0
 2017-08-23 11:10:13 -04:00
Saleem Latif
5d7d191e19 Version upgrade for edx-enterprise that contains fix for 500 error on enterprise landing page. 2017-08-23 17:22:42 +05:00
Eric Fischer
926e5a49bb update edx-ora2 2017-08-22 14:54:37 -04:00
Brittney Exline
8c2586f68c Merge pull request #15859 from edx/bexline/enterprise_version_bump 
ENT-585 Enterprise: Change course modal to use discovery api
 2017-08-22 13:29:53 -04:00
Brian Mesick
6f30dedb56 Merge pull request #15821 from edx/bmedx/upgrade_django_model_utils 
Upgrade of django-model-utils to 3.0.0 for Django 1.11 support
 2017-08-22 10:51:46 -04:00
J. Cliff Dyer
dae7ce4988 Update problem-builder requirement to 2.6.5patch2 to migrate keys. 2017-08-22 07:41:06 -04:00
Brittney Exline
b6e4e175dc ENT-585 Enterprise: Change course modal to use discovery api 2017-08-21 15:04:00 -04:00
Michael Roytman
e8e01a99d5 Merge pull request #15782 from edx/mroytman/PLAT-1612-upgrade-django-babel-underscore 
PLAT-1612: Upgrade edx-platform to use new django-babel-underscore (0.5.2)
 2017-08-21 10:54:42 -04:00
Douglas Hall
79660788f7 Upgrading the edx-organizations package to 0.4.6. 
This fixes a bug with the organizations API's get_organization function.
 2017-08-18 15:59:57 -04:00
Michael Roytman
f2c2402068 update to new version of django-babel-underscore, which supports Django 1.8 - Django 1.11 2017-08-18 10:25:44 -04:00
Jesse Shapiro
7a31441ebc Move to new consent API 2017-08-16 22:58:09 -04:00
Jeremy Bowman
1f06604694 PLAT-1710 Support lettuce tests in Docker Devstack 2017-08-16 17:30:18 -04:00
bmedx
f538aafe98 Upgrade of django-model-utils to 3.0.0 for Django 1.11 support 2017-08-15 11:19:45 -04:00
Ned Batchelder
775393a194 Use commit hashes on all non-edX GitHub requirements 2017-08-15 10:28:53 -04:00
Jeremy Bowman
9e3f35db22 PLAT-1676 Use pytest for bok-choy tests 2017-08-14 11:49:39 -04:00
Uman Shahzad
bfb5531110 Bump edx-enterprise to 0.40.1. 
This adds a new DataSharingConsent model, but it is unused for now.
 2017-08-14 10:40:36 +05:00
Eric Fischer
064f277b3b Merge pull request #15736 from edx/efischer/ora-2.0.0 
edx-ora2 2.0.0
 2017-08-11 12:32:27 -04:00
Eric Fischer
198b2522df Finalize edx-ora2 2.0.x upgrade 
Includes updated versions of edx-submissions, jsonfield.
 2017-08-11 09:56:04 -04:00
Uman Shahzad
979825b7fb Bump edx-enterprise to 0.40.0. 
This incorporates the new Programs and Catalogs endpoints.
 2017-08-11 15:27:31 +05:00
Sarah Fischmann
0a8fc51f96 bump proctoring version to 1.1.0 2017-08-10 13:07:13 -04:00
Tyler Hallada
842ce8365f Fix python tests and use proctoring 1.0.0 2017-08-09 18:08:37 -04:00
Tyler Hallada
537966ab1e Merge branch 'master' into EDUCATOR-926 2017-08-09 16:22:09 -04:00
sarahkf
679bd2c6a6 Merge pull request #15743 from edx/sarahkf/proctor-review-rules 
Adding link to proctor review rules in Studio
 2017-08-09 15:06:57 -04:00
Sarah Fischmann
2511c9fad6 Adding link to proctor review rules in Studio 
Allows instructors to see a link to the online proctoring review rules documentation while configuring and exam to be a proctored exam. Also updates the GitHub requirements to point to the newest 0.19.0 release of edx-proctoring.

EDUCATOR-757
 2017-08-09 12:48:02 -04:00
Braden MacDonald
b58579526c Revert "Update problem-builder xblock install version (PLAT-1644)" 2017-08-09 09:05:05 -07:00
Tyler Hallada
623ea5eb40 Merge branch 'master' into EDUCATOR-926 2017-08-09 11:22:05 -04:00
Brian Mesick
7f32e03dd2 Merge pull request #15766 from edx/bmedx/ratelimit_upgrade_PLAT-1633 
Upgrade django-ratelimit-backend to Django 1.11
 2017-08-09 10:59:24 -04:00
Brian Mesick
1d47211245 Merge pull request #15768 from open-craft/bradmerlin/problem-builder-version-bump 
Update problem-builder xblock install version (PLAT-1644)
 2017-08-09 10:58:32 -04:00
zubair-arbi
e5925c3f2a bump enterprise version from 0.39.8 to 0.39.9 
ENT-557
 2017-08-09 12:47:13 +05:00
John Eskew
27557a0d92 Merge pull request #15746 from edx/jeskew/celery_modules_to_django1.11_compat 
Upgrade celery modules to Django 1.11-compatible versions.
 2017-08-08 14:07:41 -04:00
John Eskew
1630d052a0 Upgrade celery modules to Django 1.11-compatible versions. 2017-08-07 16:56:06 -04:00
bmedx
48e6e552f2 PLAT-1633: Upgrade django-ratelimit-backend to 1.1.1 2017-08-07 15:34:21 -04:00