Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
bfc665e5
Commit
bfc665e5
authored
Mar 27, 2017
by
Jillian Vogel
Committed by
GitHub
Mar 27, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14768 from open-craft/jill/ent-259
Bumps edx-enterprise version to 0.29.0
parents
f053ed6b
9660e132
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletions
+6
-1
cms/envs/common.py
+5
-0
requirements/edx/base.txt
+1
-1
No files found.
cms/envs/common.py
View file @
bfc665e5
...
@@ -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
View file @
bfc665e5
...
@@ -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.2
8
.0
edx-enterprise==0.2
9
.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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment