Commit Graph

8911 Commits

Author SHA1 Message Date
Ali Akbar
3acacb2cb8 Merge pull request #23718 from edx/aakbar/course_update_items_fix
add improved re-write for course updates
2020-04-20 15:55:45 +05:00
Calen Pennington
fc60f7b9c0 Merge pull request #23746 from cpennington/pre-load-html-for-static-tabs
Load XBlockToXModuleShim for Studio Tabs page
2020-04-20 06:34:55 -04:00
Ali-D-Akbar
d959a01778 add improved re-write for course updates
add improved re-write for course updates

add improved re-write for course updates

add edge case test for course update re-write

add edge case test for course update re-write

add edge case test for course update re-write

add edge case test for course update re-write

add edge case test for course update re-write
2020-04-20 15:09:28 +05:00
edX Transifex Bot
e876286364 fix(i18n): update translations 2020-04-19 17:19:13 -04:00
Calen Pennington
9e620d3bec Load XBlockToXModuleShim for Studio Tabs page
The studio tabs page had a race condition when loading many static tabs.
The result was that those tabs couldn't be deleted. By requiring the
`xmodule` module, we force the EditTabsFactory to load
XBlockToXModuleShim before it's needed.
2020-04-16 15:21:43 -04:00
Jeremy Bowman
00adba695c Stop logging deprecation warnings outside devstack (#23742)
The upgrade to Django 2.2 has caused a spike in production logging due to RemovedInDjango30Warning deprecation warnings. For now, turn off logging of DeprecationWarning, ImportWarning, and PendingDeprecationWarning whenever we're using WSGI (they'll continue to be logged in devstack). We may eventually want this behind an easily flipped toggle, but for now just remove it to get this resolved quickly.
2020-04-16 13:54:07 -04:00
Awais Jibran
804fac9358 Adds retry logic for software secure 2020-04-13 14:14:11 +05:00
edX Transifex Bot
20fe068a01 fix(i18n): update translations 2020-04-12 17:27:12 -04:00
Diana Huang
34ea9124c3 Merge pull request #23628 from danialmalik/danial/merge-devstack-docker-with-devstack
Merge all configs of devstack_docker.py into devstack.py
2020-04-10 11:30:35 -04:00
danialmalik
164c165e1a Merge all configs of devstack_docker.py into devstack.py 2020-04-10 11:36:17 +05:00
Feanil Patel
bf320f038b Find more vars that are partially updated. 2020-04-09 15:27:28 -04:00
Feanil Patel
75f663791e Account for dicts that don't get replaced wholesale.
Right now we have a few settings that are not whoesale replaced but
piecemeal updated. So we remove them from the mass update.
2020-04-09 15:27:28 -04:00
Feanil Patel
7c0c71ca69 Auto load any keys/values from the yaml config file.
This should allow us to remove all the boilerplate code in this file
where a name is pulled from the config dict and put into the top level
namespace of the settings module.

We do this first so that any logic that adds more complex or dynamic
keys will still run and is safe.

