John Eskew
c14727539f
Move back to upstream edx-sga requirement.
2017-11-08 09:26:01 -05:00
Feanil Patel
9a35a5439e
Revert "Transcript secure credentials"
2017-11-07 13:07:32 -05:00
Jeremy Bowman
c2daef61d5
Merge pull request #16471 from edx/jmbowman/upgrade-django-cors-headers
...
Upgrade django-cors-headers for Django 1.11 support
2017-11-07 11:46:54 -05:00
Mushtaq Ali
093bdcb1f8
Merge pull request #16201 from edx/transcript-secure-credentials
...
Transcript secure credentials
2017-11-07 16:57:38 +05:00
Qubad786
2310614bb6
Save credentials in edx-video-pipeline
...
EDUCATOR-1335 - This Adds a dedicated app which is responsible for communication with edx-video-pipeline service. It also adds the backend for saving 3rd party transcription service credentials on edx-video-pipline and cache it in edx-val.
2017-11-07 13:18:58 +05:00
Jeremy Bowman
fe7fb0a874
Upgrade django-cors-headers for Django 1.11 support
2017-11-06 14:47:22 -05:00
Saleem Latif
73d7947b05
enterprise version upgrade to 0.53.11
2017-11-06 19:52:26 +05:00
Farhanah Sheets
33335f7ade
Merge pull request #15933 from edx/george/reinstate-pr-15641
...
Toggle timer visibility on timed exams #15641
https://github.com/edx/edx-platform/pull/15641
2017-11-06 09:28:47 -05:00
Awais Jibran
81461610da
Merge pull request #16438 from edx/aj/fix-django-wiki-links
...
Fix Django Wiki Links Issue
2017-11-06 18:08:32 +05:00
Awais Jibran
96dd282970
Fix Django Wiki Links Issue
...
EDUCATOR-1655
2017-11-06 16:08:10 +05:00
Farhanah Sheets
b482fbec60
Update to latest proctoring release
...
https://github.com/edx/edx-proctoring/releases/tag/1.3.0
2017-11-03 15:38:44 -04:00
Fred Smith
c02c4f9fb7
Merge pull request #15325 from isms/sandbox-cryptography
...
Add cryptography package to sandbox environment
2017-11-03 13:53:14 -04:00
Bessie Steinberg
00fd7b6bfa
update edx-enterprise to version 0.53.10
2017-11-03 12:45:36 -04:00
zubair-arbi
c4d6a7101f
bump enterprise version from 0.53.7 to 0.53.9
2017-11-02 17:15:13 +05:00
Douglas Hall
3b865c92c5
Upgrade edx-enterprise to 0.53.7.
...
https://github.com/edx/edx-enterprise/compare/0.53.6...0.53.7
2017-10-30 20:32:20 -04:00
zubair-arbi
9fe65434c0
bump enterprise version from 0.53.5 to 0.53.6
2017-10-30 19:32:15 +05:00
Jeremy Bowman
ba06372cac
PLAT-1780 Remove dependency on django-extensions
2017-10-27 13:19:12 -04:00
Jeremy Bowman
e4ef8e0620
Merge pull request #16347 from edx/jmbowman/PLAT-1766
...
PLAT-1766 Upgrade django-cas for Django 1.11 compatibility
2017-10-27 12:14:04 -04:00
Saleem Latif
b9e622b471
enterprise version upgrade to 0.53.5
2017-10-27 19:09:53 +05:00
zubair-arbi
3d36f3346e
Update enterprise version to 0.53.4
2017-10-27 15:42:17 +05:00
Jeremy Bowman
de210a57ed
PLAT-1766 Upgrade django-cas for Django 1.11 compatibility
2017-10-25 16:35:44 -04:00
John Eskew
f28542d319
fixup! fixup! Use branched version of edx-sga.
2017-10-25 15:19:39 -04:00
John Eskew
7ede9a325a
fixup! Use branched version of edx-sga.
2017-10-25 12:12:23 -04:00
John Eskew
725418dd38
Used tagged version of ORA2 - 2.1.3
2017-10-25 11:49:13 -04:00
John Eskew
8639e95994
Use branched version of edx-sga.
2017-10-25 11:49:13 -04:00
Douglas Hall
97bb6a344b
Updating edx-enterprise requirement to 0.53.1.
...
https://github.com/edx/edx-enterprise/compare/0.53.0...0.53.1
2017-10-24 14:19:26 -04:00
Uman Shahzad
26d22ea154
Bump edx-enterprise to 0.53.0.
2017-10-24 20:51:29 +05:00
Calen Pennington
eff9c9c9ab
Move common attributes into Resolver.__init__
2017-10-24 10:15:36 -04:00
zubair-arbi
dc20549c6d
bump enterprise version from 0.52.4 to 0.52.10
...
ENT-675
2017-10-23 19:49:58 +05:00
John Eskew
5c03f6554d
Upgrade django-simple-history and edx-enterprise together.
2017-10-20 11:42:08 -04:00
Brittney Exline
23640d0019
ENT-594 Enterprise version bump and Add settings variable for ENTERPRISE_REPORTING_SECRET
2017-10-19 12:24:05 -04:00
Uman Shahzad
80084bb295
Bump edx-enterprise to 0.52.2.
2017-10-18 16:09:11 +05:00
Uman Shahzad
4055cc00cc
Bump edx-enterprise to 0.52.1.
2017-10-18 00:50:00 +05:00
Muzaffar yousaf
b34b5d9a12
Merge pull request #15872 from edx/video-transcript-preferences
...
Video transcript preferences
2017-10-17 14:45:29 +05:00
edx-pipeline-bot
c011e7134d
Merge pull request #16243 from edx/release-mergeback-to-master
...
Merge release back to master
2017-10-16 14:14:37 -04:00
Gabe Mulley
4a13f9bf53
ACE writes to a file by default
2017-10-16 12:17:25 -04:00
muzaffaryousaf
d4147e7d37
Update edx-val dependency.
2017-10-16 19:23:39 +05:00
John Eskew
1f36bf0876
Add django-simple-history back to edx-platform as a requirement.
...
The module is still used by (at least) edx-enterprise.
2017-10-16 09:42:22 -04:00
Douglas Hall
6387e3a813
Merge pull request #16225 from edx/asadiqbal08/ENT-694
...
Enterprise- Version bumped to 0.51.5
2017-10-16 09:17:43 -04:00
asadiqbal
c5be291e6f
Version bumped
2017-10-13 11:31:07 +05:00
John Eskew
737ebccb74
Remove django-simple-history and all HistoricalRecords.
2017-10-11 11:36:06 -04:00
Waheed Ahmed
0702df51bf
Merge pull request #16114 from edx/waheed/LEARNER-2320-upgrade-edx-organizations-version
...
Upgrading the edx-organizations package to 0.4.7.
2017-10-11 20:20:14 +05:00
Waheed Ahmed
5cb908991f
Upgrading the edx-organizations package to 0.4.7.
...
Added explicit 'fields' attribute to OrganizationSerializer. Creating a
ModelSerializer without either the 'fields' attribute or the 'exclude'
attribute has been deprecated since 3.3.0.
LEARNER-2320
2017-10-11 18:03:00 +05:00
Douglas Hall
ca903278f5
Updating edx-enterprise to 0.51.2.
...
https://github.com/edx/edx-enterprise/compare/0.51.0...0.51.2
2017-10-11 08:47:50 -04:00
Uman Shahzad
7516453c14
Bump to 0.51.1.
2017-10-11 02:05:04 +05:00
Bill Filler
dd16bf7685
bump edx-enterprise version to 0.51.0
2017-10-05 17:14:28 -04:00
John Eskew
b07826cbc0
Merge pull request #16148 from edx/jeskew/initial_django_1.11_startup_changes
...
Initial Django 1.11 startup changes
2017-10-05 12:48:26 -04:00
John Eskew
8b5b1eba86
Use Django 1.11 compatible version of django-countries.
2017-10-05 11:12:51 -04:00
Douglas Hall
1d1bd3ffa4
Merge pull request #16156 from open-craft/haikuginger/enterprise-0.50.1
...
[ENT-649] Update Enterprise to 0.50.1
2017-10-05 08:53:00 -04:00
attiyaishaque
a7e5d43f54
Update edx-proctoring to 1.2.3.
2017-10-04 12:32:26 +05:00
