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

4877 Commits

Author SHA1 Message Date
Calen Pennington
f9619d6cad Add a pluggable CallToAction service for XBlocks 
This also has an initial use case for Personalized Learner Schedules
to add CTAs to capa and vertical blocks to allow users to shift their
course deadlines.
 2020-08-06 14:38:26 -04:00
Dillon Dumesnil
2d7c6b2730 Merge pull request #24693 from edx/ddumesnil/persist-masquerade-staff-aa-275 
AA-275: Persist Masquerade User staff status
 2020-08-06 06:53:53 -07:00
Nicholas D'Alfonso
754f231f68 AA-283 mobile reset dates endpoint 
- add has_ended to endpoint
 2020-08-05 11:53:59 -04:00
Dillon Dumesnil
c66bc865b6 AA-275: Persist Masquerade User staff status 
We need both the original user's staff status as well as
the staff status of the user being masqueraded as.
 2020-08-05 08:03:55 -07:00
Dillon Dumesnil
c0c1279bdb Merge pull request #24684 from edx/ddumesnil/fix-enabled-show-answer 
Fix for enabled_for to not assume the self_paced attr exists
 2020-08-04 11:43:55 -07:00
Alex Dusenbery
c69fb5b274 ENT-2892 | Bump edx-enterprise to 3.4.36. This version removes some model field references, but does not create a migration, to the test to check that migrations are in sync has been skipped here. 2020-08-04 14:24:56 -04:00
Dillon Dumesnil
f5c893e34d Fix for enabled_for to not assume the self_paced attr exists 
Also being defensive on category just in case
 2020-08-04 11:20:59 -07:00
Aarif
b00804fa4c remove cyclomatic code complexity calculation (#24662) 2020-08-04 23:02:21 +05:00
Aarif
09ac7f9372 remove cyclomatic complexity calculation for python code 2020-08-04 22:10:05 +05:00
Dillon Dumesnil
73dcd9f2a3 Merge pull request #24627 from edx/ddumesnil/show-answer-pls 
AA-261: Overridding Show Answer functionality for PLS courses
 2020-08-04 08:40:06 -07:00
Dillon Dumesnil
75f6937003 AA-261: Overridding Show Answer functionality for PLS courses 
We noticed that since users can choose to reset their due dates,
they would have the ability to let due dates pass and then for any
assessment that allows viewing the answer after the due date would be
visible. The user could thus view all answers and then reset their
due dates to receive a perfect score.

This PR works to fix that issue by changing all show answer values
to not take into account being past the due date when inside a PLS
course.
 2020-08-04 07:44:59 -07:00
Michael Terry
da4dc6c848 AA-278: Add offer html to the course-home API 
This is for the frontend-app-learning MFE to consume and show an
alert when offer_html is defined.

I've also tweaked that html a bit to work better in an environment
that doesn't have LMS's exact css.
 2020-08-04 09:38:58 -04:00
Alex Dusenbery
f9a5b7790b Upgrade edx-enterprise to 3.4.33 2020-08-03 15:38:31 -04:00
David Ormsbee
d1f23422ca Merge pull request #24417 from open-craft/ahmed/bb-2675-support-annonymous-outline-access 
[BD-29] [TNL-7263] Support Anonymous Courseware Access
 2020-07-30 16:22:02 -04:00
Jeff LaJoie
a2d2646ee5 Merge pull request #24634 from edx/jlajoie/enterprise-header-caching-fix 
Fixes session caching for enterprise portal links by only caching for auth'd learners
 2020-07-30 10:33:40 -04:00
Jeff LaJoie
4282530faf Fixes session caching for enterprise portal links by only caching for auth'd learners 2020-07-30 09:18:35 -04:00
Ahmad Bilal Khalid
53fe1dd7bc Adds Enrollment Processor which is responsible for respecting course's outline access. 
Moved data.py out into the parent's dirctory i.e learning_sequences directory to avoid circular import issue which is occuring when we try to import data.py from models.py.

A new CourseContext model is created, which is responsible for housing course specific fields e.g course_visibility.
 2020-07-30 12:44:19 +05:00
Adam Stankiewicz
00f4ea3fc3 fix keyerror with request.session (#24642) 
* fix keyerror with request.session

* improve the conditional
 2020-07-29 20:44:43 -04:00
David Ormsbee
7561fe751c Merge pull request #24385 from open-craft/mavidser/source-from-library-xblock 
[BD-14]"Source from Library" XBlock
 2020-07-29 12:14:48 -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
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
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
Talia
6d365ca1da fixes for front end saml work and to align with data requirements. 2020-07-24 14:45:34 -04:00
stvn
862e1a37d4 Merge PR #24577 fix/error/zendesk-proxy 
* Commits:
  Handle zendesk_proxy AttributeError
 2020-07-24 09:22:51 -07: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
Sid Verma
99220e0967 Add "Source from library" XBlock 
This lets the user import a block from a blockstore-based content library into a (modulestore based) course, by copying the block into the course.
 2020-07-24 13:32:37 +05:30
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
stvn
ef2ab1f296 Handle zendesk_proxy AttributeError 2020-07-22 15:31:02 -07: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
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
Matt Tuchfarber
fb6786d90c Merge pull request #24490 from edx/tuchfarber/use_demographics_api_for_banner 
Use new demographics API for banner in .org theme
 2020-07-17 14:02:55 -04:00
Matt Tuchfarber
cbeab67833 Use demographics api for dashboard banner 
Make demographics collection banner on dashboard use new demographics
API which checks enterprise as well. Also expose serialization of
CourseEnrollments.
 2020-07-17 13:20:42 -04:00
Aura Milena Alba
64edd0e686 Remove pattern library of learner_achievements. (#24369) 2020-07-17 12:45:58 -04:00
Patrick Cockwell
129ed1b9ab TNL-7303 Add course license details to Courseware API (#24393) 2020-07-17 10:15:21 -04:00
Jeff LaJoie
bf11b68fda ENT-2893: Updates header branding and href for Enterprise learners 2020-07-17 08:59:43 -04:00
Christie Rice
81bcfdf1ec MICROBA-393 Add customized partner report headings (#24502) 2020-07-16 08:58:08 -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
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
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