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

50684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dillon-Dumesnil
d5cfe35ece Merge pull request #21252 from edx/ddumesnil/disco-1222 
DISCO-1222: Allow switching course numbers for reruns
 2019-08-01 15:22:46 -04:00
Matthew Piatetsky
a4866d4163 [REVMI-354] add view_ccx_coach_dashboard permission (#21259) 
[REVMI-354] add view_ccx_coach_dashboard permission
 2019-08-01 15:17:53 -04:00
Michael Youngstrom
701ea97750 Add boto3 retry to xdist script (#21271) 2019-08-01 14:21:24 -04:00
Christie Rice
c146f82e84 REVMI-354 REVMI-356 Revert more masquerade code (#21278) 
* REVMI-354 REVMI-356 Revert more masquerade code

* Fix quality
 2019-08-01 13:17:52 -04:00
Matthew Piatetsky
628ae59682 add view_ccx_coach_dashboard permission 2019-08-01 12:41:47 -04:00
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
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
edx-transifex-bot
3e2e815f1a geoip2: update maxmind geolite country database (#21272) 2019-08-01 10:45:52 +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
Feanil Patel
1694e21827 Merge pull request #21265 from edx/feanil/make_upgrade 
Run make upgrade.
 2019-07-31 14:07:36 -04:00
Matthew Piatetsky
17ef02e34f add preview_certificates permission 2019-07-31 13:39:16 -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
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
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
Dillon Dumesnil
e5fbfb02c6 DISCO-1222: Allow switching course numbers for reruns 
Adds in tests for the new functionality while maintaining the old Validation Error message
 2019-07-31 10:42:09 -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