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

6745 Commits

Author SHA1 Message Date
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
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
Calen Pennington
2b2a6cca23 Never show the dates banner on archived courses 2020-06-11 11:13:55 -04:00
Calen Pennington
c6695e0b6f Only actually reset user schedule if they have missed deadlines and not missed any gated content deadlines 2020-06-10 15:18:53 -04:00
Calen Pennington
15df17034a Only prompt the user to upgrade if they have missed the deadline of gated graded content 2020-06-10 15:18:53 -04:00
adeel khan
76419f9d01 Merge pull request #23913 from edx/adeel/prod_1505_improve_security_lockouts_logic 
Improving user locked out logic.
 2020-06-10 14:21:16 +05:00
Diana Huang
cd79f2032f Remove additional templates not needed. 2020-06-09 13:26:22 -04:00
Adeel Khan
2383fb3fa6 Improving user locked out logic. 
This patch improves on the user locked
out logic by providing a helping message
near locked out. This would help reduce
retries by giving user the option to use
password reset flow to fix the issue.

PROD-1505
 2020-06-09 09:36:42 +05:00
Carla Duarte
01b693a5c3 AA-173: Assignment Type on Dates Page 
Appending the assignment type to each graded
assignment on the Dates Tab. Exposed the 'format'
field, which corresponds to the graded assignment type.
 2020-06-08 10:27:50 -04:00
stvn
83b2f6e535 Fix issue w/ staff toolbar's Insights link 
since the configuration value does _not_ include the `/courses` bit in
either stage or prod.

Note: The value for prod contains a trailing slash, while stage does not
🤷

I tested locally that this should work with either config
(trailing slash or not).
 2020-06-03 15:05:06 -07:00
Calen Pennington
b37be506fe Use content_type_gating to determine whether a learner has access to content on the dates page 2020-06-03 15:08:49 -04:00
stvn
9dd97a5c64 Merge PR #24020 add/staff-toolbar-links 
* Commits:
  Remove 'View In Studio' link from vertical
  Add Studio and Insights buttons to Instructor Toolbar
 2020-06-03 09:38:32 -07:00
Calen Pennington
f9cfbd8593 Revert "Merge pull request #24131 from edx/revert-24085-use-content-type-gating-in-dates-banner" 
This reverts commit c3ec8b837a, reversing
changes made to 4252b14927.
 2020-06-03 09:57:22 -04:00
Calen Pennington
561cdab7dd Revert "Use content type gating in dates banner" 2020-06-03 09:52:24 -04:00
Calen Pennington
4252b14927 Merge pull request #24085 from cpennington/use-content-type-gating-in-dates-banner 
Use content type gating in dates banner
 2020-06-03 09:50:09 -04:00
stvn
4490e4ca2b Remove 'View In Studio' link from vertical 
in favor of display in the Staff Instructor Toolbar.
 2020-06-02 16:00:33 -07:00
stvn
43ac90e30d Add Studio and Insights buttons to Instructor Toolbar 
in a feature backport from the new Courseware/Learning MFE.
 2020-06-02 16:00:32 -07:00
Calen Pennington
6029d53a4f Don't upsell content to mobile app users in the dates_banner 2020-06-02 14:23:28 -04:00
Calen Pennington
7c4585ebfe Only prompt to upgrade in order to completed graded content (or shift dates) when content_type_gating is enabled 2020-06-02 14:23:28 -04:00
Calen Pennington
07d9d74b7c Remove extraneous variables from dates_banner.html 2020-06-01 15:48:46 -04:00
Calen Pennington
6f568d097c Set missed_deadlines in the course outlines template to simplify the logic in the dates_banner.html 2020-06-01 15:48:40 -04:00
Ahtisham Shahid
5d9555f6a3 removed technical email from module error 2020-06-01 19:07:30 +05:00
Calen Pennington
0a691f244f Pull out def for dates-page upgrade-for-graded-content dates-banner 2020-05-28 15:17:39 -04:00
Calen Pennington
2d306781a7 On mobile dates banner, distinguish between the missed-deadlines and no-missed-deadlines case on the dates page 2020-05-28 15:17:39 -04:00
Calen Pennington
fe417cd6c1 Use the separate defs for outline-page behavior 2020-05-28 15:17:39 -04:00
Calen Pennington
4d42d3eb79 Pull specific dates_banner content out into separate defs to separate the logic from the display 2020-05-28 15:17:39 -04:00
Calen Pennington
1c9b18f8ee Remove redundant conditions in the third clause of dates_banner.html 2020-05-28 15:17:39 -04:00
Calen Pennington
28aedc7cde Remove redundant conditions in the second clause of dates_banner.html 2020-05-28 15:17:38 -04:00
Calen Pennington
87dab3d996 Remove redundant conditions in the first clause of dates_banner.html 2020-05-28 15:17:38 -04:00
Calen Pennington
39e72d3886 Separate out various boolean values in the dates_banner.html in order to make it easier to reference them 2020-05-28 15:17:38 -04:00
Calen Pennington
9a60465874 Split separate dates-banner conditions into multiple copies of the same code 2020-05-28 15:17:38 -04:00
hasnain.naveed
c51dc9db20 ENT-2818 | Added enterprise slug login's url on edx login page. 2020-05-28 19:58:46 +05:00
Nimisha Asthagiri
5b3f5ee85a commerce app: remove code related to shoppingcart (#23974) 
Part of DEPR-43 - https://openedx.atlassian.net/browse/DEPR-43

Co-authored-by: Jeremy Bowman <jbowman@edx.org>
 2020-05-28 09:46:12 -04:00
Jeremy Bowman
49fd99acfb Remove obsolete shoppingcart refund page - DEPR-43 (#24063) 
As part of the deprecated shoppingcart code removal, remove the old refund support page (which was only ever used for shoppingcart purchases, not ecommerce transactions).

I checked in New Relic for good measure, and this view hasn't been accessed in the past week.
 2020-05-27 15:26:08 -04:00
Calen Pennington
f3c1747051 Check for the mobile app specifically in the dates banner conditionals 2020-05-27 11:19:12 -04:00
Diana Huang
1c1c2e1c75 Remove shoppingcart references from templates. 2020-05-26 13:09:32 -04:00
Nick
d1ac7d4b16 Merge pull request #24015 from edx/ndalfonso/AA-151-dates-banner-on-course-outline-and-refactor 
AA-151 dates banner on course outline and refactor
 2020-05-21 13:57:25 -04:00
Nicholas D'Alfonso
b454f9be1d AA-151 dates banner on course outline and refactor 
- use new dates banner template on course outline page
- remove old banner from main.html
- let dates tab use new dates banner template
- remove dates banner completely from the courseware problem view
  on the web app
- use new banner on the courseware problem view on the mobile app
- update banner util to use get_course_blocks
 2020-05-21 13:23:05 -04:00