Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,569 Commits 1 Branch 0 Tags
9cc4d596aa7699dd9da4e047b8e37a44497e173a
Commit Graph

56569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Awais Jibran
9cc4d596aa Merge pull request #25705 from edx/update-brand-pkg 
Update brand-edx.org
 2020-12-03 17:20:51 +05:00
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 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
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
Feanil Patel
0b2143816a Merge pull request #25707 from edx/robrap/add-code-owner-rest_framework.routers 
add code_owner for rest_framework
 2020-12-01 11:24:51 -05:00
Manjinder Singh
d99070f68d docs: Clarifying pytest testing guide (#25668) 2020-12-01 09:48:30 -05:00
Diana Huang
4a15ff6a6d Merge pull request #25702 from edx/diana/update-js-testing 
Clarify how to debug javascript tests in testing.rst.
 2020-12-01 09:37:44 -05:00
Michael Terry
181cb70149 Merge pull request #25670 from edx/mikix/as-user-timezone 
AA-459: Respect user's timezone in access-expiration message
 2020-12-01 09:13:45 -05:00
Simon Chen
00ad36839d MST-542 Roll out Accounts MFE IDV workflow (#25613) 
* MST-542 remove the IDV redirect to Account MFE waffle flag to permanently redirect learners to new IDV workflow. This completes the rollout process on edx-platform
 2020-12-01 09:08:12 -05:00
Muhammad Ammar
0cf010b763 Merge pull request #25703 from edx/ammar/ent-3670 
extract a learners active enterprise existing details
 2020-12-01 18:13:53 +05:00
Awais Qureshi
300cf197b4 Merge pull request #25708 from edx/jenkins/upgrade-python-requirements-1432dee 
Python Requirements Update
 2020-12-01 16:03:37 +05:00
Nadeem Shahzad
c9b0470366 Merge pull request #25710 from edx/nadeem/fix_mysqldump 
fix mysqldump github action
 2020-12-01 14:48:24 +05:00
nadeemshahzad
21388fc1d6 fix mysqldump github action 2020-12-01 09:13:14 +00:00
arbi-bom
8c05ff7fcb make upgrade 2020-12-01 14:01:16 +05:00
Awais Qureshi
1e1e48b25c Adding pin to avoid test failures. 2020-12-01 12:48:28 +05:00
muhammad-ammar
a831520b8e extract a learners active enterprise existing details 
ENT-3670
 2020-12-01 12:37:17 +05:00
Awais Qureshi
9c593087bc Adding pin to avoid test failures. 2020-12-01 11:57:19 +05:00
edX requirements bot
f1f8fcf78d Updating Python Requirements 2020-11-30 19:56:08 -05:00
Robert Raposa
93029169d1 add code_owner for rest_framework 
Add code_owner for `rest_framework.routers`
and other `rest_framework` apps.
 2020-11-30 16:52:40 -05:00
Diana Huang
1049c8c502 Clarify how to debug javascript tests in testing.rst. 2020-11-30 11:38:17 -05:00
Samuel Walladge
1432dee97c SE-3243 Remove injected edxnotes from AboutBlock (#24930) 
This is required to stop get_course_about_section
html content from using the edxnotes version of
get_html, which injects the edxnotes html into it.
We don't want this injected into the html here,
because these are snippets meant to be displayed
in original form on the course about page.
 2020-11-30 09:40:37 -05:00