Commit Graph

58450 Commits

Author SHA1 Message Date
Dillon Dumesnil
84930bd5e6 Merge pull request #25721 from edx/ddumesnil/aa-454
AA-454: Reenable CourseUpdateResolver for Instructor-paced Courses
2020-12-03 10:17:12 -08:00
Ned Batchelder
0e6d08cb6c Merge pull request #25718 from edx/nedbat/remove-data-rel
Remove unnecessary and misleading data-rel attributes
2020-12-03 12:47:42 -05:00
Dillon Dumesnil
ef5832bc74 AA-454: Reenable CourseUpdateResolver for Instructor-paced Courses
When CourseNextSectionUpdate was created, it incorporated Personalized
Learner Schedules logic which didn't take into account release dates of
content and was only intended for self-paced courses that always have
all content released. This caused a bug where instructor-paced courses
could receive an update about content that had not been released yet.

This PR turns the CourseUpdateResolver back on for instructor-paced
courses so they can go back to receiving weekly highlights.
2020-12-03 17:07:26 +00:00
Christie Rice
2ca9b6c4e8 MICROBA-734 Add class (#25744) 2020-12-03 11:54:05 -05:00
Awais Qureshi
ef5a24c7b5 Merge pull request #25746 from edx/jenkins/upgrade-python-requirements-3c9f87c
Python Requirements Update
2020-12-03 21:48:17 +05:00
Robert Raposa
8866cc0e23 Merge pull request #25530 from regisb/regisb/waffle-namespace-deprecation
[BD-21] Start waffle namespace deprecation process
2020-12-03 11:14:43 -05:00
Régis Behmo
216b99264a Upgrade waffle classes to the new edx-toggles API
Waffle classes no longer have namespaces. All features are moved to the
WaffleFlag/WaffleSwitch classes.

Here we use the edx_toggles.toggles.__future__ API, which is available
in 1.2.0. This means that we don't have to upgrade edx-toggles. We
should remove the __future__ imports as soon as we upgrade to 2.0.0.
2020-12-03 16:40:43 +01:00
Régis Behmo
d13a1fb5f5 Upgrade completion
This is required because edx-platform uses the waffle API from
completion, which itself depends on edx-toggles. So if we change
edx-toggles import paths, we also need to upgrade our usage of
completion here.
2020-12-03 16:06:15 +01:00
Régis Behmo
a16cd71046 Start waffle namespace deprecation
By explicitly importing the legacy namespace classes, we make it clear
that we are using soon-to-be-deprecated classes. We will then be able to
start removing the legacy classes, one module at a time.
2020-12-03 16:06:14 +01:00
Robert Raposa
4344da80a1 Merge pull request #25722 from edx/robrap/ARCHBOM-1636-upgrade-supercsv
ARCHBOM-1636: upgrade supercsv
2020-12-03 09:59:56 -05:00
Kyle McCormick
d3ef43047e Fix KeyError in v2 Libraries API (#25753) 2020-12-03 09:49:27 -05:00
Awais Jibran
56a5405d41 Merge pull request #25654 from edx/branding/aj/update-logs
Rebranding: Logo Swap
2020-12-03 17:59:28 +05:00
Awais Jibran
64e26407f2 Logo Swap & Config for serving assets from cdn.
1. Header Logo
2. Footer Logo
3. Favicon
2020-12-03 17:30:13 +05:00
Awais Jibran
9cc4d596aa Merge pull request #25705 from edx/update-brand-pkg
Update brand-edx.org
2020-12-03 17:20:51 +05:00
Farhaan Bukhsh
31f0432445 [BTR-38] [BB-3269] Add openassessmnet url to CMS
This change helps to check the preview of fileupload in
openassessment xblock in studio.

Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>
2020-12-03 16:01:14 +05:30
edX cache uploader bot
f68dee02b8 Updating Bokchoy testing database cache (#25748) 2020-12-03 15:22:43 +05:00
Sameen Fatima
7f4b9b7c29 rollback edx-enterprise to 3.12.3 (#25747) 2020-12-03 10:56:04 +05:00
edX requirements bot
57e900b664 Updating Python Requirements 2020-12-02 19:56:33 -05:00
Robert Raposa
8809c73395 upgrade supercsv
Includes additional monitoring of celery tasks
in supercsv.

ARCHBOM-1636
2020-12-02 16:51:41 -05:00
edX Transifex Bot
3c9f87c3cd geoip2: update maxmind geolite country database 2020-12-02 16:13:59 -05:00
Awais Jibran
77247a493a Update brand-edx.org 2020-12-03 02:01:29 +05:00
Sameen Fatima
3819d5ec34 edx-enterprise-3.13.3 (#25740) 2020-12-02 15:49:44 -05:00
Kyle McCormick
4dda73d797 [BD-14] Migrate all environments to use database-backed organizations (#25153)
* Install `organizations` app into LMS and Studio non-optionally.
* Add toggle `ORGANIZATIONS_AUTOCREATE` to Studio.
* Remove the `FEATURES["ORGANIZATIONS_APP"]` toggle.
* Use the new `organizations.api.ensure_organization` function to
  either validate or get-or-create organizations, depending
  on the value of `ORGANIZATIONS_AUTOCREATE`,
  when creating course runs and V2 content libraries.
  We'll soon use it for V1 content libraries as well.
* Remove the `util.organizations_helpers` wrapper layer
  that had to exist because `organizations` was an optional app.
* Add `.get_library_keys()` method to the Split modulestore.
* Add Studio management command for backfilling organizations tables
  (`backfill_orgs_and_org_courses`).

For full details, see
https://github.com/edx/edx-organizations/blob/master/docs/decisions/0001-phase-in-db-backed-organizations-to-all.rst

TNL-7646
2020-12-02 13:58:40 -05:00
David Ormsbee
f096f5d685 Merge pull request #25618 from open-craft/symbolist/convert-annotatable-xmodule-to-xblock
[BD-4] Convert Annotatable XModule to XBlock. [SE-3640]
2020-12-02 13:37:20 -05:00
Feanil Patel
ded0767534 Merge pull request #25735 from edx/feanil/drop_shoppingcart_tables
Remove all models related to shoppingcart.
2020-12-02 13:18:25 -05:00
Awais Jibran
f16d373383 Merge pull request #25732 from edx/aj/branding/course-dates-update
Brand Update for Course Dates
2020-12-02 22:53:41 +05:00
Mike OConnell
edfeabd8fe Moco/rollback enterprise (#25736)
* Rolling back edx-enterprise to 3.12.3

Rolling back breaking changes from adding end_date to metadata

ENT-3627
2020-12-02 12:00:25 -05:00
Feanil Patel
e90c6ae5a2 Remove all models related to shoppingcart.
DEPR-43 - Removal of Shoppingcart.

All models have been removed and the change has been deployed to production
so this should be safe to do.

It's strange that the ORM decided to drop certain fields before dropping the
whole models but decided to leave it all as the ORM generated it rather than
trying to manually change it.

Also turn the check back on to make sure people don't actually check in code
without the relevant migration files.
2020-12-02 11:36:07 -05:00
Muhammad Ammar
60f30a9aa5 Merge pull request #25734 from edx/ammar/ent-3670-get-learners-enterprise-info-from-db
try to get learner's enterprise information from DB if there is no enterprise customer associated with sso provider id
2020-12-02 21:02:38 +05:00
Sarina Canelake
2a9d4b796c Merge pull request #25719 from edx/sarina/demox-code-grader
Fix demoX grader print statements
2020-12-02 10:43:05 -05:00
muhammad-ammar
f19b074927 try to get learner's enterprise information from DB if there is no
enterprise customer associated with sso provider id

ENT-3670
2020-12-02 19:49:21 +05:00
Nimisha Asthagiri
3426491dde Merge pull request #25543 from open-craft/nizar/catch_blockstructure_not_found_on_cache_invalidation
[SE-3439] Fixes block structure not caching when cache invalidation is enabled
2020-12-02 09:36:42 -05:00
sarina
fa6ace3344 Fix demox code grader print statements 2020-12-02 09:24:53 -05:00
Usama Sadiq
639791ef27 Merge pull request #25733 from edx/testeng/bokchoy_auto_cache_update_44e5d8ac375ff7e7ae86d545389609d4a70adac7
Bokchoy Testing DB Cache update
2020-12-02 19:15:01 +05:00
edX cache uploader bot
5588774f29 Updating Bokchoy testing database cache 2020-12-02 08:03:39 -05:00
Sameen Fatima
9ccb848861 edx-enterprise version bump to 3.13.2 (#25731) 2020-12-02 17:59:10 +05:00
Awais Jibran
b901be8a25 Brand Update for Course Dates 2020-12-02 17:38:17 +05:00
Muhammad Ammar
444522645f Merge pull request #25727 from edx/ammar/add-logs-for-dsc-flow
add logs for dsc flow to identify why `None` is being returned as enterprise customer uuid for a learner even though the leaner has a valid active enterprise present
2020-12-02 16:17:31 +05:00
muhammad-ammar
b9e87817f8 add logs for dsc flow to identify why None is being returned as
enterprise customer uuid for a learner even though the leaner has a
valid active enerprise present

ENT-3670
2020-12-02 14:08:30 +05:00
Awais Jibran
c0d1f68ee7 Merge pull request #25692 from edx/branding/aj/update-masquerading-learner-theme-color
Update Masquerade text color for specific learner
2020-12-02 13:21:45 +05:00
Awais Jibran
c35bb0328c Merge pull request #25690 from edx/ahtisham/TNL-7710
Removed Extra space in sidebar link text
2020-12-02 01:26:46 +05:00
Awais Jibran
e4f4face95 Merge pull request #25693 from edx/aj/branding/not-sure-link
Course Updates "Not sure" link
2020-12-02 01:22:29 +05:00
Awais Jibran
f43c6732d1 Merge pull request #25623 from edx/branding/aj/course-dates-links
Update Course Date Links
2020-12-02 01:21:14 +05:00
Sarina Canelake
8378c5714b Merge pull request #25295 from ErikWaters/ewaters/demox-code-grader
Correct DemoX Code Grader solution
2020-12-01 14:56:23 -05:00
Ned Batchelder
cd0ef5b317 Remove unnecessary and misleading data-rel attributes
These were first added in
https://github.com/edx/edx-platform/commit/d95b46dd19 but they don't
seem to do anything.  On Open edX sites, they are misleading.
2020-12-01 13:54:08 -05:00
Muhammad Ammar
156b91d2ef Merge pull request #25716 from edx/revert-25703-ammar/ent-3670
Revert "extract a learners active enterprise existing details"
2020-12-01 23:02:10 +05:00
Muhammad Ammar
c508d42a5c Revert "extract a learners active enterprise existing details" 2020-12-01 22:29:59 +05:00
Robert Raposa
8f663d45c7 Merge pull request #25685 from edx/robrap/schedules-tasks-code-owner
ARCHBOM-1260: add code_owner for schedules tasks
2020-12-01 12:23:19 -05:00
Robert Raposa
fd584b70b6 Merge pull request #25681 from edx/robrap/capitalize-technical-reference-2
capitalize technical reference title
2020-12-01 12:22:57 -05:00
Alex Dusenbery
6d3a3d5ee2 ENT-3732 | Add enterprise_channel_worker to the list of all enterprise service users, in hopes that this will lessen the occurrence of rate-limit error responses for requests made by this user. 2020-12-01 11:27:43 -05:00