Skip to content

E
edx-platform
Commit bfc665e5 by Jillian Vogel Committed by GitHub
Options

Merge pull request #14768 from open-craft/jill/ent-259 

Bumps edx-enterprise version to 0.29.0
parents f053ed6b 9660e132
Showing with 6 additions and 1 deletions
cms/envs/common.py
...@@ -319,6 +319,7 @@ AUTHENTICATION_BACKENDS = ( ...@@ -319,6 +319,7 @@ AUTHENTICATION_BACKENDS = (
LMS_BASE = None LMS_BASE = None
LMS_ROOT_URL = "http://localhost:8000" LMS_ROOT_URL = "http://localhost:8000"
ENTERPRISE_API_URL = LMS_ROOT_URL + '/enterprise/api/v1/'
# These are standard regexes for pulling out info like course_ids, usage_ids, etc. # These are standard regexes for pulling out info like course_ids, usage_ids, etc.
# They are used so that URLs with deprecated-format strings still work. # They are used so that URLs with deprecated-format strings still work.
...@@ -1250,3 +1251,7 @@ RETRY_ACTIVATION_EMAIL_TIMEOUT = 0.5 ...@@ -1250,3 +1251,7 @@ RETRY_ACTIVATION_EMAIL_TIMEOUT = 0.5
# How long until database records about the outcome of a task and its artifacts get deleted? # How long until database records about the outcome of a task and its artifacts get deleted?
USER_TASKS_MAX_AGE = timedelta(days=7) USER_TASKS_MAX_AGE = timedelta(days=7)
############## Settings for the Enterprise App ######################
ENTERPRISE_ENROLLMENT_API_URL = LMS_ROOT_URL + "/api/enrollment/v1/"
requirements/edx/base.txt
...@@ -52,7 +52,7 @@ edx-lint==0.4.3 ...@@ -52,7 +52,7 @@ edx-lint==0.4.3
astroid==1.3.8 astroid==1.3.8
edx-django-oauth2-provider==1.1.4 edx-django-oauth2-provider==1.1.4
edx-django-sites-extensions==2.1.1 edx-django-sites-extensions==2.1.1
edx-enterprise==0.28.0 edx-enterprise==0.29.0
edx-oauth2-provider==1.2.0 edx-oauth2-provider==1.2.0
edx-opaque-keys==0.4.0 edx-opaque-keys==0.4.0
edx-organizations==0.4.3 edx-organizations==0.4.3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment