Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3684 Commits

Author SHA1 Message Date
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
edx-pipeline-bot
b411fa0c79 Merge pull request #15765 from edx/release-mergeback-to-master 
Merge release back to master
 2017-08-07 13:51:57 -04:00
Brittney Exline
7bc87a5f56 Merge pull request #15754 from edx/douglashall/upgrade_enterprise_0_39_8 
Upgrading edx-enterprise to 0.39.8.
 2017-08-07 10:17:46 -04:00
Brad Melin
eb31db26b6 update problem-builder xblock install version 2017-08-07 10:38:58 +02:00
Eric Fischer
ca3a7c2608 edx-submissions patch release 
See https://github.com/edx/edx-submissions/pull/68 for details.

EDUCATOR-1090
 2017-08-05 17:53:09 -04:00
Eric Fischer
0356bfdd4d Revert "Merge pull request #15753 from edx/efischer/submissions_rc" 
This reverts commit 95d76568a5, reversing
changes made to aafd4d9c61.
 2017-08-04 22:28:29 -04:00
Douglas Hall
24b316e311 Upgrading edx-enterprise to 0.39.8. 
https://github.com/edx/edx-enterprise/compare/0.39.7...0.39.8
 2017-08-04 20:31:06 -04:00
Eric Fischer
2e6f2a72d0 Merge pull request #15752 from edx/efischer/submissions_rc 
patch release edx-submissions
 2017-08-04 16:56:18 -04:00
Eric Fischer
17e44491c8 patch release edx-submissions 2017-08-04 15:34:04 -04:00
Douglas Hall
a3c0e54cf2 Upgrade edx-enterprise package to 0.39.7. 
https://github.com/edx/edx-enterprise/compare/0.39.6...0.39.7
 2017-08-04 11:57:07 -04:00
Douglas Hall
8812664384 Upgrading edx-enterprise to 0.39.6. 
https://github.com/edx/edx-enterprise/compare/0.39.5...0.39.6
 2017-08-03 17:11:25 -04:00
Michael Roytman
0dddf9eb1a Merge pull request #15660 from edx/mroytman/PLAT_1495_django_1.11_upgrade_django-debug-toolbar 
update django-debug-toolbar from 1.5 to 1.8
 2017-08-03 10:10:34 -04:00
Michael Roytman
c565e2624e update django-debug-toolbar from 1.5 to 1.8 2017-08-02 15:12:13 -04:00
Brittney Exline
3c21041224 ENT-581 Upgrade enterprise package to 0.39.5 2017-08-02 14:52:19 -04:00
Eric Fischer
3f7a683c6d edx-submissions 2.0.6 upgrade 2017-08-02 11:09:49 -04:00
cahrens
5077ab5897 Django-wiki upgrades. 
EDUCATOR-784, EDUCATOR-1065
 2017-08-01 14:10:58 -04:00
muzaffaryousaf
2cdb9de5fb Bump edxval version 
This add CourseVideo table to Django Admin.

EDUCATOR-1036
 2017-08-01 12:03:41 +05:00
Douglas Hall
f1f22f4794 Upgrading edx-enteprise package to 0.39.3. 2017-07-31 17:20:00 -04:00