Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,342 Commits 1 Branch 0 Tags
6739c0eb555a6ff9cd4e59258128f83c8bc52727
Commit Graph

48342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Chen
6739c0eb55 Make sure we return the right possible_grade value on grade APIs 2019-01-22 14:05:04 -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
4940db6052 Merge pull request #19611 from edx/saleem-latif/ENT-1452 
ENT-1452: Consolidate recovery assistance forms
 2019-01-22 16:12:06 +05:00
Saleem Latif
46d97caa47 Consolidate recovery assistance forms 2019-01-22 15:09:11 +05:00
noraiz-anwar
33fab4b1e4 audit track content gating for staff preview 2019-01-21 18:35:29 +05:00
DawoudSheraz
f9a7295a91 Merge pull request #19619 from edx/dsheraz/educator_3916 
fix video player various buttons accessibility
 2019-01-21 13:58:49 +05:00
Jeff Witt
ccbd9d5b83 fix video player various buttons accessibility 2019-01-21 12:10:32 +05:00
edx-pipeline-bot
4fbb4a2674 Merge pull request #19634 from edx/release-mergeback-to-master 
Merge release back to master
 2019-01-20 21:04:58 -05:00
Matthew Piatetsky
08cb56664b Revert "change banner date localization to use dateutilfactory" 2019-01-20 18:27:03 -05:00
Matt Hughes
4894ba2d94 Merge pull request #19614 from edx/matthugs/third-party-lib-i18n-configs 
Configuration changes to translation of third party lib
 2019-01-18 13:38:25 -05:00
Christopher Pappas
b7fe870705 Running make upgrade to bump edx-entprise from 1.2.3 to 1.2.5. Also, updating constraints.txt to prevent a backwards incompatible update from oauthlib 2019-01-17 13:31:39 -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
15c6cc7f4e Merge pull request #19509 from edx/dsheraz/mathjax_a11y_update 
mathjax a11y update
 2019-01-17 14:41:13 +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
316c128729 Merge pull request #19537 from edx/matthugs/proctoring-style-course-outline 
Fix styling for proctoring banner inside + outside bootstrap
 2019-01-16 16:34:45 -05:00
cclauss
7c56caf91e Merge pull request #1 from edx/nedbat/fix-quality-19591 
Fix quality violations.
 2019-01-16 22:26:14 +01:00
Michael Roytman
7d5e067dba Merge pull request #19535 from edx/mroytman/EDUCATOR-3829-proctortrack-configuration-in-studio 
Enable proctortrack exam configuration in Studio
 2019-01-16 12:11:23 -05:00
Matt Hughes
b6b8c64e3a Configuration changes to translation of third party lib 
JIRA:EDUCATOR-3913
 2019-01-16 11:41:50 -05:00
Michael Roytman
f3888c0020 add a proctoring settings button to course outline in Studio for each proctored subsection for a course using a provider that supports a dashboard 2019-01-16 11:29:27 -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
adeelehsan
31aec22785 Merge pull request #19605 from edx/aehsan/learner-6026/username_log_added_incase_of_exception 
Added logs
 2019-01-16 20:39:18 +05:00
Zainab Amir
33d4ba0f97 change account setting's form controls border color 
Change Account Settings form controls border color
 2019-01-16 20:19:09 +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
cclauss
b0c4c0c5f9 remove redundant backslashes in between brackets 2019-01-16 03:46:04 +01:00
Julia Eskew
7d0cf7f224 Merge pull request #19607 from edx/juliasq/change_author_name 
Change name in authors.
 2019-01-15 15:00:41 -05:00
Richard I Reilly
4e48d0e35e Merge pull request #19587 from edx/rir/audit 
Create GET route for Subsection Grades, Overrides, and the Override H…
 2019-01-15 14:08:34 -05:00
Julia Eskew
f0139ac1bd Change name in authors. 2019-01-15 14:03:42 -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
c5d1b47120 Merge pull request #19606 from edx/dsheraz/educator_3898 
fix proctoring messages color contrast ratio
 2019-01-15 22:49:58 +05:00
DawoudSheraz
3b402c52a5 fix proctoring messages color contrast ratio 2019-01-15 21:16:27 +05:00
Michael Youngstrom
786e857b4c Merge pull request #19580 from edx/youngstrom/pipeline-priv-jobs 
Enable private pipeline jobs
 2019-01-15 11:00:25 -05:00
Stu Young
4b9b77ede0 Merge pull request #19603 from edx/testeng/bokchoy_auto_cache_update_0d5c5af12582d9404cdbd74102fc36d99ea5777d 
Bokchoy db cache update
 2019-01-15 10:56:22 -05:00
edx-cache-uploader-bot
bad7d8e1b2 Updating migrations 2019-01-15 09:57:01 -05:00
Michael Youngstrom
d8e50c3f1a Enable private pipeline jobs 2019-01-15 09:53:38 -05:00
adeelehsan
2390966e9b Added logs 
added username log if unable to authenticate
newly created user for 1st time while its
account is still inactive.
Purpose of log is to find specific useranme
inorder to investigagte LERANER-6026
 2019-01-15 18:31:53 +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
Agha Awais
d8a9dd4357 Merge pull request #19584 from edx/awais/lett_2_bc_pages_II 
Remaining bokchoy tests for pages
 2019-01-15 16:41:47 +05:00
Zubair Afzal
74a47cdaa8 Merge pull request #19602 from edx/zub/ENT-1286-unlink-inactive-sap-learners 
ENT-1286 bump enterprise version to 1.2.3
 2019-01-15 14:22:30 +05:00
Matthew Piatetsky
f870f7c635 change banner date localization to use dateutilfactory 2019-01-15 03:30:53 -05:00
Agha Awais
c5caa17a54 Remaining bokchoy tests for pages 2019-01-15 08:16:51 +00:00
Zubir Afzal
788465932c ENT-1286 bump enterprise version to 1.2.3 2019-01-15 12:33:43 +05:00
Christie Rice
8f64058562 Merge pull request #19601 from edx/crice/REVEM-130 
REVEM-130 Remove program info from user metadata
 2019-01-14 15:18:02 -05:00