Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,365 Commits 1 Branch 0 Tags
2af91bf07d043c19365a2ef9b613e4d2e9fb494f
Commit Graph

3516 Commits

Author SHA1 Message Date
Matt Hughes
673fb797b8 make upgrade to version of edx-proctoring 
without blocking multiple concurrent sessions

also updates trace amounts of copy duplicated in tests between
edx-proctoring and edx-platform

JIRA:EDUCATOR-3931
 2019-01-22 12:47:40 -05:00
Matthew Piatetsky
08cb56664b Revert "change banner date localization to use dateutilfactory" 2019-01-20 18:27:03 -05:00
Matthew Piatetsky
d98643c37f Merge pull request #19609 from edx/fix_masquerade_banner 
ensure content start date banner only shows for currently open sections
 2019-01-17 13:12:42 -05:00
Matthew Piatetsky
58012317a1 Merge pull request #19590 from edx/REVMI-27 
change banner date localization to use dateutilfactory
 2019-01-17 12:49:56 -05:00
Matthew Piatetsky
9ba3e0c5a5 ensure content start date banner only shows for currently open sections 2019-01-17 12:32:08 -05:00
DawoudSheraz
bd262e000b Update Mathjax version to include a11y 2019-01-17 13:20:07 +05:00
David Ormsbee
8b47763543 Merge pull request #19253 from open-craft/agrendalath/xblock-handle-oauth 
Add OAuth2 and JWT support to XBlock handlers
 2019-01-16 19:46:20 -05:00
Agrendalath
aa0e06a15e Add OAuth2 and JWT support to XBlock handlers 
This adds OAuth2 and JWT API to call XBlock handlers. It is an alternative approach to #15940 - it reuses some DRF logic to handle this, but does not convert `handle_xblock_callback` to DRF view, which caused issues described in edx/XBlock#383.
 2019-01-17 00:17:38 +01:00
Zia Fazal
d02efb1d24 Merge pull request #19604 from edx/ziafazal/WL-1660 
WL-1660: Added ability to stop redirect to course home page
 2019-01-16 12:17:23 +05:00
Zia Fazal
0e1fff31e5 Added ability to stop redirect to course home page 
Added ability to stop redirect to course home page even if ENABLE_MKTG_SITE is enabled.

Fixed quality violations
 2019-01-15 16:47:37 +05:00
Matthew Piatetsky
f870f7c635 change banner date localization to use dateutilfactory 2019-01-15 03:30:53 -05:00
Christie Rice
9d23dfe270 REVEM-130 Remove program info from user metadata 2019-01-14 14:32:32 -05:00
Matthew Piatetsky
e1fd793e86 Merge pull request #19560 from edx/REVMI-2 
add informational banners when masquerading as user who would not have access due to start date
 2019-01-10 13:48:29 -05:00
Matthew Piatetsky
5bb56fe45f add informational banners when masquerading as user who would not have access due to start date 2019-01-10 11:06:30 -05:00
Christie Rice
8f8efc80dc REVEM-74 Add program info to user-metadata 2019-01-09 12:40:11 -05:00
Calen Pennington
6efe327311 Merge pull request #19489 from edx/tuchfarber/move_expiration_banner_REVMI_54 
Move banner REVMI-54
 2019-01-09 11:22:50 -05:00
Matt Tuchfarber
ac29017d88 Move banner REVMI-54 
Moves banner into the content instead of at the top. Adds a course
expiration fragment to the course home page, the content, the progress
page, and the discussion page.
 2019-01-09 10:17:16 -05:00
Diana Huang
6572d99e76 Remove all references to datadog from our code. 2019-01-08 15:41:24 -05:00
Calen Pennington
dc8aa9dae4 Merge pull request #19547 from cpennington/add-test-for-fbe-banner 
Add a test of the FBE Upgrade banner
 2019-01-07 14:26:20 -05:00
Calen Pennington
8b014e1fef Add a test of the FBE Upgrade banner 
REV-656
 2019-01-07 13:11:35 -05:00
Cali Stenson
7cbe1312a9 Refactor verified_upgrade_link_is_valid to directly call Ecommerce service. 
Additionally update code documentation to clarify expected behavior around
dynamic pacing deadlines.

REVO-69
 2019-01-04 15:07:39 -05:00
Matthew Piatetsky
4aa576d725 Merge pull request #19511 from edx/REVMI-72 
Ignore enrollment date for FBE when masquerading
 2019-01-02 09:53:13 -05:00
Awais Jibran
e3529ad258 Clean Xblock handler 2018-12-29 09:21:28 +05:00
Matthew Piatetsky
c515b3570e Merge pull request #19495 from edx/REVMI-50 
write tests for when verified mode expires
 2018-12-27 16:08:26 -05:00
