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

50630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
irfanuddinahmad
0e8f5a9c4a Merge pull request #21233 from edx/iahmad/ENT-1954-Update-Logs-For-Enterprise-SSO-Workflows 
ENT-1954 Third party auth logs update
 2019-07-29 16:46:43 +05:00
irfanuddinahmad
e723448a77 minor logs update 2019-07-29 16:22:42 +05:00
Ayub
d5d10942b1 Merge pull request #21102 from edx/INCR-430 
INCR-430 python3 compatibility
 2019-07-29 13:21:07 +05:00
Feanil Patel
636af346d5 Don't skip the migration test. 2019-07-26 16:27:14 -04:00
Feanil Patel
63f8167dfc Remove the task that is no longer being referenced. 
Second phase for removing the task. The references to it were removed
earlier as a part of DEPR-41
 2019-07-26 16:24:05 -04:00
Feanil Patel
f21017d5d6 Remove the configmodel for push notifications. 
This feature was used to enable/disable push notifications using
Parse.com.  That service died a few years ago but this was never cleaned
up.  Cleaning it up as a part of DEPR-41 now that we've removed the code
that references this model.
 2019-07-26 16:19:55 -04:00
Calen Pennington
68b83f763f Rename who-tests-what environment variables 2019-07-26 14:58:44 -04:00
Calen Pennington
f638723b24 Specify unittest wtw branch 2019-07-26 14:58:44 -04:00
Calen Pennington
82c49f0db9 Separate bokchoy coverage files by shard 2019-07-26 14:58:44 -04:00
Feanil Patel
21595eaefc Merge pull request #21198 from edx/feanil/update_sandbox_matplotlib 
Update matplotlib and numpy in codejail sandbox.
 2019-07-26 14:15:41 -04:00
Calen Pennington
f668e0f53a Merge pull request #21208 from cpennington/permission-courseware-view-course-home 
Convert a has_access check into a bridgekeeper rule
 2019-07-26 12:10:44 -04: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
Muhammad Zaid Bamber
b9c9df00c4 Merge pull request #21225 from edx/revert-20793-zaid-prod-250 
Revert "Fixed CDN urls to Static urls on edit."
 2019-07-26 03:13:47 -07: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
Awais Qureshi
89d0f81855 Merge pull request #21216 from edx/awais786/BOM-68-django-wiki 
BOM-68-edx-django-wiki
 2019-07-26 12:57:24 +05:00
Muhammad Zaid Bamber
b7d4f30769 Revert "Fixed CDN urls to Static urls on edit." 2019-07-26 11:42:15 +05:00
Muhammad Ammar
b793c5e791 Merge pull request #21224 from edx/ammar/bump-edx-enterprise 
bump edx-enterprise version to 1.8.6
 2019-07-26 10:43:30 +05:00
adeel khan
9645035d16 Merge pull request #21124 from edx/adeel/part5_fix_templates 
Fix courseware's app templates.
 2019-07-26 00:37:55 +05:00
muhammad-ammar
e3e74788f6 bump edx-enterprise version to 1.8.6 2019-07-26 00:26:48 +05:00
Douglas Hall
642be6c8b6 Upgrade edx-enterprise to 1.8.5. (#21223) 2019-07-25 15:20:33 -04:00
adeel khan
03bb45ad62 Merge pull request #21125 from edx/adeel/django_linter 
Adds Django template Linter.
 2019-07-26 00:07:13 +05:00
Adeel Khan
b5aefd9e83 Fix courseware's app for xss injections. 
PROD-465
 2019-07-25 23:52:49 +05:00
David Ormsbee
5a2c3149a0 Merge pull request #21222 from edx/revert-20723-guruprasad/fix-rcb 
Revert "Fix the unpredictable order randomization issue with randomized content blocks"
 2019-07-25 14:30:34 -04:00
David Ormsbee
b1f3d2cef2 Revert "Fix the unpredictable order randomization issue with randomized content blocks" 2019-07-25 13:42:20 -04:00
Feanil Patel
e1b9869b26 Merge pull request #21194 from edx/feanil/remove_parsepy 
DEPR-41 Remove parsepy
 2019-07-25 10:25:08 -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
Adeel Khan
37c6b60fc8 Adds Django template linter. 
This adds Django template linter that
would check for all trans/blocktrans
tag expressions for escaping.

PROD-465
 2019-07-25 18:54:03 +05: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
irfanuddinahmad
a6045f9d13 Merge pull request #21217 from edx/iahmad/ENT-1954-Reformat-Logs-For-Enterprise-SSO-Workflows 
ENT-1954: Reformatted logging for third party auth
 2019-07-25 17:31:40 +05:00