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

19868 Commits

Author SHA1 Message Date
Feanil Patel
b63d881462 Merge pull request #21303 from edx/BOM-80 
BOM-80
 2019-08-08 12:13:54 -04:00
Ayub
26a1445c93 Revert "BOM-70" 2019-08-08 17:39:45 +05:00
Awais Qureshi
16b80f5165 Merge pull request #21302 from edx/awais786/BOM-82 
BOM-82
 2019-08-08 12:36:31 +05:00
adeelehsan
3136b3ecd3 Removed google api key from github 
Prod-349
 2019-08-08 02:12:21 +05:00
edX Transifex Bot
4538a65396 geoip2: update maxmind geolite country database 2019-08-07 20:33:14 +00:00
aarif
61800c619f replaced StringIO imports with import from six 
replaced cStringIO and StringIO imports with import from six

fixed StringIO imports

fixed StringIO imports

fixed XSS python-wrap warning
 2019-08-08 00:09:16 +05:00
Feanil Patel
2c3e97dfbb Merge pull request #21301 from edx/feanil/fix_test_collection 
Fix some test collection in python 3.
 2019-08-07 10:12:10 -04:00
arbisoft
9d87c3c83b python 2 and 3 compatible method. 2019-08-07 17:01:30 +05:00
Zachary Hancock
90c9103a89 command to remove social auth users (#21280) 
remove social auth users command
 2019-08-06 15:48:19 -04:00
Feanil Patel
18e988b747 Fix some minor issues that prevent some tests from being collected. 2019-08-06 15:19:55 -04:00
David Ormsbee
483e654fcf Make CustomTagModule safe (remove Mako) [SEC-609] 
Prior to this commit, it was possible for course authoring teams
to import and execute Mako templates using the obscure "customtag"
tag (CustomTagModule). Since Mako templates can run Python code
(e.g. imports, database queries, etc.), this would give a course
team the ability to execute arbitrary, unsandboxed code on the
server.

This commit converts CustomTagModule to use the Python library's
string.Template instead. This should be broadly compatible with
the most basic and common usage of customtag, which is simple
variable substitution in the style of ${var_name}.
 2019-08-06 13:54:58 -04:00
Ayub
e5f3da9afa Merge pull request #21296 from edx/BOM-78 
BOM-78
 2019-08-06 18:49:19 +05:00
Ayub khan
2244540ade BOM-78 
Update uuid4().hex.decode(ascii) calls
 2019-08-06 17:16:08 +05:00
Ayub khan
c965e13c73 BOM-70 
-Removed Submit-feedback View
-Removed related tests
-Removed help_modal.html
-Removed help_modal.html test
-Removed zendesk from requirements
-Updated requirements
 2019-08-05 13:38:46 +05:00
Feanil Patel
624455c89a Use deprecated s3 mock from moto. 
Longer term we should move to boto3 in general and then we can use the
default moto mock for s3.
 2019-08-02 13:42:02 -04:00
David Ormsbee
7140948bb1 Merge pull request #20900 from open-craft/pooja/fix-username-hints-with-SSO 
SE-1199 Campus.il Fix unicode username hints with SSO
 2019-08-02 13:17:00 -04:00
Nimisha Asthagiri
d20f68b6e0 Merge pull request #21282 from edx/arch/depr-15-notes-token 
DEPR-15: Remove usage of firebase-token-generator
 2019-08-02 09:19:07 -04:00
uzairr
80316c632d Update Help msgs of management commands 
PROD-399
 2019-08-02 15:20:26 +05:00
Ayub khan
4b2f68da84 INCR-405 python3 compatibility 2019-08-02 13:51:10 +05:00
pkulkark
076d82970c Fix unicode username hints with SSO 
Usernames containing unicode characters were
reportedly not showing up correctly in the
registration form when registered with MOE/SAML,
FB and Google.
This change fixes the issue by overriding the
django setting SOCIAL_AUTH_CLEAN_USERNAMES to
disable the default username check that wasn't
allowing non-ascii values.
 2019-08-02 09:53:42 +05:30
Nimisha Asthagiri
c1a5d2fa06 DEPR-15: Remove usage of firebase-token-generator 
The old Notes Django app is the only caller of this no longer
supported library. I have verified that this old app is no
longer functional and is already slated to be removed as part
of DEPR-18.

So this commit simply removes the call to firebase-token-generator
and leaves removal of the Notes app to DEPR-18.
 2019-08-01 18:56:04 -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
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
edx-transifex-bot
3e2e815f1a geoip2: update maxmind geolite country database (#21272) 2019-08-01 10:45:52 +05: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
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
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
cf74aee8ff Merge pull request #21099 from edx/INCR-429 
INCR-429 python3 compatibility
 2019-07-30 12:07:28 +05: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
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
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
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
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
irfanuddinahmad
e723448a77 minor logs update 2019-07-29 16:22:42 +05:00
Feanil Patel
636af346d5 Don't skip the migration test. 2019-07-26 16:27:14 -04:00
Calen Pennington
82c49f0db9 Separate bokchoy coverage files by shard 2019-07-26 14:58:44 -04:00
Muhammad Zaid Bamber
b7d4f30769 Revert "Fixed CDN urls to Static urls on edit." 2019-07-26 11:42:15 +05: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
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
irfanuddinahmad
df1c7f553a reformatted logging 2019-07-25 16:10:48 +05:00
Ayub
877168f72b Merge pull request #21081 from edx/INCR-420 
INCR-420 python3 compatibility
 2019-07-25 15:50:03 +05:00
Ayub
c5a4154400 Merge pull request #21098 from edx/INCR-428 
INCR-428 python3 compatbility
 2019-07-25 15:49:28 +05:00
Ayub
dc9f67c618 Merge pull request #21096 from edx/INCR-427 
INCR-427 python3 compatibility
 2019-07-25 14:50:38 +05:00
Ayub
2a22ff3890 Merge pull request #21080 from edx/INCR-419 
INCR-419 python3 compatibility
 2019-07-25 14:50:06 +05:00
Aarif
5255799845 Merge pull request #21085 from edx/INCR-423 
INCR-423 Python 3 compatibility
 2019-07-25 14:34:21 +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