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

21472 Commits

Author SHA1 Message Date
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
morenol
68d1c7f78c [BD-10] Remove _uses_pattern_library property from EdxFragmentViews (#24536) 2020-07-27 12:01:40 -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
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
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
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
Diane Kaplan
44aa0a847c [REV-1205] Add ecommerce event tracking to 4 course home links (#24526) 2020-07-24 07:14:24 -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
Diane Kaplan
569fb36fee [REV-1205] Add ecommerce event tracking to welcome banner upsell links (#24529) 2020-07-23 13:21:05 -04: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
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
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
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
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
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
Calen Pennington
83daf2a1c9 Add tests of ORA2 dates on the dates page 2020-07-21 15:17:51 -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
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
Dillon Dumesnil
75db9b2534 Revert "Ora2 dates reprise" 2020-07-20 09:55:02 -07:00
Jansen Kantor
bf66c177ff EDUCATOR-5167: Fix Flaky Discussions Test (#24532) 
* Revert "Delete flaky test according to process (#24441)"

This reverts commit 87edb542b1.

* fix flaky test, give count assert 1-query tolerance
 2020-07-20 10:44:44 -04:00
Calen Pennington
14609d7166 Merge pull request #24503 from cpennington/ora2-dates-reprise 
Ora2 dates reprise
 2020-07-20 10:25:07 -04:00
Michael Terry
d1ec276af7 Merge pull request #24517 from edx/mikix/course-handouts 
AA-121: add handouts to course home outlines API
 2020-07-20 08:55:22 -04:00
edX Transifex Bot
d0b138479f fix(i18n): update translations 2020-07-19 17:36:28 -04:00
stvn
1189580e0f Merge PR #24521 cleanup/mfe-flags 
* Commits:
  Consolidate MFE redirect logic
 2020-07-17 11:46:04 -07:00
uzairr
fb9ba90efe PROD-1236: Do not expose user id with certificate URL. 2020-07-17 22:59:34 +05:00
Robert Raposa
ef51a44794 move CodeOwnerMetricMiddleware from LMS (#24508) 
The CodeOwnerMetricMiddleware is being moved from
edx-platform to edx-django-utils so it can be used
in multiple IDAs.

ARCHBOM-1356
 2020-07-17 11:35:40 -04:00
Michael Terry
a160744c7e AA-121: add handouts to course home outlines API 
This will let the learning MFE render the course handouts
 2020-07-17 09:25:54 -04:00
Jeff LaJoie
bf11b68fda ENT-2893: Updates header branding and href for Enterprise learners 2020-07-17 08:59:43 -04:00
stvn
9e31d65afe Consolidate MFE redirect logic 
Its ripe for confusion to have this logic split between two separate
methods. This consolidation should make things easier to understand and
hopefully, less issue prone.

We don't really benefit from having two methods here anyway, as one is
_only_ ever called by the other.

It's also misleading that the second helper, in `toggles.py`, _also_
checks the FEATURE flag, as well as the waffle flag.
 2020-07-16 15:21:32 -07:00
Calen Pennington
7502ca021d Handle ORA dates when an it has no valid_assessments 2020-07-16 15:12:26 -04:00
Calen Pennington
0e55566d96 Attempt to fix devstack issues with an upgrade of django-ratelimit-backend 2020-07-16 13:56:41 -04:00
M. Zulqarnain
d26b8bf47b Django 3.x deprecation warning fix in lms (#24512) 2020-07-16 18:29:09 +05:00
Matthew Piatetsky
30c4aa3220 Merge pull request #24505 from edx/revert-24214-REV-774 
Revert "[REV-774] Show content type gating upsell when a limited access learner tries to access a timed exam"
 2020-07-16 08:38:05 -04:00
adeel khan
46becdc577 Merge pull request #181 from edx/adeel/fixing-xss-issues 
Fixes xss issues.
 2020-07-16 11:53:24 +05:00
Matthew Piatetsky
1fec3b997b Revert "[REV-774] Show content type gating upsell when a limited access learner tries to access a timed exam" 2020-07-15 15:43:57 -04:00
Robert Raposa
4053bfdfbd move ENABLE_FORUM_DAILY_DIGEST default (#24483) 
The default for ENABLE_FORUM_DAILY_DIGEST continues
to be True, but this moves the default from
common.py to code.
 2020-07-15 14:48:05 -04:00
Ali Akbar
205793755f Merge pull request #24476 from edx/aakbar/PROD-1850 
removing logs, waffle flag and other older code
 2020-07-15 23:34:29 +05:00
Calen Pennington
03ba0b8331 Revert "Merge pull request #24501 from edx/revert-24421-ora2-dates" 
This reverts commit fccb52b6c8, reversing
changes made to a0bc37866d.
 2020-07-15 14:29:11 -04:00
Dillon Dumesnil
2601975fd3 Revert "AA-223 - Add ORA2 dates to the dates page" 2020-07-15 10:13:00 -07:00
Nathan Sprenkle
620bbd7649 Hide search boxes in private team-sets for non-privileged users (#24444) 2020-07-15 12:30:06 -04:00
Awais Qureshi
e903e30dd4 Merge pull request #24494 from edx/BOM-1895-staticfiles-depr 
Django3.0 warnings {% load staticfiles %} is deprecated
 2020-07-15 20:46:26 +05:00
Calen Pennington
6edec4f530 Merge pull request #24421 from cpennington/ora2-dates 
AA-223 - Add ORA2 dates to the dates page
 2020-07-15 10:50:08 -04:00