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

55262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Terry
01983a2bc0 AA-124: Give Learning MFE enroll alert information 
Give it enough to know how to handle weirder outliers like
Masters or invitation only courses.
 2020-07-27 16:04:42 -04:00
Diane Kaplan
725e0bbd2c [REV-1205] Add doc location comment so future devs can easily find it (#24615) 2020-07-27 14:55:16 -04:00
Calen Pennington
005fc1f1cf Merge pull request #24588 from cpennington/experiment-flag-masquerade 
Make the ExperimentWaffleFlag respect course masquerading when checki…
 2020-07-27 14:32:51 -04:00
Calen Pennington
bb12560233 Make the ExperimentWaffleFlag respect course masquerading when checking if it's active for a specific enrollment 2020-07-27 13:59:53 -04:00
Sankar Raj
d00633e942 [BD-10] remove edx-pattern-library from JS bundles (#24165) 
Co-authored-by: Sankar Raj <sankar.raj@crystaldelta.com>
 2020-07-27 12:19:15 -04:00
morenol
68d1c7f78c [BD-10] Remove _uses_pattern_library property from EdxFragmentViews (#24536) 2020-07-27 12:01:40 -04:00
Zachary Hancock
4e0029891f allow blank escalation email (#24613) 2020-07-27 11:59:51 -04:00
Zachary Hancock
57de9b2ac6 POST proctored exam settings (#24597) 2020-07-27 09:23:03 -04:00
JJ
b77d4c9490 [REV-1257] Add upsell tracking for upgrading all programs button on program dashboard (#24589) 
Added upsell tracking to the course upgrade all button on the program dashboard so we have a better understanding of when users are clicking our upsell links.
 2020-07-27 09:21:46 -04:00
M. Zulqarnain
684230463a Merge pull request #24612 from edx/jenkins/upgrade-python-requirements-0c51f37 
Python Requirements Update
 2020-07-27 13:50:55 +05:00
edX requirements bot
210ae4378e Updating Python Requirements 2020-07-27 04:05:55 -04:00
edX Transifex Bot
0c51f37318 fix(i18n): update translations 2020-07-26 17:46:29 -04:00
Jeff Chaves
e1bd970b46 ENT-2894: Use new welcome template when redirected from enterprise proxy login view (#24587) 
* using new welcome template when redirected from enterprise proxy login view

* enabling safe redirects to enterprise learner portal from login in devstack

* ading admin portal to login redirect whitelist

* running make upgrade to version bump edx-enterprise
 2020-07-24 17:40:42 -04:00
Simon Chen
38d1df33e2 MST-334 Make sure the CSRF hooks are in INSTALLED_APPS on Studio (#24607) 2020-07-24 17:04:46 -04:00
Michael Roytman
56fbf3d758 Merge pull request #24603 from edx/mroytman/add-csrf-urls-to-Studio 
Add edX Django Rest Framework Extensions CSRF App URLS to Studio
 2020-07-24 15:53:08 -04:00
taliaedX
b6a7874702 Merge pull request #24557 from edx/trhodes/saml_api_updates 
BUG: fixes for front end work and to align with data requirements.
 2020-07-24 15:12:17 -04:00
Albert St. Aubin
4db9a6aa8d [MICROBA-485] Added support API and model for hiding the demographics CTA 
The Demographics CTA is used to ask users to respond to the optional
questions. This API and model support the API being dismissed by the
user so they are not bothered by it.
 2020-07-24 15:08:28 -04:00
Michael Roytman
c1ddfe29a3 Add edX Django Rest Framework Extensions CSRF App URLS to Studio 2020-07-24 14:50:16 -04:00
Talia
6d365ca1da fixes for front end saml work and to align with data requirements. 2020-07-24 14:45:34 -04:00
Aarif
2ab5eb5dad Bokchoy Testing DB Cache update (#24599) 2020-07-24 22:06:32 +05:00
JJ
1f3965be29 [REV-1257] Add upsell tracking for program dashboard's courses 
This PR updates the track_ecommerce_events.js to allow imports into webpacked code & 
adds upsell tracking to the course upgrade buttons on the program dashboard. We are doing this so we have a better understanding of when users are clicking our upsell links.
 2020-07-24 12:38:41 -04:00
stvn
862e1a37d4 Merge PR #24577 fix/error/zendesk-proxy 
* Commits:
  Handle zendesk_proxy AttributeError
 2020-07-24 09:22:51 -07:00
edX cache uploader bot
3599a2ade2 Updating Bokchoy testing database cache 2020-07-24 11:35:10 -04: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