Commit Graph

58450 Commits

Author SHA1 Message Date
Kyle McCormick
4bc913e497 Upgrade to edx-organizations 6.0.0. Makes short_name unique (#25588)
This upgrades edx-organizations from 5.3.0 to 6.0.0,
the notable change being the addition of a uniqueness
constraint on `Organization.short_name`.

TNL-7645
2020-11-13 11:46:36 -05:00
AsadAzam
16ae282470 Merge pull request #25587 from edx/asad/tnl-7676
Fixed social icons color
2020-11-13 21:29:56 +05:00
Diana Huang
fd730a7af3 Set maximum search size to the ES default max. 2020-11-13 11:13:02 -05:00
Diana Huang
ece3c30ee3 Quality fixes 2020-11-13 11:13:02 -05:00
Diana Huang
33d0a18d56 Update edx-platform to use Elasticsearch 7.
This reverts commit b73f755487.
2020-11-13 11:13:01 -05:00
Asad
da640c13b5 Fixed social icons color 2020-11-13 19:35:26 +05:00
Gábor Boros
2a35410fe4 Expose banner image URL in course API
Banner image URL is exposed on the course list and course details API
endpoints. The new `banner_image_url` API field has both the relative
and absolute URLs for the image it represents, if it is set.
2020-11-13 15:35:13 +01:00
Zainab Amir
2cf023bf27 VAN-92: Update TPA Context with platform name (#25580) 2020-11-13 17:15:53 +05:00
Usama Sadiq
5e0a70930e Merge pull request #25585 from edx/jenkins/upgrade-python-requirements-161c089
Python Requirements Update
2020-11-13 14:22:51 +05:00
Saleem Latif
4a3f9b89fe Do not send email if profile not created, this code path is run as a result UserPreference save signal before profile is created. 2020-11-13 13:13:14 +05:00
edX requirements bot
10b92eed17 Updating Python Requirements 2020-11-12 23:46:29 -05:00
Bianca Severino
161c089081 Merge pull request #25583 from edx/bseverino/idv-expiration-date
Default to expiry_date for older software secure photo verifications
2020-11-12 13:21:02 -05:00
David Ormsbee
d83241e503 Merge pull request #24809 from open-craft/symbolist/convert-randomize-module-to-xblock
[BD-04] Convert Randomize XModule to XBlock
2020-11-12 13:06:57 -05:00
David Ormsbee
2086f11a22 Merge pull request #24838 from open-craft/symbolist/convert-conditional-module-to-xblock
[BD-04] Convert Conditional XModule to XBlock
2020-11-12 13:04:26 -05:00
Bianca Severino
e4366646f9 Default to expiry_date for older software secure photo verifications 2020-11-12 12:34:04 -05:00
Michael Terry
6424a3f3e8 Merge pull request #25547 from edx/mikix/course-update-rewrite
AA-289: rewrite how course updates behave when dismissed
2020-11-12 11:28:56 -05:00
Awais Jibran
3f4099a16f Merge pull request #25574 from edx/aj/branding/add-brand-edx-deps
Adding brand-edx.org as a dependency to edx-platform
2020-11-12 21:05:57 +05:00
Bianca Severino
60cab77c53 Merge pull request #25568 from edx/bseverino/idv-expiration
Set expiration_date field in IDVerificationAttempt model
2020-11-12 10:06:45 -05:00
Awais Jibran
2b1e239633 Adding brand-edx.org as a dependency to edx-platform 2020-11-12 19:45:34 +05:00
Michael Terry
40fbef4af2 AA-289: rewrite how course updates behave when dismissed
Previously, dismissing one course update would disable all future
updates. But that feels a bit limiting.

Instead, these are the new rules:
- If the newest update has not been dismissed yet, it gets displayed.
- If the newest update has been dismissed, we display nothing.
- Editing the newest update will cause it to be displayed again.
- New updates get displayed, even if previous updates were dismissed.

This commit includes a light refactoring and addition of some utility
methods to help manage the above.

It also notes that the learning MFE does not use the "latest_update"
waffle option, which controls the labeling of the update message.
2020-11-12 09:39:15 -05:00
Albert (AJ) St. Aubin
9551b23d08 [MICROBA-721] Updates the notify_credentials job to run over new window 2020-11-12 08:27:03 -05:00
Saleem Latif
1858e28875 Merge pull request #25576 from edx/saleem-latif/ENT-3680
ENT-3680: Updated edx-enterprise version and only set user language preference on signup if it does not already exist.
2020-11-12 17:43:33 +05:00
Arslan Ashraf
7344ddb5e3 SysAdmin: Added deprecation warning for Sysadmin Dashboard 2020-11-12 16:54:18 +05:00
edX requirements bot
9c22e31d0d Updating Python Requirements (#25578) 2020-11-12 11:28:14 +05:00
edX Transifex Bot
0194be2fac geoip2: update maxmind geolite country database 2020-11-11 16:13:58 -05:00
Saleem Latif
785b04888d Updated edx-enterprise version and only set user language preference on signup if it does not already exist. 2020-11-11 14:24:47 +05:00
edX cache uploader bot
3fb758a4c0 Updating Bokchoy testing database cache (#25560) 2020-11-11 13:08:20 +05:00
Raul Gallegos
236d5d7b78 Adds Boto3 support for Import/Export functionality 2020-11-10 22:33:08 -05:00
Felipe Montoya
d876a79f0e Merge pull request #25322 from aulasneo/BTR-15
Fix certificate sass assets collection for comprehensive themes
2020-11-10 16:41:38 -05:00
Kyle McCormick
73739189c5 Undo renames of common.djangoapps tasks (#25566)
When rolling out #25477, we dropped hundreds of email activation
tasks due to the renaming of student.send_activation_email
to common.djangoapps.student.send_activation_email,
and lost more when we rolled that PR back.
This happens because of blue/green deployment:
old workers are still online for a while after deploying,
so there is a period of time when the task names are mismatched.

To prevent this from happening again, this will make
it so the import changes don't change the names of
any of the Celery tasks.
2020-11-10 16:31:48 -05:00
Bianca Severino
56d7ff8017 Set expiration_date field in IDVerificationAttempt model 2020-11-10 15:29:47 -05:00
edX requirements bot
db32c28ecb Updating Python Requirements (#25563) 2020-11-10 15:00:07 -05:00
Bianca Severino
2e629c95a2 Merge pull request #25564 from edx/revert-25500-bseverino/idv-expiration
Revert "Set expiration_date field in IDVerificationAttempt model"
2020-11-10 14:59:55 -05:00
Dillon Dumesnil
8824a137dc Merge pull request #25562 from edx/ddumesnil/no-updates-after-end-aa-422
AA-422: Ensure learners are not receiving updates after course end
2020-11-10 11:41:21 -08:00
Bianca Severino
82e8592fbe Revert "Set expiration_date field in IDVerificationAttempt model" 2020-11-10 14:24:07 -05:00
Sid Verma
b3f0df738c Include common base contexts in user activation email 2020-11-11 00:47:03 +05:30
Awais Qureshi
7201edb11d Revert "Update routing config" (#25536)" (#25549)" (#25553)" (#25561)
This reverts commit db4c3b1210.
2020-11-11 00:13:47 +05:00
Dillon Dumesnil
11f1347669 AA-422: Ensure learners are not receiving updates after course end 2020-11-10 14:07:31 -05:00
Awais Qureshi
db4c3b1210 Revert "Revert ""Update routing config" (#25536)" (#25549)" (#25553)
This reverts commit c1fe3c3a93.
2020-11-10 23:23:09 +05:00
Bianca Severino
0f6d94d1af Merge pull request #25500 from edx/bseverino/idv-expiration
Set expiration_date field in IDVerificationAttempt model
2020-11-10 13:08:41 -05:00
edX cache uploader bot
c49aa3a3e1 Updating Bokchoy testing database cache (#25559) 2020-11-10 21:50:28 +05:00
taliaedX
e1b85ce26d Merge pull request #25548 from edx/trhodes/enterprise-11092020
update edx-enterprise to latest release
2020-11-10 11:16:51 -05:00
Bianca Severino
3342524699 Update IDVerificationAttempt to use expiration_date field 2020-11-10 11:15:04 -05:00
Kyle McCormick
08ab6e0bc5 Fix import of common.djangoapps.util.date_utils (#25558) 2020-11-10 10:58:05 -05:00
Jansen Kantor
cd3a1e3870 upgrade ora and remove temporary pin (#25512) 2020-11-10 10:50:05 -05:00
Kyle McCormick
151bd13666 Use full names for common.djangoapps imports; warn when using old style (#25477)
* Generate common/djangoapps import shims for LMS
* Generate common/djangoapps import shims for Studio
* Stop appending project root to sys.path
* Stop appending common/djangoapps to sys.path
* Import from common.djangoapps.course_action_state instead of course_action_state
* Import from common.djangoapps.course_modes instead of course_modes
* Import from common.djangoapps.database_fixups instead of database_fixups
* Import from common.djangoapps.edxmako instead of edxmako
* Import from common.djangoapps.entitlements instead of entitlements
* Import from common.djangoapps.pipline_mako instead of pipeline_mako
* Import from common.djangoapps.static_replace instead of static_replace
* Import from common.djangoapps.student instead of student
* Import from common.djangoapps.terrain instead of terrain
* Import from common.djangoapps.third_party_auth instead of third_party_auth
* Import from common.djangoapps.track instead of track
* Import from common.djangoapps.util instead of util
* Import from common.djangoapps.xblock_django instead of xblock_django
* Add empty common/djangoapps/__init__.py to fix pytest collection
* Fix pylint formatting violations
* Exclude import_shims/ directory tree from linting
2020-11-10 07:02:01 -05:00
Ned Batchelder
a62c5dad49 Merge pull request #25542 from jramnai/squash-DeprecatedEdxPlatformImportWarning
Squash experiments DeprecatedEdxPlatformImportWarning
2020-11-10 06:46:24 -05:00
Usama Sadiq
2b683eb576 Merge pull request #25554 from edx/jenkins/upgrade-python-requirements-37353bf
Python Requirements Update
2020-11-10 14:19:59 +05:00
edX requirements bot
5f69024bed Updating Python Requirements 2020-11-10 02:29:56 -05:00
Robert Raposa
37353bf260 Merge pull request #25546 from regisb/regisb/fix-override-in-tests
[BD-21] Upgrade edx-completion and fix corresponding unit tests
2020-11-09 16:01:51 -05:00