Commit Graph

3684 Commits

Author SHA1 Message Date
syed-awais-ali
375190f4f8 added redis version 2017-11-27 18:37:17 +05:00
Mushtaq Ali
37bbfd0a5c VAL version bump - EDUCATOR-1809 2017-11-27 18:09:02 +05:00
ayub-khan
992832ca0b update django-wiki version 2017-11-23 14:32:53 +05:00
Matjaz Gregoric
d403e5f8b1 Introduce LMS_INTERNAL_ROOT_URL.
The LMS and edx-enterprise currently communicate via REST APIs, even
though they are all running within the same service.

Currently API URLs are constructed using LMS_ROOT_URL, but that is
problematic on some systems where the external LMS_ROOT_URL is not
accessible from the private network, or routing internal requests via
the external URL is not desireable.

This patch introduces a new setting variable LMS_INTERNAL_ROOT_URL which
defaults to the value of LMS_ROOT_URL for backwards compatibility.

The LMS and edx-enterprise will use LMS_INTERNAL_ROOT_URL to construct
API URLs instead of LMS_ROOT_URL.
2017-11-23 08:17:38 +01:00
Brian Beggs
423b932e9e Pin sorl-thumbnail to 12.3 2017-11-22 15:44:26 -05:00
Jeremy Bowman
6457e76d02 Merge pull request #16612 from edx/jmbowman/PLAT-1199
PLAT-1199 Stop using pycrypto
2017-11-21 12:45:19 -05:00
Jeremy Bowman
43a11af735 PLAT-1199 Stop using pycrypto 2017-11-21 11:25:48 -05:00
rabia23
3a50091e81 update edx-organizations version 2017-11-20 14:12:48 +00:00
asadiqbal
e5c55a8945 ENT-729 2017-11-16 16:28:31 +05:00
Brian Mesick
dad73637aa Merge pull request #16495 from edx/bmedx/django111_startup_fixes
Changes necessary for Django 1.11 tests to start
2017-11-14 12:19:21 -05:00
Uman Shahzad
b46b65276a Bump edx-enterprise to 0.53.13. 2017-11-14 16:41:19 +05:00
rabiaiftikhar
e8a2629cfc update edx-proctoring version 2017-11-14 11:35:33 +05:00
bmedx
f3f8d8ec96 Changes necessary for Django 1.11 tests to start
- Certificates management commands updates
- Moving reverse calls in tests into setUp from class definition
- Import shuffling
- Consolidating cryptograhpy version to 1.9
2017-11-13 15:45:32 -05:00
Muzaffar yousaf
c1c8c20b76 Merge pull request #16517 from edx/subtitle-migrations
Clean makemigration test and bump the val version.
2017-11-14 01:09:04 +05:00
Douglas Hall
5c3f509807 Merge pull request #16525 from edx/uman/0.53.12
[ENT-633] Upgrade edx-enterprise to 0.53.12.
2017-11-09 15:25:50 -05:00
Jeremy Bowman
e71f64dc28 Merge pull request #16500 from edx/jmbowman/django-ses-upgrade
Upgrade django-ses for Django 1.11 support
2017-11-09 14:51:26 -05:00
Jeremy Bowman
0edcf26a90 Merge pull request #16505 from edx/jmbowman/upgrade_ora2
Upgrade edx-ora2
2017-11-09 13:11:40 -05:00
Uman Shahzad
7b90f2c593 Upgrade edx-enterprise to 0.53.12. 2017-11-09 23:06:56 +05:00
muzaffaryousaf
db07a049bf Clean makemigration test and bump the val version. 2017-11-09 17:48:45 +05:00
Jeremy Bowman
f725e3a6ab Upgrade edx-ora2 2017-11-08 16:29:22 -05:00
Jeremy Bowman
4f55221bdf Upgrade django-ses for Django 1.11 support 2017-11-08 13:44:25 -05:00
muzaffaryousaf
74a86e06c7 Bump the val version (excluding migrations for subtitles) 2017-11-08 21:18:00 +05:00
Muzaffar yousaf
7157ec2e2f Revert "Revert "Transcript secure credentials"" 2017-11-08 21:18:00 +05:00
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