Commit Graph

11627 Commits

Author SHA1 Message Date
stvn
ab8bcccd01 Normalize masquerade response data
so that it's easier to work with on the frontend.
2020-08-05 19:14:56 -07:00
Kyle McCormick
7e51232205 Revert "Bucket users regardless of enrollment in courseware MFE experiment" (#24700)
This reverts commit 06e04eff8c.

Omitting the course_key argument to ExperimentWaffleFlag.is_enabled
causes a 500 when the underlying experiment flag is enabled.

TNL-7405
2020-08-05 16:28:34 -04:00
Daphne Li-Chen
2b4926eb54 AA-211: sending certificate information and studio link for displaying on fe 2020-08-04 11:44:03 -04: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
Dillon Dumesnil
3c375f0f8e Merge pull request #24657 from edx/ddumesnil/assignment-type-prefix-aa-280
AA-280: Add assignment type to date blocks serialization
2020-07-31 12:05:17 -07:00
Dillon Dumesnil
7dda524aaf AA-280: Add assignment type to date blocks serialization 2020-07-31 10:56:38 -07:00
Michael Terry
bfb5884f79 Merge pull request #24620 from edx/mikix/enroll-alert
AA-124: Give Learning MFE enroll alert information
2020-07-30 12:48:15 -04:00
edx-pipeline-bot
8cfb6e6256 Merge pull request #24646 from edx/private_to_public_4cf3c00
Mergeback PR from private to public.
2020-07-30 20:15:02 +05:00
Uzair Rasheed
314fae8928 Merge pull request #190 from edx/security-fix/fix-xss-date
Fix xss in date
2020-07-30 10:59:44 +05:00
Uzair Rasheed
32fae72852 Merge pull request #192 from edx/security-fix/fix-xss-edit-member
Fix xss in edit member template
2020-07-30 10:59:21 +05:00
Carla Duarte
b50fb39fc8 AA-127: Created MFE Outline Tab Waffle Flag
Note: The team settled on raising a 404 when the waffle flag is disabled.
Upon receiving the 404, the frontend will redirect to the LMS.
2020-07-29 18:57:58 -04:00
Jansen Kantor
2ea6b253d6 allow plus or minus one (#24637) 2020-07-29 16:03:41 -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
stvn
dce22f461f Merge PR #24617 feat/lmfe/unbucket-enrollment
* Commits:
  Bucket users regardless of enrollment in courseware MFE experiment
2020-07-29 02:07:33 -07:00
Bianca Severino
9deb6e1b0f Merge pull request #24614 from edx/bseverino/support-sso-endpoint
Add SSO Records endpoint for support tools
2020-07-28 14:08:35 -04:00
Bianca Severino
136db5ec28 Add SSO Records endpoint for support tools 2020-07-28 13:39:49 -04:00
Ben Warzeski
beace438a4 update search description on new search string (#24619)
* update search description on new search string

* disable xss-lint rule for jquery.html
2020-07-28 09:21:59 -04:00
morenol
5949c17dda [BD-10] Remove uses bootstrap method (#24535) 2020-07-28 08:57:42 -04:00
Daphne Li-Chen
1d2dee8e25 AA-204: fixed up documentation and tests 2020-07-27 16:16:03 -04:00
Daphne Li-Chen
af1a7ca2d8 AA-204: adding tests 2020-07-27 16:15:53 -04:00
Daphne Li-Chen
6f8ecf3368 AA-204: passing correct section information to frontend to complete outline portion of tab 2020-07-27 16:15:53 -04:00
Michael Terry
01983a2bc0 AA-124: Give Learning MFE enroll alert information
Give it enough to know how to handle weirder outliers like
Masters or invitation only courses.
2020-07-27 16:04:42 -04:00
stvn
06e04eff8c Bucket users regardless of enrollment in courseware MFE experiment 2020-07-27 11:46:26 -07: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
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
uzairr
6b8f903188 Fix xss in edit member template 2020-07-23 22:49:08 +05: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
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
uzairr
a006eef364 Fix xss in date 2020-07-22 03:01:21 +05:00
Calen Pennington
83daf2a1c9 Add tests of ORA2 dates on the dates page 2020-07-21 15:17:51 -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
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
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
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