Agha Awais
22992918d3 Merge pull request #19008 from edx/awais/lett_2_bc_registration 
TE-2654: Course registration bokchoy test
 2018-12-27 16:10:31 +05:00
Agha Awais
992083dd66 Merge pull request #19025 from edx/awais/lett_2_bc_courseware_word_cloud 
TE-2655: Courseware word cloud bokchoy tests
 2018-12-27 15:28:16 +05:00
Matthew Piatetsky
1396ca9173 Ignore enrollment date for FBE when masquerading 2018-12-26 20:29:44 -05:00
Agha Awais
b0d678d77c Courseware wordcloud tests 2018-12-26 21:26:26 +00:00
Agha Awais
371c1df4f3 Course registration bokchoy test 2018-12-26 20:51:15 +00:00
Matthew Piatetsky
e0b5e5cb97 write tests for when verified mode expires 2018-12-21 09:57:33 -05:00
Pooja Kulkarni
6f0e5d68d7 Make video contents visible to unenrolled users 
This is based on PR #19284 and is part of the
series of work related to the proposal #18134.

Adds VideoModule.public_view() to enable
unenrolled and anonymous users to view the video
contents of a public course.
When an unenrolled or anonymous user accesses the
video content of a public course, the
public_view() introduced in the previous PR is
used instead of student_view() method.
 2018-12-20 11:56:43 +05:30
Matthew Piatetsky
821c8dbac5 Merge pull request #19452 from edx/REVE-132 
Ensure masquerade works in courses that haven't started yet
 2018-12-19 09:58:18 -05:00
Michael Terry
e8555de4b4 Merge pull request #19423 from edx/mikix/password-history-removal 
Remove PasswordHistory
 2018-12-19 09:22:39 -05:00
Matthew Piatetsky
fc6cc94573 Ensure masquerade works in courses that haven't started yet 2018-12-19 08:43:54 -05:00
Matthew Piatetsky
947410463a localize datetime for banner 2018-12-18 14:52:05 -05:00
Bill Filler
684d6e3669 check if user is in holdback before showing new track selection 2018-12-17 16:05:13 -05:00
Michael Terry
01129787c0 Remove PasswordHistory 
This is a feature that has been deprecated and can be safely removed.

DEPR-7
 2018-12-13 13:18:56 -05:00
Matthew Piatetsky
eaa07082ed update messaging 2018-12-13 01:15:48 -05:00
Gavin Sidebottom
3dad2be55d Refactored XBlockAside rendering and added support for student view 2018-12-11 12:27:03 +05:00
David Ormsbee
192ed213f6 Merge pull request #19284 from open-craft/symbolist/access-for-unenrolled-learners 
Access for unenrolled learners.
 2018-12-10 11:03:00 -05:00
Matthew Piatetsky
14a899a65d REVE-104 & REVE-108: Ensure Course Roles' Access 2018-12-07 16:39:09 -05:00
Paulo Viadanna
c4fc4b5df6 Adds CouseModule.course_visibility and XBlock.public_view() for unenrolled users access to courses. 
The course_visiblity field can have one of three values:
1. private (default): This keeps the standard access rules.
2. public_outline: Allows unenrolled and anonymous users access to the outline.
3. public: Allows unenrolled and anonymous users access to both outline and
   course content.

When an unenrolled user accesses course content, instead of student_view(),
public_view() is used. A default implementation is provided for XBlocks
which do not implement this view. The public_view() must not have any
functionality which assumes the presence of a valid User and should show
a readonly only interface for the XBlock content.
 2018-12-07 22:17:36 +05:00
Cali Stenson
241cff006a Add user_metadata to reflect if a user has purchased before. 
REVO-20
 2018-12-07 07:48:32 -05:00
Matthew Piatetsky
67e9ae5581 Fix content gating a11y issues 2018-12-03 23:26:47 -05:00
Calen Pennington
bced52b728 Merge pull request #19334 from cpennington/enabled-as-of-datetime 
Enabled as of datetime
 2018-11-30 15:09:11 -05:00
Calen Pennington
31047260cc Switch ContentTypeGatingConfig.enabled_as_of and CourseDurationLimitConfig.enabled_as_of to datetimes 2018-11-30 10:02:53 -05:00
Matthew Piatetsky
08301a484e Ensure staff users do not see expiration banner 2018-11-29 09:45:49 -05:00
Matthew Piatetsky
815acda002 Populate experiment data with holdback key post enrollment and check holdback key when setting user group 2018-11-28 13:40:57 -05:00
Braden MacDonald
1e4dc51ac7 Allow calling xblock_view API with OAuth creds 2018-11-28 09:25:30 -08:00
noraiz-anwar
e0d19d6871 escape json for use in js 2018-11-28 17:31:27 +05:00