Commit Graph

4860 Commits

Author SHA1 Message Date
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
Binod Pant
167d8f278f ENT-3007 : round 2 API endpoints for samlproviderconfig and samlproviderdata (#24456)
* ENT-3007 auth/saml/v0/saml/providerdata and auth/saml/v0/saml/providerconfig endpoints

Move code to subfolder for samlproviderconfig

extra comma

undo accidental remove of import

GET works for a single config now

Use ModelViewSet to get all CRUD method. Test still fails

Add auth/saml/v0/providerdata endpoints

fixup reverse and test issue, remove leading caret

just triggering run, why is it failing in CI?

pycodelint fixes

Skip auth tests unless feature is on

Tests for post/put for samlproviderdata

move urls to their own folders

api tests for post samlprovierconfig

create 1 providerconfig test case

lint fixes

lint

lint

cleanup code local urls /samlproviderconfig works

note needed right now

Fix import errors

lint

unused import

wip: first attempt at rbac auth and jwt cookie in test

round 2 with enterprise uuid as url param for samlproviderconfig

improve tests, still dont pass

fix test by using system role, wip other test

fix create test

add get/post tests for providerdata

isort fixes

string lint fix

Cleanup based on feedback round1

move utils to tests package

Move util fn to openedx.feature area

lint

ENT-3007 : Round 2 of work on auth/saml/v0/providerconfig and auth/saml/v0/providerdata endpoints

* Fix test issue use string uuid for permission obj

* snake case changes provider_config

* snake case

* provider_data, tests and lint

* patch and delete tests for providerdata

* snake_case

* snake_case

* snake_case

* make patch test stronger

* 404 if invalid uuid for get param

* common util for validate uuid4

* unused import

* lint fixes for pycodestyle

* 400 when uuid is missing

* 400 instead of 404 for missing uuid

* spell fix

* update docstring for api usage

* docstring clarify
2020-07-15 10:34:26 -04:00
Aura Milena Alba
1cba2a0004 [BD-10] [DEPR-65][DEPR-74] Remove pattern library of course_bookmarks.py (#24233) 2020-07-15 10:23:14 -04:00
Awais Qureshi
9e0758ffba Merge pull request #24487 from edx/BOM-1890-fixing-dj-warnings
Django3.0 warnings fix
2020-07-15 19:16:12 +05:00
Calen Pennington
d6bf54b576 Add ORA2 dates to the dates page
ORA2 (openassessment) problems have multiple dates associated with are
not bound to the `due` date that is modified by Personalized Learner
Schedules. We expose the ORA2 dates separately in the dates page
so that learners aren't surprised by the differing deadlines.

[AA-223]
2020-07-15 09:52:22 -04:00
Michael Terry
f9d379203e Merge pull request #24391 from edx/mikix/assignments-complete
AA-225: Only consider scored items for past due assignments
2020-07-14 15:28:52 -04:00
Michael Terry
939f268da8 AA-225: Only consider scored items for past due assignments
When considering if an assignment is past due for the dates tab,
only look at the scored and graded units in the subsection (i.e.
ignore reading and video units).

This still leaves the "complete" field alone -- i.e. those
subsections will still be left incomplete generally. But for
assignment-focused tasks, they will instead be considered complete.
2020-07-14 15:04:19 -04:00
Carla Duarte
30ce747357 Merge pull request #24430 from edx/ciduarte/AA-187
AA-187: Mobile API for course deadline data
2020-07-14 14:29:24 -04:00
Albert (AJ) St. Aubin
77f3d9099b [MICROBA-437] Add api to determine demographics status based on user data 2020-07-14 12:58:07 -04:00
Awais Qureshi
fd6cb9e0d6 BOM-1890
Remove the context parameter from CourseKeyField.from_db_value()
2020-07-14 21:55:50 +05:00
Braden MacDonald
887941f3ce Merge pull request #24277: Fix broken tests due to invalid field name 2020-07-14 09:37:18 -07:00
Carla Duarte
61228f34cf AA-187: Mobile API for course deadline data 2020-07-14 12:29:08 -04:00
Christie Rice
a22957d504 Revert "MICROBA-393 Add customized partner report headings (#24437)" (#24480)
This reverts commit ef536e49de.
2020-07-14 11:30:11 -04:00
Nick
0b95c2d3ea Merge pull request #24451 from edx/AA-160-calendar-sync-initial-email
AA-160 calendar sync initial email
2020-07-14 11:24:36 -04:00
Nicholas D'Alfonso
858c3750b0 AA-160 calendar sync initial email
-use Amazon SES to send calendar sync email when user initially
 subscribes to the calendar sync feature
2020-07-14 10:58:01 -04:00
Christie Rice
ef536e49de MICROBA-393 Add customized partner report headings (#24437) 2020-07-14 10:37:36 -04:00
Robert Raposa
e89e1a4038 update oauth_dispatch ADRs to accepted (#24474)
The following oauth_dispatch ADRs are being
marked as accepted, because they were implemented
and are in use in Open edX.
- 0006-enforce-scopes-in-LMS-APIs.rst
- 0007-include-organizations-in-tokens.rst

Given that, scopes have still not been widely
adopted in Open edX, which would require additional
decisions and investment.
2020-07-14 09:57:30 -04:00
Ned Batchelder
3eb7b4e18d Merge pull request #24395 from fghaas/fix_profile_images_on_s3
Fix profile image URLs for image storage on non-public S3 buckets
2020-07-14 07:25:26 -04:00