Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

6923 Commits

Author SHA1 Message Date
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
Carla Duarte
f8963fe11e Merge pull request #24016 from edx/ciduarte/AA-152 
AA-152: Course Start Date for PLS
 2020-05-21 08:56:33 -04:00
adeelehsan
cc3d3aa4ab Merge pull request #24023 from edx/aehsan/PROD-1610/fixed_xss_lint_issues 
Fixed lint issues
 2020-05-21 17:45:43 +05:00
adeelehsan
98590dbddf Fixed xss lint issues 
PROD-1609
PROD-1610
PROD-1614
PROD-1615
PROD-1616
 2020-05-21 17:22:32 +05:00
Waheed Ahmed
c7f4e16470 Fix XSS lint issues for course_cta_text 
PROD-1602
 2020-05-21 12:51:07 +05:00
Carla Duarte
8b376e271c AA-152: Course Start Date for PLS 
Updated the displayed start date for a learner in a self paced course
that appears in the Learner Dashboard and the Dates tab.
Used the max of the course start date and the learner's enrollment date.
 2020-05-20 13:18:31 -04:00
Jeff LaJoie
efa7b3b816 AA-164: Performance fixes for course home 2020-05-20 10:09:41 -04:00
Dillon Dumesnil
97af77e785 Merge pull request #23902 from edx/ddumesnil/dates-external-api-AA-115 
AA-115: Adding external API for dates tab
 2020-05-19 13:01:50 -07:00
Dillon Dumesnil
7cd821b52e AA-115: Adding external API for dates tab 
This adds in the API for the Dates Tab for use by the
Course Home MFE.
 2020-05-19 12:35:43 -07:00
Aura Milena Alba
04802d2d72 Remove pattern library of programs.html (#23951) 2020-05-19 09:33:24 -04:00
Carla Duarte
069aea8f40 Dates Intro Messaging 
Added a banner to introduce learners to the Dates Tab.
The banner is hidden when the learner has missed deadlines.

Refactored naming conventions in the dates sass file to better
reflect the function of our banners.

AA-156
 2020-05-13 13:20:53 -04:00
Nick
821eb84486 Merge pull request #23963 from edx/ndalfonso/AA-157-dates-page-missed-deadlines 
AA-157 dates page missed deadlines
 2020-05-13 10:24:10 -04:00
adeelehsan
5f26cde55f Merge pull request #23969 from edx/aehsan/PROD-1579/fixed_quality_violation 
Fixed  xss lint violations
 2020-05-13 06:39:01 +05:00
adeelehsan
3da5144fee Fixed python-wrap-html 
PROD-1579
 2020-05-13 06:12:30 +05:00
Jeremy Bowman
f17e12ba0e Remove shoppingcart from course about page - DEPR-43 (#23973) 
Remove all references to the shoppingcart app from the course about page. Also removed one test of shoppingcart functionality from the student app.
 2020-05-12 15:03:47 -04:00
Nicholas D'Alfonso
637b639e78 AA-157 dates page missed deadlines 
- add banner to dates page when deadlines are missed
 2020-05-12 13:02:26 -04:00
Jansen Kantor
f4a2303013 EDUCATOR-5043: remove grades from program progress page (#23940) 
* remove grades from program progress page
 2020-05-08 14:46:20 -04:00
Ali Akbar
0955865fa9 Merge pull request #23885 from edx/aakbar/PROD-1478 
Unauthenticated Contact Us improvements
 2020-05-08 19:49:06 +05:00
Albert (AJ) St. Aubin
bf3aaffe4d PR to fix issue loading dashboard when there is a version mismatch in 
CourseOverview

    This line of code will cause a failure in the retrieval of the
    CourseOverview get_from_id method because it attempts to load with a
    string rather than a CourseKey.
 2020-05-08 08:18:25 -04:00
Ali-D-Akbar
94907cc4a9 Unauthenticated Contact Us improvements 
fix password reset page, add another test and remove typo

improve js test

add quality changes

add quality changes
 2020-05-08 14:14:35 +05:00
stvn
599adebf21 Merge PR #23932 revert/iframe-logging 
* Commits:
  Revert "Add logging to Learning MFE iframe, temporarily"
 2020-05-07 12:41:57 -07:00
stvn
d608b43471 Revert "Add logging to Learning MFE iframe, temporarily" 
This reverts commit 2ddc35cd79.
 2020-05-06 19:43:11 -07:00
Dillon Dumesnil
10759a9046 Merge pull request #23819 from edx/ddumesnil/more-date-pills-aa-99 
AA-99: Adding in new date pills for the dates tab
 2020-05-06 06:12:50 -07:00