Commit Graph

80 Commits

Author SHA1 Message Date
Manjinder Singh
7d2ff9cd3f Removing all settings that have OIDC in name (#23251)
* Removing all settings that have OIDC in name

* Removing ENABLE_DOP_ADAPTER

* changes JWT_ISSUER value in devstack
2020-03-04 09:06:29 -05:00
jinder1s
295da79fe5 Remove DOP dispatching from oauth_dispatch.
https://openedx.atlassian.net/browse/BOM-1330
2020-02-27 10:47:06 -05:00
Giovanni Cimolin da Silva
6305fbdfb6 Add mktg links override capability
This commit adds a feature that allows overriding any marketing URL, either by configuration on lms.env.json or SiteConfiguration, regardless if a marketing website is set up.
The links can be set by passing MKTG_URL_OVERRIDES to either `lms.env.json` or `SiteConfiguration`.
2020-02-25 13:51:58 -03:00
Diana Huang
0a818a3530 Add DOP adapter setting to production.py so it can be overridden. 2020-02-24 10:42:23 -05:00
Diana Huang
2f019c4d23 Rename profile image hash seed to better describe what it is. 2020-02-19 13:11:45 -05:00
zia.fazal@arbisoft.com
6129f26ef4 Pull LEARNER_PORTAL_URL_ROOT from environment tokens 2020-02-17 18:53:09 +05:00
Manjinder Singh
a18d936d46 Revert "Adding new settings to correct places (#23051)" (#23112)
This reverts commit f08185443e.
2020-02-14 13:14:18 -05:00
Ayub-khan
d3a02bc3e5 BOM-1121
-Updated middleware setting to use use middleware insted of
middleware_classes
-github install of django-method-override fork to support
new style middleware in django1.11
2020-02-11 14:35:26 +05:00
Manjinder Singh
f08185443e Adding new settings to correct places (#23051)
These settings are used to toggle new authentication class in discussion and bookmarks app. The auth class is in openedx/core/lib/api/authentication.py and was added to replace deprecated OAuth2Authentication class in [rest_framework_oauth library](https://github.com/jpadilla/django-rest-framework-oauth)
2020-02-10 10:17:31 -05:00
Adam Butterworth
2968401e09 Links in courseware iframed in MFEs navigate parent window (#22962)
[TNL-7043] If vertical block content is in an iframe in the learning microfrontend app, add a base tag in the head (of the iframe document) to force links to navigate the parent window.
2020-01-28 15:49:54 -05:00
Brittney Exline
e33b4614af ENT-2475 Upgrading edx-enterprise and adding settings for enterprise catalog service 2020-01-13 09:36:20 -05:00
Calen Pennington
dd5f85c870 Read STATICFILES_STORAGE_KWARGS from config to allow separate storage configuration for static assets 2020-01-07 14:03:37 -05:00
Calen Pennington
e654036d54 Load any AWS_ prefixed settings from ENV_TOKENS to allow S3Boto3Storage to be correctly configured 2020-01-03 11:16:03 -05:00
Calen Pennington
151b309225 Convert custom storage subclasses into mixins so that we can store to either the filesystem or S3 2020-01-02 14:49:19 -05:00
Feanil Patel
6e3fe00fff Fix all E303 pep8 errors. 2019-12-30 12:25:38 -05:00
Feanil Patel
9cf2f9f298 Run 2to3 -f future . -w
This will remove imports from __future__ that are no longer needed.

https://docs.python.org/3.5/library/2to3.html#2to3fixer-future
2019-12-30 10:35:30 -05:00
Calen Pennington
11e163d420 Read the current edx-platform git revision from a file on disk 2019-12-17 07:44:28 -05:00
Alan Zarembok
38491776f0 Updates notes client name and API url for compatiblity with devstack. 2019-11-21 10:54:19 -05:00
Bill DeRusha
5a6b51bccf remove mailchimp tracking 2019-10-11 15:38:05 -04:00
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
Cory Lee
0befab339b Always run CSMH migrations in all contexts (#21776)
* Always run CSMHE migrations for every application in all contexts
2019-09-25 13:27:26 -04:00
Ned Batchelder
d585a8f71d URLs and settings for OpenAPI generation
API docs are now always available, no more toggle to enable them.
2019-09-17 16:54:27 -04:00
Feanil Patel
3205cdab5f Merge pull request #21536 from edx/feanil/get_runserver_working
Fix errors when running runserver in python 3.
2019-09-03 11:06:25 -04:00
Feanil Patel
ca9cfb128c Fix errors when running runserver in python 3.
- The fields need to be unicode not bytes.  In python 2 it was auto
converting.
- The static url base has been allowed to be a unicode string for a
while.
2019-09-03 09:10:58 -04:00
Braden MacDonald
d3f6ed09d8 Learning Contexts, New XBlock Runtime, Blockstore API Client + Content Libraries
https://github.com/edx/edx-platform/pull/20645

This introduces:
* A new XBlock runtime that can read and write XBlocks that are persisted using
  Blockstore instead of Modulestore. The new runtime is currently isolated so
  that it can be tested without risk to the current courseware/runtime.
* Content Libraries v2, which store XBlocks in Blockstore not modulestore
* An API Client for Blockstore
* "Learning Context" plugin API. A learning context is a more abstract concept
  than a course; it's a collection of XBlocks that serves some learning purpose.
2019-08-30 10:31:15 -07:00
adeelehsan
1eda18a317 Merge pull request #21367 from edx/private_to_public_76a13fa
Mergeback PR from private to public.
2019-08-19 15:06:30 +05:00
adeelehsan
76a13fae73 Merge pull request #156 from edx/aehsan/prod-349/remove_google_api_key_from_github
Removed google api key from github
2019-08-19 14:32:26 +05:00
Feanil Patel
9925aaadb9 Be able to override this setting from yaml. 2019-08-16 15:09:13 -04:00
Diana Huang
bf7dad15e4 Remove microsite djangoapp except migrations and configuration. 2019-08-16 09:42:57 -04:00
Ayub
45ab1fec53 Merge pull request #21316 from edx/BOM-70-1
BOM-70
2019-08-09 20:19:18 +05:00
Cory Lee
a8fd936d27 Delete enterprise reporting secret because I believe it is not used anywhere (#21309) 2019-08-08 13:00:57 -04:00
Ayub khan
3b074323b8 BOM-70
-Remove Depricated View and tests
2019-08-08 21:32:42 +05:00
adeelehsan
3136b3ecd3 Removed google api key from github
Prod-349
2019-08-08 02:12:21 +05:00
DawoudSheraz
c78779949e update login lockout params 2019-07-12 14:01:14 +05:00
Amit
7dfb73c7a6 INCR-483: Make compatible with Python 3.x without breaking Python 2.7 support (#20795)
* reword INCR-483: Make compatible with Python 3.x without breaking Python 2.7 support

pick INCR-483: Re-run isort for lms/envs/test.py

INCR-483: change import order

INCR-483: PyLint fixes

* INCR-483: Fixes useless suppression

* INCR-483: Remove unused get_swagger_view
2019-07-02 12:54:34 -04:00
adeelehsan
2d369490dd Flag added to load limited courses on Dashboard
Dashboard is set to load 250 courses instead of
all the courses. A flag is also added to change
the number the courses to load.

PROD-204
2019-06-28 22:51:41 +05:00
Feanil Patel
c5b86eb5c7 Merge pull request #20384 from open-craft/symbolist/video-xblock
VideoModule to VideoBlock [SE-602]
2019-06-27 16:23:00 -04:00
Usman Khalid
0b27c62ca6 Convert VideoModule to VideoBlock.
Some deprecated functionality has been removed:

- Reading data field and transforms being applied in the init() method.
- The source field.
- The source_visible attribute.
2019-06-20 22:12:39 +05:00
Mushtaq Ali
d9a67496ff Add CSRF_TRUSTED_ORIGINS settings to successfully make POST requests from edx-learner-portal to edx-platform - ENT-2025 2019-06-19 16:04:24 +05:00
Thomas Tracy
f0ecc938ef Add IdentityServer3 Backend (#20275)
* Add IdentityServer3 Backend

This adds a backend for users who want to use IdentityServer3 as their
SSO provider. It can be used with the OAuth2ProviderConfig in django
admin to point to an external provider.
2019-06-07 09:38:46 -04:00
David Ormsbee
2b0151ceac Merge pull request #20266 from open-craft/josuebc/upstream/BB-1063
Add capability to override MANUAL_ENROLLMENT_ROLE_CHOICES
2019-05-24 15:46:25 -04:00
adeelehsan
791b9d8e5d Updated ICP license in edx footer
changed ICP license to link and added
sentence with ICP license

PROD-277
2019-05-21 16:23:18 +05:00
Christopher Pappas
4c5ca6d086 ENT-1887 | Adding logic for new business marketing footer url construction, while maintaining backwards compatibility
Fixing quality test

Testsing out a default value for the sake of jenkins tests. will revert

Fix footer test from being flaky

Moving an import statement

ran isort. adding a test. fixing 1 quality issue

Quality cleanups

Attempting more quality fixes

adding back in config variable name for default value

Adding ENTERPRISE_MARKETING_FOOTER_QUERY_PARAMS to common settings

Changing marketing_url logic to only concatenate enterprise url to root if the enterprise url is relative (starts with a /)

quality fixes
2019-05-09 17:15:47 -04:00
Nimisha Asthagiri
2a168a4e1b Account: Toggle for Microfrontend Redirect
ARCH-636
2019-05-01 11:31:48 -04:00
Douglas Hall
9880676e6a Add site configuration check to order history MFE toggle. 2019-04-25 11:10:08 -04:00
Josue Balandrano Coronel
13b4c452fa Add capability to override MANUAL_ENROLLMENT_ROLE_CHOICES from lms.env.json 2019-04-17 14:34:45 -05:00
irfanuddinahmad
5cb8d7a4ce ENT-1784-SYSTEM_TO_FEATURE_ROLE_MAPPING-setting 2019-04-10 15:24:14 +05:00
Christopher Pappas
59a1d6ab41 ENT-1556 | Updating settings files to grab SYSTEM_WIDE_ROLE_CLASSES from config as expected
Moving rbac settings above plugins

Moving the setting above plugins in common.py for the lms and cms as well
2019-04-05 17:27:13 -04:00
Matt Tuchfarber
a87aea8eff Add username replacement worker to production settings 2019-04-01 14:02:49 -04:00
Cory Lee
ac4845d052 DEPR-14 Remove AWS.py 2019-03-28 10:48:34 -04:00