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

6781 Commits

Author SHA1 Message Date
Nick
f621c45f24 Merge pull request #24671 from edx/ndalfonso/AA-264-mfe-courseware-reset-dates 
AA-264 mfe courseware reset dates
 2020-08-05 14:23:10 -04:00
Nicholas D'Alfonso
db5214b216 AA-264 mfe courseware reset dates 2020-08-05 11:25:09 -04:00
Feanil Patel
aefd7abd5e Merge branch 'master' into feanil/depr-43-remove-donation-button 2020-08-04 15:09:13 -04:00
Jeff Chaves
87f444fd44 ENT-3143: display message banner guiding user to their enterprise LP if enabled (#24625) 
* display message banner guiding user to their enterprise LP if enabled

* adding new sass class name to use same styling as recovery email alert
 2020-07-29 11:55:02 -04:00
morenol
5949c17dda [BD-10] Remove uses bootstrap method (#24535) 2020-07-28 08:57:42 -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
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
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
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
Feanil Patel
c3180cdea2 DEPR-43 - Remove donation logic from student dashboard. 2020-07-21 15:26:29 -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
Calen Pennington
14609d7166 Merge pull request #24503 from cpennington/ora2-dates-reprise 
Ora2 dates reprise
 2020-07-20 10:25:07 -04:00
uzairr
fb9ba90efe PROD-1236: Do not expose user id with certificate URL. 2020-07-17 22:59:34 +05:00
Jeff LaJoie
bf11b68fda ENT-2893: Updates header branding and href for Enterprise learners 2020-07-17 08:59:43 -04: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
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
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
Calen Pennington
d6bf54b576 Add ORA2 dates to the dates page 
ORA2 (openassessment) problems have multiple dates associated with are
not bound to the `due` date that is modified by Personalized Learner
Schedules. We expose the ORA2 dates separately in the dates page
so that learners aren't surprised by the differing deadlines.

[AA-223]
 2020-07-15 09:52:22 -04:00
JJ
9b147f5969 use class selector instead of id selector for course_dashboard_green button (#24471) 
Replaced the id selector used for tracking the course_dashboard_green button with a class selector instead, so we get eventing on each button per course on the course dashboard page.
 2020-07-15 09:50:53 -04:00
Awais Qureshi
04ee889498 BOM-1895 
{% load staticfiles %} is deprecated in favor of {% load static %}.
 2020-07-15 12:49:00 +05:00
Bianca Severino
041becc846 Implement waffle flag for IDV redirect 
Created helper function to render url dynamically

Modify helper function to include reverify links

Fix code based on failing tests

Fixed query string in redirect URL
 2020-07-13 16:43:59 -04:00
SaadYousaf
3cbfab378a PROD-1663 2020-07-10 19:11:30 +05:00
JJ
36e07f6be8 [REV-1205] Add ecommerce event tracking to course dashboard upgrade button (#24338) 
Create a Javascript function to log upsell events to & attach the eventing to the course dashboard upsell button. The revenue squad is looking for more insight into which buttons users are clicking to get to the checkout page.
 2020-07-09 09:28:03 -04:00
Zachary Hancock
6afbb9827b remove unenroll button for masters enrollments (#24325) 
* remove unenroll for masters

* i18n string
 2020-06-29 12:57:46 -04:00
Feanil Patel
cf5f9482e3 Merge pull request #23975 from edx/depr/shoppingcart-instructor-report 
instructor_task: remove shoppingcart (DEPR-43)
 2020-06-29 11:05:26 -04:00
Nimisha Asthagiri
80ea0a61f0 instructor_task: remove shoppingcart (DEPR-43) 2020-06-29 10:28:26 -04:00
alangsto
d694582441 Displays escalation email on Special Exams tab (#24331) 
* Displays escalation email on Special Exams tab of instructor dashboard. MST-274

* updates for requested changes

* updates necessary for unit testing

* Fixes for pylint warning

* fix for quality tests
 2020-06-29 09:11:48 -04:00
Awais Jibran
0142dcdf86 Adding ID Verification Approved email template. 
PROD-1639
 2020-06-29 12:17:55 +05:00
Diana Huang
8a1fad8c12 Merge pull request #24181 from edx/diana/dashboard-courses-blocked 
DEPR-43: Remove usage of CourseRegistrationCode and blocked courses from
 2020-06-25 13:59:26 -04:00
Dillon Dumesnil
a7dff8c21e Merge pull request #24303 from edx/ddumesnil/due-dates-in-courseware-AA-44 
AA-44: Adding due dates into courseware
 2020-06-24 09:22:01 -07:00
Dillon Dumesnil
7f6a2518cb AA-44: Adding due dates into courseware 
Due dates will only display for graded subsections.
If the assignment has already been completed, there will be a pill
to indicate that. If the assignment is past due, there will be a
pill. If it is upcoming, there are no pills
 2020-06-24 08:26:52 -07:00
Diana Huang
6aa300711b Remove usage of CourseRegistrationCode and blocked courses from 
dashboard.
 2020-06-24 09:38:20 -04:00
Waheed Ahmed
ab72a9d87d Fix embargo message issues. 
PROD-1753
 2020-06-24 14:45:47 +05:00
Matthew Piatetsky
78317ca115 Show content type gating upsell when a limited access learner tries to access a timed exam 
Otherwise, these learners could start the timer and then be unable to take the exam once they have access to the content
REV-774
 2020-06-22 16:18:58 -04:00
Nicholas D'Alfonso
e0fecb47e4 Fix Dates Banner Translations 
- replace unicode apostrophes with single quotes in dates banner.
- change language in button from 'Reset my deadlines' to 'Shift
  due dates'
 2020-06-18 12:20:47 -04:00
Adeel Khan
f565c75d94 Fixes xss issues. 
PROD-1532
PROD-1533
PROD-1577
PROD-1578
 2020-06-18 15:09:55 +05:00
Calen Pennington
86e2677f26 Use a standard function to find out if a course has ended 2020-06-11 11:40:56 -04:00
Calen Pennington
514d10599d Refactor dates_banner conditionals slightly 2020-06-11 11:13:55 -04:00