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

11640 Commits

Author SHA1 Message Date
David Ormsbee
c0339a0b78 Merge pull request #24586 from open-craft/nizar/add_other_course_settings_to_course_blocks_api 
Adds Custom Extra Fields  to Course Blocks API through LMS Settings
 2020-08-06 15:09:39 -04:00
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
Nizar Mahmoud
c0b6260c3e Adds Custom Extra Fields to Course Blocks API through LMS Settings 2020-08-06 21:27:31 +03:00
edx-pipeline-bot
30750d6c52 Merge pull request #24713 from edx/private_to_public_fa71eec 
Mergeback PR from private to public.
 2020-08-06 22:14:31 +05:00
stvn
26e2b35bc4 Merge PR #24455 add/masquerade/as-specific-student 
* Commits:
  Add active group name to masquerade endpoint
  Fix masquerade message
  Normalize masquerade response data
 2020-08-06 09:15:58 -07:00
adeelehsan
fa71eecc77 Merge pull request #193 from edx/aehsan/fixed_xss_linter_violations 
Fixed xss linter violations
 2020-08-06 20:31:33 +05: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
Michael Terry
2fe4d34a4b Merge pull request #24682 from edx/mikix/course-expired-html 
AA-279: Add course-expired html to the course-home outline API
 2020-08-06 09:48:37 -04:00
stvn
d4f1c271aa Add active group name to masquerade endpoint 2020-08-05 19:15:12 -07:00
stvn
3fce917fce Fix masquerade message 
by removing the "escaped" username. I'm not sure why we this is done
this way (it's displayed the same way in the existing experience.
 2020-08-05 19:14:56 -07:00
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
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
Michael Terry
bffa3f9f24 AA-279: Add course-expired html to the course-home outline API 
This will let the learning MFE render it on the outline tab (like
it already does on the courseware tab).
 2020-08-04 13:45:25 -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
adeelehsan
c8e0a28bab Fixed xss linter violations 
PROD-1725
PROD-1726
PROD-1617
 2020-07-23 10:26:28 +05: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