Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,240 Commits 1 Branch 0 Tags
862e1a37d4782d03f5465d6c19ccf331ed73e33e
Commit Graph

55240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stvn
862e1a37d4 Merge PR #24577 fix/error/zendesk-proxy 
* Commits:
  Handle zendesk_proxy AttributeError
 2020-07-24 09:22:51 -07:00
Dillon Dumesnil
de8ef23d24 Merge pull request #24595 from edx/ddumesnil/aa-234 
AA-234: Switch link in dates widget if Course Home MFE is active
 2020-07-24 08:30:43 -07:00
Dillon Dumesnil
39b66dcdbb AA-234: Switch link in dates widget if Course Home MFE is active 2020-07-24 07:54:21 -07:00
Alexander J Sheehan
dd193e73d6 Merge pull request #24560 from edx/add_country 
ENH adding country to SAML mapping config
 2020-07-24 10:47:43 -04:00
Olivia Ruiz-Knott
1d66557b8c Merge pull request #24585 from edx/ork/MICROBA-487_remove-coaching-cta-underline 
MICROBA-487 Add button class to CTA to remove text-decoration on hover
 2020-07-24 09:28:35 -04:00
Adam Stankiewicz
3ff349ec07 bump edx-enterprise to 3.4.27 (#24590) 2020-07-24 08:34:01 -04:00
Awais Qureshi
c0b1cbe87d Merge pull request #24523 from eduNEXT/eric/upgrade_django_wiki 
[BD-6] Use updated django-wiki version, OEP-18 compliant and compatible with Python 3.8.
 2020-07-24 17:19:02 +05:00
Simon Chen
198c4ad9a0 MST-331 Add cors header configs to CMS so it can be turned on (#24571) 
* MST-331 Add cors header configs to CMS so it can be turned on

* feedback
 2020-07-24 08:09:41 -04:00
Diane Kaplan
44aa0a847c [REV-1205] Add ecommerce event tracking to 4 course home links (#24526) 2020-07-24 07:14:24 -04:00
M. Zulqarnain
13ca83d410 Merge pull request #24594 from edx/jenkins/upgrade-python-requirements-0cec351 
Python Requirements Update
 2020-07-24 14:23:26 +05:00
edX requirements bot
c255cda56c Updating Python Requirements 2020-07-24 01:21:23 -04:00
Alexander Sheehan
0e5b70a800 Adding country to list of attrs, updating help text and max length 2020-07-23 16:29:05 -04:00
Sankar Raj
0cec351c0c [BD-10] [DEPR-93] Remove font reference from edx-pattern-library in styles and moved OpenSans fonts to static fonts (#24176) 2020-07-23 15:13:59 -04:00
Diane Kaplan
f96a98d76f [REV-1205] Add ecommerce event tracking to course sock and track selection upsell links (#24562) 2020-07-23 14:29:27 -04:00
stvn
47c71d7d07 Merge PR #24574 fix/error/segment-context 
* Commits:
  Fix segment_context key error
 2020-07-23 11:15:17 -07:00
Olivia Ruiz-Knott
802dca15c6 MICROBA-487 Add button class to CTA to remove text-decoration on hover 2020-07-23 13:51:39 -04:00
Diane Kaplan
569fb36fee [REV-1205] Add ecommerce event tracking to welcome banner upsell links (#24529) 2020-07-23 13:21:05 -04:00
M. Zulqarnain
3e31e6bb44 Merge pull request #24583 from edx/bom-1949 
Change constraint message
 2020-07-23 20:41:44 +05:00
Diane Kaplan
0b2a9c7010 [REV-1205] Add ecommerce event tracking to FBE (feature based enrollment) upsell links (#24528) 2020-07-23 11:40:22 -04:00
Nick
a7f6879ebd Merge pull request #24561 from edx/ndalfonso/AA-123-welcome-message 
AA-123 welcome message
 2020-07-23 11:23:00 -04:00
Zulqarnain
5a85d6b3ea change constraint message 2020-07-23 19:55:47 +05:00
Nicholas D'Alfonso
14fc8b57ab AA-123 welcome message 2020-07-23 10:47:53 -04:00
David Ormsbee
8d9a2c9269 Merge pull request #24575 from edx/ormsbee/non-atomic-course-blocks 
Make Blocks API and Dates mobile views non-atomic.
 2020-07-23 08:49:22 -04:00
edX requirements bot
bdcb806ae9 Updating Python Requirements (#24579) 2020-07-23 15:17:03 +05:00
stvn
ef2ab1f296 Handle zendesk_proxy AttributeError 2020-07-22 15:31:02 -07:00
Cory Lee
148b90358f Add Dockerfile (#23088) 
* Add Dockerfile.
* Add gunicorn config files for local development.
* Add .dockerignore file.

Co-authored-by: Joseph Mulloy <jmulloy@edx.org>
Co-authored-by: Fred Smith <derf@edx.org>
Co-authored-by: Adam Blackwell <ablackwell@edx.org>
Co-authored-by: Kyle McCormick <kmccormick@edx.org>
Co-authored-by: Nadeem Shahzad <nshahzad@edx.org>
 2020-07-22 17:45:23 -04:00
edX Transifex Bot
1453e8f0ac geoip2: update maxmind geolite country database 2020-07-22 17:16:36 -04:00
David Ormsbee
96ea413a07 Make Blocks API and Dates mobile views non-atomic. 
These are expensive, read-only web requests. Unfortunately,
middleware adds writes, and we currently run with view-level
transactions enabled by default. Holding those long transactions
open has caused extra load on the database and been our largest
sources of django.db.utils:OperationError exceptions.

This has been particularly noticeable as we start deploying the
new Courseware MFE, which uses the BlocksInCourseView more
frequently.
 2020-07-22 17:10:11 -04:00
Aarif
60e2b53d4c Bokchoy Testing DB Cache update (#24554) 2020-07-22 22:11:12 +05:00
edX requirements bot
e33de26e6a Python Requirements Update (#24563) 
* Updating Python Requirements

* pin maxminddb

Co-authored-by: Zulqarnain <muhammad.zulqarnain@arbisoft.com>
 2020-07-22 21:55:28 +05:00
Brandon Baker
d808735825 Upgrade edx-enterprise to 3.4.26 (#24567) 2020-07-22 10:29:43 -04:00
Calen Pennington
5da9452762 Merge pull request #24556 from cpennington/ora2-dates-reprise-2 
Ora2 dates reprise 2
 2020-07-22 09:45:00 -04:00
edx-pipeline-bot
779fedb077 Merge pull request #24566 from edx/private_to_public_03835a5 
Mergeback PR from private to public.
 2020-07-22 17:24:11 +05:00
Uzair Rasheed
03835a51f3 Merge pull request #170 from edx/azarembok/cert-fix 
PROD-1236: Do not expose user id with certificate URL.
 2020-07-22 16:35:49 +05:00
Ali Akbar
b7fdee226b Merge pull request #185 from edx/sustaining/security-fixes 
Sustaining Xsslint security fixes
 2020-07-22 13:56:54 +05:00
Alexander Sheehan
2e2493f99d ENH adding country to SAML mapping config 2020-07-21 16:23:00 -04:00
Calen Pennington
83daf2a1c9 Add tests of ORA2 dates on the dates page 2020-07-21 15:17:51 -04:00
stvn
17340353ea Merge PR #24555 bump/completion 
* Commits:
  Bump edx-completion to version 3.2.4
 2020-07-21 11:36:25 -07:00
stvn
747d0a2a22 Bump edx-completion to version 3.2.4 2020-07-21 10:53:11 -07:00
Andytr1
af072a5158 EDUCATOR-5039 (#24546) 
* EDUCATOR-5039

* EDUCATOR-5039 - pr updates
 2020-07-21 13:36:18 -04:00
JJ
9d62bf16b2 [REV-1205] Add upsell tracking to verified/no SKU courses on the dashboard 
Add the tracking class to the upsell button on the course dashboard for courses that are verified but have no SKUs so we get better data on when upsell links get clicked.
 2020-07-21 13:08:53 -04:00
Alex Wang
9b74414893 Deprecate relevant course fields after the new exam setting is enabled (#24500) 
mst-292
 2020-07-21 09:18:51 -07:00
Calen Pennington
3e47170470 Revert "Merge pull request #24547 from edx/revert-24503-ora2-dates-reprise" 
This reverts commit 21d1f3d5d1, reversing
changes made to 19f82258aa.
 2020-07-21 11:54:06 -04:00
Diane Kaplan
72dd144476 [REV-1205] add event tracking for PLS upsell links (#24522) 
Co-authored-by: Diane Kaplan <dkaplan@edx.org>
 2020-07-21 10:00:39 -04:00
Zachary Hancock
c9f5ec3397 disable escalation email requirement (#24551) 2020-07-21 09:45:25 -04:00
Awais Qureshi
7b639c3da0 Merge pull request #24525 from open-craft/fix-failing-non-indexable-test 
[BD-29] [TNL-6993] [BB-2602] Fix failing non-indexable tests
 2020-07-21 17:39:23 +05:00
edX cache uploader bot
0713dc3738 Updating Bokchoy testing database cache 2020-07-21 08:16:13 -04:00
adeelehsan
f085e746cc Merge pull request #24495 from edx/aehsan/prod-1911/added_config_model_in_bulk_change_enrollment_command 
Config model added to upload csv
 2020-07-21 17:10:22 +05:00
adeelehsan
f2e989183c Config model added to upload csv 
PROD-1911
 2020-07-21 16:19:31 +05:00
Awais Qureshi
d5f5891ae3 Merge pull request #24553 from edx/jenkins/upgrade-python-requirements-831a6a0 
Python Requirements Update
 2020-07-21 11:46:32 +05:00