Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
53,520 Commits 1 Branch 0 Tags
0c2dfd136eafaae88a71df4eecdcacc3845fca45
Commit Graph

20747 Commits

Author SHA1 Message Date
Christie Rice
a9ebf91c4d REVMI-354 Revert masquerade changes (#21276) 2019-08-01 12:05:59 -04:00
David Ormsbee
b3614f3a00 Merge pull request #20954 from open-craft/symbolist/html-block 
HtmlModule to HtmlBlock [SE-1089]
 2019-08-01 11:36:23 -04:00
Matthew Piatetsky
6cc02f711d Merge pull request #21264 from edx/mpiatetsky_authz_5 
[REVMI-354] Add preview_certificates permission
 2019-08-01 09:48:39 -04:00
Christie Rice
0426446549 REVMI-354 Add view_courseware permission (#21237) 2019-08-01 09:12:48 -04:00
Christie Rice
3d062aab62 REVMI-354 Add enroll_in_course permission (#21243) 
* REVMI-354 Add enroll_in_course permission

* Fix test
 2019-08-01 08:37:41 -04:00
usama sadiq
825c02b4a2 Updated Spanish Language Code 
Changed Spanish language code from es to es-419
modified _build_help_center_url() to receive
selected language instead of default from settings.
 2019-08-01 13:24:30 +05:00
Usama Sadiq
c78db13de1 Merge pull request #21263 from edx/usama/learner-6735-help-center-language 
Updated Help Center Url
 2019-08-01 12:46:52 +05:00
usama sadiq
d83ec0f607 Updated Help Center Url 
Updated the generated url in the navigation
and footer based on the selected language of
the page.
 2019-08-01 12:12:06 +05:00
Calen Pennington
b5a8f67e64 Merge pull request #21219 from cpennington/permission-courseware-enable-masquerade 
Permission courseware enable masquerade
 2019-07-31 14:15:28 -04:00
Matthew Piatetsky
17ef02e34f add preview_certificates permission 2019-07-31 13:39:16 -04:00
Calen Pennington
136f58cb2d Add a staff-access specific bridgekeeper rule with full query support 2019-07-31 13:07:52 -04:00
Feanil Patel
8564c6768c StringIO moved between python2 and python3. 
Grab it from six instead.
 2019-07-31 11:45:31 -04:00
Uzair Rasheed
9076b5d31c Merge pull request #21261 from edx/revert-20001-master 
Revert "Support a URL address as FOOTER_ORGANIZATION_LOGO"
 2019-07-31 17:55:14 +05:00
Waheed Ahmed
77d4872bb3 Merge pull request #21262 from edx/waheed/PROD-499-fix-verify-image-aspect-ratio 
Fix photo ID verify images aspect ratio.
 2019-07-31 17:15:18 +05:00
Awais Jibran
6a7ddbb271 Merge pull request #21182 from edx/aj/fix-ltr-numaric-inputs 
Fix Numeric input problems are backwards for right-to-left languages
 2019-07-31 16:01:25 +05:00
Waheed Ahmed
05f758f1c1 Fix photo ID verify images aspect ratio. 
PROD-499
 2019-07-31 15:56:22 +05:00
Uzair Rasheed
01ebee0dca Revert "Support a URL address as FOOTER_ORGANIZATION_LOGO" 2019-07-31 15:25:11 +05:00
Ayub
69b647ae08 Merge pull request #21104 from edx/INCR-432 
INCR-432 python3 compatibility
 2019-07-31 12:29:26 +05:00
Calen Pennington
c00b60ffa5 Merge pull request #21244 from cpennington/check-permissions-view-course-home 
Check permissions view course home
 2019-07-30 13:06:13 -04:00
Calen Pennington
2d1eb9923f Convert a has_access check into a bridgekeeper rule 
This reverts commit 5e8f90caa1.
 2019-07-30 12:02:24 -04:00
Kyle McCormick
9f9a07db4f Stop the commerce API from deleting Masters course modes. 2019-07-30 11:18:23 -04:00
Nimisha Asthagiri
900b7e2515 Merge pull request #20001 from mahyard/master 
Support a URL address as FOOTER_ORGANIZATION_LOGO
 2019-07-30 08:16:44 -04:00
Ayub khan
ffc9e14635 INCR-432 python3 compatibility 2019-07-30 15:12:56 +05:00
Ayub
5a21319374 Merge pull request #21106 from edx/INCR-433 
INCR-433 python3 compatibility
 2019-07-30 14:48:25 +05:00
Adeel Khan
05718a63db Fix xss-linter directives from edx-ace templates 
PROD-508
 2019-07-30 13:34:44 +05:00
Ayub khan
7ca32f9197 INCR-433 python3 compatibility 2019-07-30 12:21:56 +05:00
Calen Pennington
5e8f90caa1 Revert "Convert a has_access check into a bridgekeeper rule" 2019-07-29 11:38:26 -04:00
Dave St.Germain
97e10e168c Merge pull request #21231 from edx/dcs/count-cache 
Cache the total and filtered counts in the gradebook API.
 2019-07-29 10:13:01 -04:00
Dave St.Germain
9bd0d915dc Cache the total and filtered counts in the gradebook API. 2019-07-29 09:45:08 -04:00
Waheed Ahmed
557213acc1 Fix image cropping and submission for photo ID verify. 
Using the available video resolution increasing the image and request
size and server started failing requests. Fixed it by using canvas
width and height.

PROD-499
 2019-07-29 17:36:18 +05:00
Awais Jibran
1dcfaef703 Fix Numeric input problems are backwards for right-to-left languages 2019-07-29 15:19:48 +05:00
Ayub
d5d10942b1 Merge pull request #21102 from edx/INCR-430 
INCR-430 python3 compatibility
 2019-07-29 13:21:07 +05:00
Calen Pennington
7fba761050 Convert a has_access check into a bridgekeeper rule 2019-07-26 11:41:30 -04:00
Zachary Hancock
2f6b4c0a46 Management command to reset program enrollment data (#21221) 
mgmt cmd to reset program enrollments data
 2019-07-26 09:39:40 -04:00
Usama Sadiq
af7ee42bde Merge pull request #21228 from edx/usama/prod-493-contact-us-form-spanish-translation 
Contact Us Form Spanish Translations
 2019-07-26 17:42:47 +05:00
Waheed Ahmed
ad0e05e6ba Merge pull request #21227 from edx/waheed/PROD-499-fix-photo-verification-image 
Fix image cropping for photo ID verify.
 2019-07-26 16:22:07 +05:00
Waheed Ahmed
8530513756 Fix image cropping for photo ID verify. 
In chrome on latest MacOS image was cropping, fixed by setting
video width and height to canvas.

PROD-499
 2019-07-26 15:58:08 +05:00
usama sadiq
c131418f9d Contact Us Form Spanish Translations 
Additional PR to enable the js and jsx translations.
 2019-07-26 15:18:08 +05:00
Ayub
b035c2f10b Merge pull request #21105 from edx/INCR-434 
INCR-434 python3 compatibility
 2019-07-26 13:05:43 +05:00
Ayub
ac919d6010 Merge pull request #21107 from edx/INCR-436 
INCR-436 python3 compatibility
 2019-07-26 13:03:40 +05:00
Ayub
ae574ae2cc Merge pull request #21108 from edx/INCR-437 
INCR-437 python3 compatibility
 2019-07-26 13:03:01 +05:00
Ayub
734d7a1308 Merge pull request #21109 from edx/INCR-438 
INCR-438 python3 compatibility
 2019-07-26 13:02:26 +05:00
Adeel Khan
b5aefd9e83 Fix courseware's app for xss injections. 
PROD-465
 2019-07-25 23:52:49 +05:00
David Ormsbee
b1f3d2cef2 Revert "Fix the unpredictable order randomization issue with randomized content blocks" 2019-07-25 13:42:20 -04:00
Dave St.Germain
75b0afe721 Merge pull request #21162 from edx/mroytman/EDUCATOR-4434-gradebook-user-counts 
add number of total users and number of filtered users to the gradebo…
 2019-07-25 09:54:09 -04:00
George Babey
82a010b3b2 Merge pull request #21202 from edx/hammad/WL-1951 
WL-1951 | White Label: MITxPRO Footer Links Not Working
 2019-07-25 09:45:40 -04:00
Aarif
4b1ef3005e Merge pull request #21116 from edx/INCR-447 
INCR-447 Python 3 compatibility
 2019-07-25 14:51:17 +05:00
Uzair Rasheed
408ca5645f Merge pull request #21050 from edx/LEARNER-3761/capa-grading-exception 
Restrict grading endpoints in LMS
 2019-07-25 14:23:24 +05:00
Adeel Khan
7d9be69112 Fix edx-ace templates 
This patch is part of multiple PR's to
protect templates against xss attack

PROD-465
 2019-07-25 12:51:05 +05:00
Aarif
cb530bf788 Merge pull request #21113 from edx/INCR-444 
INCR-444 Python 3 compatibility
 2019-07-25 12:43:33 +05:00