Commit Graph

18885 Commits

Author SHA1 Message Date
syed-awais-ali
b010dfd0f8 Merge pull request #19644 from edx/ihassan/OPS-939_edxapp_worker
Changed time zone to UTC for lms/cms
2019-01-24 14:24:12 +05:00
Rick Reilly
80bae1b112 Clean up the gradebook api to only send back the data the gradebook client needs 2019-01-23 11:42:29 -05:00
Simon Chen
f4a9d82db9 Merge pull request #19639 from edx/schen/possible_grade_override
Make sure we return the right possible_grade value on grade APIs
2019-01-23 10:44:14 -05:00
syedimranhassan
b7f9a78603 Changed time zone to UTC for lms/cms 2019-01-23 15:34:56 +05:00
Simon Chen
6739c0eb55 Make sure we return the right possible_grade value on grade APIs 2019-01-22 14:05:04 -05:00
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
Rabia Iftikhar
6c13717dc3 Merge pull request #19613 from edx/ri/EDUCATOR-3914-fix-enroll-now-text-contrast-ratio-lms
EDUCATOR-3914 fix enroll now text contrast ratio on LMS
2019-01-22 18:44:28 +05:00
Saleem Latif
46d97caa47 Consolidate recovery assistance forms 2019-01-22 15:09:11 +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
Ned Batchelder
48ac13e73e Merge pull request #19591 from cclauss/print_function
Use print() function in both Python 2 and Python 3
2019-01-16 17:59:11 -05:00
Matt Hughes
30fe021ac9 Fix styling for proctoring banner inside + outside bootstrap
also a11y update: up contrast on proctored exam interstitials to be
WCAG2AAA compliant

JIRA:EDUCATOR-3871
2019-01-16 10:39:37 -05:00
Zainab Amir
882bd1b750 LEARNER-6610:Make Account Settings form controls' border dark 2019-01-16 19:10:20 +05:00
rabiaiftikhar
6911ca6ed5 EDUCATOR-3914 fix enroll now text contrast ratio on LMS 2019-01-16 19:08:05 +05:00
Ned Batchelder
1e5c753807 Fix quality violations 2019-01-16 08:44:56 -05: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
Rick Reilly
82ffe9ee3b Create GET route for Subsection Grades, Overrides, and the Override History via subsection and userid 2019-01-15 12:54:32 -05:00
DawoudSheraz
3b402c52a5 fix proctoring messages color contrast ratio 2019-01-15 21:16:27 +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
Christie Rice
c39307f935 REVEM-125 Add program price to user metadata 2019-01-14 11:24:24 -05:00
cclauss
8fca11b85c Use print() function in both Python 2 and Python 3 2019-01-13 17:16:37 +01:00
David Ormsbee
74d53cf786 Merge pull request #19329 from open-craft/giovanni/bb-547-ospr
BB-547 - Fix certificate api when retrieving certificates from deleted courses
2019-01-11 11:22:45 -05:00
Giovanni Cimolin da Silva
8563cf437a Fix certificate api when retrieving certificates from deleted courses
This commit fixes a problem with the Certificates API that make it fail when trying to retrieve user certificates from courses that don't exist anymore.
The problem lies in the Certificate API not checking if the courses being retrieved by some user actually exist, to fix this, this commit improves the fault tolerance of the Certificates API.

This issue was found when investigating why a user profile page (/u/username) was returning 404's.
Turns out that LearnerAchievementsFragmentView used the certificates api to retrieve certificate information, which did not check if the course exists before trying to pull information from it, resulting in a cascade of errors that lead to a 404 on the user's profile page.

Signed-off-by: Giovanni Cimolin da Silva <giovannicimolin@gmail.com>
2019-01-11 11:40:00 -02:00
edx-pipeline-bot
674677daf5 Merge pull request #19577 from edx/private_to_public_21245f3
Mergeback PR from private to public.
2019-01-10 15:02:38 -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
Dave St.Germain
7c973450fb Merge pull request #19559 from edx/dcs/hide-dashboard
Hide the exam review dashboard unless the proctoring backend supports the feature
2019-01-10 10:33:16 -05:00
Dave St.Germain
aa7b71ac63 Clarify the assert method 2019-01-10 09:53:29 -05:00
Asad Iqbal
03766127b0 Merge pull request #19573 from edx/asadiqbal08/ENT-1419
asadiqbal08/ENT-1419 Show an alert for secondary email activation on dashboard.
2019-01-10 17:02:11 +05:00
asadiqbal
4823981599 ENT-1419 changes 2019-01-10 15:57:01 +05:00
Zainab Amir
b61df3af40 LEARNER-6944 Add new fields to SoftwareSecurePhotoVerification 2019-01-10 15:18:06 +05:00
Dave St.Germain
8b9028dbc6 Hide the exam review dashboard unless the proctoring backend supports the feature. 2019-01-09 14:02:15 -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
Julia Eskew
b350db7ede Read salt for retirement hashing from config. 2019-01-08 15:25:20 -05:00
Alex Dusenbery
577315f2a7 Refactor how grade override values are persisted. 2019-01-08 15:21:04 -05:00
Gabe Mulley
a86d499592 Merge pull request #19470 from edx/bfiller/REVE-189
Conditionalize track selection based on all FBE settings
2019-01-07 15:42:28 -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
Cali
a2452de4a9 Merge pull request #19471 from edx/cstenson/upgrade_link_refactor
Refactor verified_upgrade_link_is_valid to directly call Ecom service
2019-01-07 13:55:40 -05:00
Calen Pennington
8b014e1fef Add a test of the FBE Upgrade banner
REV-656
2019-01-07 13:11:35 -05:00
Bill Filler
c253374372 Conditionalize track selection based on settings of course duration and content gating 2019-01-07 09:47:37 -05:00