Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,671 Commits 1 Branch 0 Tags
7d55483fbeafe55c9d4ded9cbce12dc8ea44950f
Commit Graph

50671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
7d55483fbe Convert modify_access to require_course_permission 2019-08-05 09:59:30 -04:00
Calen Pennington
04e5501324 Convert add_users_to_cohorts to require_course_permission 2019-08-05 09:59:30 -04:00
Calen Pennington
a2ea80dbca Convert mark_student_can_skip_entrance_exam to require_course_permission 2019-08-05 09:59:30 -04:00
Calen Pennington
c270273e13 Convert get_issued_certificates to use requires_course_permission 2019-08-05 09:59:30 -04:00
Calen Pennington
2e1fec921c Add a decorator that checks for course-level permissions 2019-08-05 09:59:30 -04:00
Feanil Patel
1694e21827 Merge pull request #21265 from edx/feanil/make_upgrade 
Run make upgrade.
 2019-07-31 14:07:36 -04:00
Feanil Patel
6e590ac9a8 Run make upgrade. 2019-07-31 13:19:26 -04:00
Feanil Patel
55d4b272b0 Merge pull request #21257 from edx/feanil/python3_changes 
Feanil/python3 changes
 2019-07-31 13:16:12 -04:00
Feanil Patel
8564c6768c StringIO moved between python2 and python3. 
Grab it from six instead.
 2019-07-31 11:45:31 -04:00
Feanil Patel
b495a6babe NoneType not in types module in python3. 
Change our tests to use type(None) instead which works in both python2 and python3.
 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
Syed Muhammad Dawoud Sheraz Ali
f56776dba8 Merge pull request #21180 from edx/dsheraz/educator-4521 
Update DnD Xblock
 2019-07-31 13:03:09 +05:00
Ayub
69b647ae08 Merge pull request #21104 from edx/INCR-432 
INCR-432 python3 compatibility
 2019-07-31 12:29:26 +05:00
DawoudSheraz
82874538e3 run make upgrade to update DnD Xblock version 2019-07-31 11:08:04 +05:00
Calen Pennington
1836cce9e3 Merge pull request #21253 from cpennington/coverage-combine-test-suite 
Archive all coverage reports, named by test context
 2019-07-30 15:18:59 -04:00
Calen Pennington
d0b160888b Archive all coverage reports, named by test context 2019-07-30 15:18:25 -04: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
Awais Qureshi
4feaa7971d Merge pull request #21251 from edx/awais786/bom-68-django-wiki-0.23 
BOM-68
 2019-07-30 17:30:08 +05: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
Muhammad Zaid Bamber
1cb09ec344 Merge pull request #21250 from edx/revert-21090-zaid-prod-449 
Revert "Added logs for XQueue Information"
 2019-07-30 02:55:25 -07:00
Ayub
00ce1f84c3 Merge pull request #21084 from edx/INCR-421 
INCR-421 python3 compatibility
 2019-07-30 14:49:10 +05:00
Ayub
5a21319374 Merge pull request #21106 from edx/INCR-433 
INCR-433 python3 compatibility
 2019-07-30 14:48:25 +05:00
arbisoft
dfa2cb14b7 https://openedx.atlassian.net/browse/BOM-68 
Upgrade the django-wiki version.
 2019-07-30 14:44:52 +05:00
adeel khan
2f5ed8e199 Merge pull request #21249 from edx/adeel/prod-508_xss_lint_directive_leakage 
Fix xss-linter directives from edx-ace templates
 2019-07-30 14:37:14 +05:00
Muhammad Zaid Bamber
ffc2d9729b Revert "Added logs for XQueue Information" 2019-07-30 14:14:04 +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
fdd8652bb6 INCR-421 2019-07-30 12:23:10 +05:00
Ayub khan
7ca32f9197 INCR-433 python3 compatibility 2019-07-30 12:21:56 +05:00
Ayub
cf74aee8ff Merge pull request #21099 from edx/INCR-429 
INCR-429 python3 compatibility
 2019-07-30 12:07:28 +05:00
Feanil Patel
11d4cec9d7 Merge pull request #21245 from edx/feanil/fix_make_upgrade 
Constrain two more requirements.
 2019-07-29 16:24:51 -04:00
Feanil Patel
8746a67357 Merge pull request #21239 from edx/feanil/remove_unused_setting 
Rmove the extra configurabilty logic for reset buttons.
 2019-07-29 15:52:15 -04:00
Feanil Patel
d9f936b85b Constrain two more requirements. 
Both python 3 related but different reasons. numpy dropped python 3
support and faulthandler was pulled into python in python 3.3
 2019-07-29 15:48:01 -04:00
Feanil Patel
bb8420bb51 Rmove the extra configurabilty logic for reset buttons. 
The `DEFAULT_SHOW_RESET_BUTTON` is not actually referenced anywhere
other than in these two places where it's read.  As far as I can tell,
nothing sets this value so it's always going to fallback to false.

Since this mixin is imported during startup, removing this unblocks
testing on python3 where it can fail to start up if the settings haven't
fully loaded before you try to access them.
 2019-07-29 13:55:22 -04:00
Calen Pennington
8cee2685ad Merge pull request #21240 from edx/revert-21208-permission-courseware-view-course-home 
Revert "Convert a has_access check into a bridgekeeper rule"
 2019-07-29 12:06:29 -04:00
Calen Pennington
5e8f90caa1 Revert "Convert a has_access check into a bridgekeeper rule" 2019-07-29 11:38:26 -04:00
Feanil Patel
da3cdb4f26 Merge pull request #21232 from edx/feanil/remove_parsepy_leftovers 
Feanil/remove parsepy leftovers
 2019-07-29 10:52:13 -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
Waheed Ahmed
4a8f81f8bf Merge pull request #21230 from edx/waheed/PROD-482-remove-utm-param-from-pwd-reset 
Remove UTM params from password reset link.
 2019-07-29 18:48:40 +05:00
Dave St.Germain
9bd0d915dc Cache the total and filtered counts in the gradebook API. 2019-07-29 09:45:08 -04:00
Calen Pennington
a8a1dffbbb Merge pull request #21211 from cpennington/correct-combine 
Check the test-suite specific coverage file, and upload it earlier in…
 2019-07-29 09:39:08 -04:00
Calen Pennington
03d7d87850 Merge pull request #21160 from cpennington/fbe-orphan-block 
Only attempt to use the parent's CONTENT_GATING_PARTITION settings if…
 2019-07-29 09:29:47 -04:00
Waheed Ahmed
ecf9485e59 Remove UTM params from password reset link. 
This type of email is just a transactional message
and should not be crediting revenue to email. Removed
UTM parameters and added ?track=pwreset query param.

PROD-482
 2019-07-29 18:21:30 +05:00
Waheed Ahmed
c3d923f296 Merge pull request #21235 from edx/waheed/PROD-499-fix-image-croping-and-upload 
Fix image cropping and submission for photo ID verify.
 2019-07-29 18:17:37 +05:00