Now that this is here we can start removing any simple boilerplate.
2020-04-09 15:27:28 -04:00
Aarif
6ee2089077 fixed warnings for wrong-import-order 2020-04-08 23:43:06 +05:00
Waheed Ahmed
3dc3e10819 Revert "Adds retry logic for software secure." 2020-04-07 20:40:06 +05:00
Tim McCormack
5bbcb273ae Fix typo in read replica DB name for CMS (#23641)
(LMS side was already fixed.)
2020-04-07 13:43:22 +00:00
Awais Jibran
4b22554411 Merge pull request #23514 from edx/aj/ss-retry-logic
Adds retry logic for software secure.
2020-04-07 10:59:57 +05:00
Diana Huang
99863aebff Remove course_id field from CourseMode.
Handle this change appropriately in CourseModeFactory.
2020-04-06 11:21:28 -04:00
Awais Jibran
4ead215665 Adds retry logic for ss.
1. Created a new celery queue with key `SOFTWARE_SECURE_VERIFICATION_ROUTING_KEY`.
2. Added a celery task with retry logic.
3. sorted imports with isort.
4. Changed deprecated `log.warn` => `log.warning`.
2020-04-06 15:16:56 +05:00
Tim McCormack
2a27fe0915 Remove bad "test_no_file" test case revealed by Django 2.1 upgrade (#23584)
Before Django 2.1, the dict was being stringified as `{'name': 'file.txt'}`
(note the single quotes) and producing a JSON parse error in
https://github.com/edx/edx-platform/blob/9cf2f9f/cms/djangoapps/contentstore/views/assets.py#L541
which was then converted to a 400 error. However, in Django 2.1,
django.test.client starts JSON-encoding request bodies when an appropriate
content-type is set:
https://github.com/django/django/compare/2.0.8..2.1#diff-97160f50594424a40f2621d5a3c581ccR320

This results in the JSON parse succeeding, and the expected error never
occurs; instead, there is a KeyError when the `locked` attribute is
missing from the dict.

For now, removing the test, since it is blocking Django 2 upgrade work,
and we need to get off of (unsupported) Django 1.11 ASAP.
We should probably repair and restore this test, but it is likely that
we'll want to change the code it is testing first, since that code is
insufficiently defensive and handles both multipart form data and JSON
without properly checking which kind it is dealing with, as well as
assuming too much about what keys are present in the JSON.

I've filed ARCHBOM-1090 for this followup work.
2020-04-02 13:59:20 -04:00
Syed Muhammad Dawoud Sheraz Ali
cd6549748b add credentials saving in VAL (#23561) 2020-04-02 11:21:09 +05:00
Awais Qureshi
195d225044 BOM-1417 (#23476)
Fixing management command.

Django PR removed force_str method: dc8834cad4 (diff-55346957c9b0473492d19a390a7adb47L36)

None is not working now.
2020-03-30 14:10:58 -04:00
Tim McCormack
22c963a935 Perform byte/string conversions where Django is no longer tolerant 2020-03-30 13:59:32 +00:00
Danial Malik
8d951ae8ae Import private.py in devstack_docker.py files instead of devstack.py (#23512)
Background: I use private.py a lot in my devstack for my private configurations. But issues are raised when I need to change/override a setting that is defined in devstack_docker.py file. Since that file's contents are loaded after private.py, my private.py is useless against the settings in devstack_docker.py.

Description: Now that the devstack is dockerized, I think it makes more sense to import the private.py in the devstack_docker.py files i.e. at the end of configuration files hierarchy.
2020-03-30 09:38:25 -04:00
Waheed Ahmed
a23a31c2be Allow Block Structures Collect to work in Studio.
The collect process was broken before this commit because Studio's
runtime does not permit handler_url invocation on "thirdparty"
XBlocks.

PROD-1393
2020-03-30 13:24:34 +05:00
edX Transifex Bot
5f63c07ac7 fix(i18n): update translations 2020-03-29 17:24:51 -04:00
Ahtisham Shahid
f264e5dd03 fixed \n escape issue in import
updated test

updated test
2020-03-27 12:29:32 +05:00
edX Transifex Bot
fdc98696b1 fix(i18n): update translations 2020-03-24 13:42:44 +05:00
Awais Qureshi
0f002bafb8 BOM-1399
checking django-wiki and fixing deprecation warnings.
2020-03-16 14:37:18 +05:00
Zainab Amir
ed25521f61 Enable testing pipeline for video uploads to s3 (#23375)
Add integration settings to enable upload of videos from from studio.
Settings enable user to connect to s3 bucket using mfa and assume role
functionality.

PROD-1214
2020-03-12 12:19:52 +05:00
Alex Dusenbery
5db8023f74 Add LMS/CMS FEATURE toggles related to ORA; update to ORA 2.6.18. 2020-03-11 10:21:20 -04:00
Dave St.Germain
99a0da8ade Merge pull request #23360 from edx/dcs/studio-nav
Fixed the studio breadcrumbs to show the current chapter/section name.
2020-03-11 09:32:03 -04:00
Samuel Walladge
badd608136 Allow overriding broker heartbeat (#21567)
BROKER_HEARTBEAT appears to interfere with the celery worker
configuration. If we want to disable or change the heartbeat interval,
It must be from these configuration options.

Just setting --without-heartbeat and/or --heartbeat-interval on the
workers does not fully work. Eg. --without-heartbeat disables sending
heartbeats, but BROKER_HEARTBEAT = 60 means that the connection will get
a 60s heartbeat interval negotiated.
2020-03-11 09:28:38 -04:00
Dave St.Germain
95abce3830 Fixed the studio breadcrumbs to show the current chapter/section name. 2020-03-10 14:29:56 -04:00
Ayub-khan
3c1140dc49 BOM-1045
-Upgrade edx-drf-extensions
-settings-update
2020-03-10 16:06:02 +05:00
edX Transifex Bot
f005cc74c5 fix(i18n): update translations 2020-03-09 06:55:18 +00:00
Tim McCormack
a783690507 Fix the way we launch celery (needs pointer to celery app, not env file) (#23325)
This is a fix to PR #23222.
2020-03-06 16:08:05 +00:00
Tim McCormack
11fc118402 Remove django-celery from transitive deps; remove unused tasks (#23318)
The video thumbnail and transcript tasks were the only things using chord_task from
edx-celeryutils, which in turn was blocking django-celery removal. But, they're no longer used.

Co-authored-by: Diana Huang <diana.k.huang@gmail.com>
2020-03-05 21:57:12 +00:00
Calen Pennington
95ba1b6e88 Merge pull request #23301 from cpennington/install-schedules-app
Schedules is a core part of the LMS, install it by default, rather th…
2020-03-04 15:26:09 -05:00
Manjinder Singh
8592109a2a Removed OPENID settings (#23299)
Part of removal of OpenID Connect
2020-03-04 14:52:00 -05:00
Calen Pennington
d853444229 Schedules is a core part of the LMS, install it by default, rather than through the plugins mechanism 2020-03-04 10:52:17 -05:00
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
Diana Huang
0fa91d72db Remove DOP libraries from edx-platform.
Remove DOP apps from INSTALLED_APPS.
Remove DOP libraries from requirements.
2020-03-02 11:17:47 -05:00
Tim McCormack
341205a85d Launch celery directly instead of via django-celery (BOM-1157) (#23222) 2020-02-27 21:53:27 +00:00
jinder1s
295da79fe5 Remove DOP dispatching from oauth_dispatch.
https://openedx.atlassian.net/browse/BOM-1330
2020-02-27 10:47:06 -05:00
Manjinder Singh
e9e584b28b Removing DOP from auth_exchange (#23187)
-  This PR removes all imports from provider by either bringing them into edx-platform or finding dot replacement. Removing tests that tested dop parts of code. 

-  Skipping some tests and removing dop

The tests are difficult to fix due to its entanglement with dop use in third_party_auth.
These tests should be restarted once dop has been removed from third_party_auth and its tests.

-  set ENABLE_DOP_ADAPTER = False for devstack
2020-02-26 10:21:26 -05:00
David Ormsbee
45c97c789d Merge pull request #20378 from open-craft/giovanni/bb-986-add-mktg-override-capability-upstream
BB-986: Add variable that allows overriding marketing urls
2020-02-26 09:45:35 -05:00
Tim McCormack
95d4acad7c Minimize dependency on django-celery (#23193)
- Reimplement `djcelery.common.respect_language` utility function so we
  can drop the dependency.
- Loosen `celery` pinning to a range, which brings in a fix for a
  possible crash bug

Also, pin `path` to 13.1.0 for now in order to continue supporting py35.
2020-02-26 00:46:36 +00: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
Jeff LaJoie
fa3b1cd835 AA-6: Adds in dates tab and dates dashboard view to courseware 2020-02-25 10:48:45 -05:00