Commit Graph

4861 Commits

Author SHA1 Message Date
Ayub
85be57b64a Merge pull request #21397 from edx/BOM-95
BOM-95
2019-08-22 12:41:08 +05:00
Feanil Patel
f332b81e4c Merge pull request #21384 from edx/bom/python-3-swarm
Bom/python 3 swarm
2019-08-21 09:27:59 -04:00
Ayub khan
8a95a8e520 BOM-95
assertItemsEqual with six.assertCountEqual
2019-08-21 17:01:40 +05:00
Feanil Patel
73a146fbbe Revert "assertItemsEqual() moved to assertCountEqual()"
This reverts commit 3d2617983b.

The change was not quite right because the method six provides needs to
have `self` be passed in as well.  See the docs here:
https://six.readthedocs.io/#unittest-assertions

Reverting for now and we can fix it in smaller chunks later.
2019-08-20 15:31:20 -04:00
Diana Huang
c94ffcdc72 Remove the microsites djangoapp. 2019-08-20 12:31:51 -04:00
Feanil Patel
6e6c489f1f Merge pull request #21372 from edx/feanil/fix_cmp_issues
Fix a few issues we run into when running tests in python 3.
2019-08-20 11:28:23 -04:00
Dave St.Germain
3d2617983b assertItemsEqual() moved to assertCountEqual() 2019-08-19 17:00:17 -04:00
Dave St.Germain
a3b52662d1 Prevent changing dict while iterating 2019-08-19 16:27:04 -04:00
Dave St.Germain
9d8db8e4ca Convert to utf-8 before JSON decoding 2019-08-19 15:10:56 -04:00
Nimisha Asthagiri
d564af8301 Fix for decode errors in bulk_email.tests.test_course_optout.py 2019-08-19 14:26:48 -04:00
Diana Huang
eaec9febb4 Merge pull request #21355 from edx/diana/microsite-deletion-migrations
Deletion migration for microsites tables.
2019-08-19 13:34:44 -04:00
Nimisha Asthagiri
b97db5aa86 Fix encode before calling md4 hash in common/djangoapps/util/memcache.py 2019-08-19 11:51:05 -04:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375)
Convert response bytes to str before JSON parsing.
2019-08-19 11:01:55 -04:00
Dave St.Germain
063c6fa1e5 Reload has moved in python3 2019-08-19 10:35:08 -04:00
Dave St.Germain
5febcce20c Fix python3 compatibility in SafeCookieData and elsewhere 2019-08-19 10:24:15 -04:00
Zainab Amir
db67a212e8 Remove create_user management command (#21322)
Our internal docs suggest using manage_user instead of create_user. We
are no longer using it and it can be removed

LEARNER-3934
2019-08-17 13:50:58 +05:00
Diana Huang
3455ff7393 Deletion migration for microsites tables. 2019-08-16 16:30:01 -04:00
Feanil Patel
46b730a9a0 reload is not a system built-in in python 3.
If we're in python 3 import reload from importlib.
2019-08-16 15:20:10 -04:00
Ayub
658cd5c62e BOM-70 (#21327)
* Update Financial Assistance logic

Use the zendesk proxy app instead of the unsupported zendesk library.

* Move to pre-fetching the group IDs.

Rather than making extra requests to zendesk to list all groups and find
a specific group ID. Just make a pre-filled list of group IDs for the
groups we care about.  When a group name is passed in, it is checked
against this list and the ticket is created in the correct group so the
right people can respond to it.
2019-08-16 13:05:35 -04:00
Feanil Patel
f5f875401a Fix some of the common test collection issues. (#21340)
* Remove old  performance tests that we haven't been running.

As far as I can tell, these tests to capture HAR files were created 5
years ago and not being run as a part of our suite?  They capture HAR
data that we do nothing with so even if they were running we should
remove them until we're ready to care about consuming this kind of
information.

* Update password test unicode string.
* Add ugettext translation helper function.
* Fix lambda syntax that is not valid in python 3.
* Fix ur raw strings which his not valid in python 3
* Use edx_six.get_gettext instead of ugettext.
* Fix a few other encoding issues.
* Don't use old form of sorted funciton.

This form which uses a 'cmp' method is not available in python 3.
2019-08-16 11:31:36 -04:00
Diana Huang
bf7dad15e4 Remove microsite djangoapp except migrations and configuration. 2019-08-16 09:42:57 -04:00
Feanil Patel
083d1b4ce7 Merge pull request #21313 from edx/BOM-85
BOM-85
2019-08-12 10:01:07 -04:00
arbisoft
9b87cb0172 BOM-85
he builtin basestring abstract type was removed. Use str instead.
2019-08-09 22:08:57 +05:00
Ayub
45ab1fec53 Merge pull request #21316 from edx/BOM-70-1
BOM-70
2019-08-09 20:19:18 +05:00
Ayub khan
3b074323b8 BOM-70
-Remove Depricated View and tests
2019-08-08 21:32:42 +05:00
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
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
Zachary Hancock
90c9103a89 command to remove social auth users (#21280)
remove social auth users command
2019-08-06 15:48:19 -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
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
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
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
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
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
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
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
Feanil Patel
1f7b12a38d Remove references to push notifications.
Push notifications was only ever setup to connect to Parse.com a service
that has been discontinued.  Since we haven't replaced the functionality
for a few years now, remove this dead code.

In cms/templates/js/course_info_update.underscore we're allowing content
to not be escaped because this is by design according to the tests.
Long term there should be a better fix for this but for now this is
intended behavior.
2019-07-24 11:45:46 -04:00
Kshitij Sobti
61bb9bc6e2 Add support for using an authentication database for MongoDB.
A popular convention is to have user accounts stored in a separate authentication
database. This change add support for configuring edx-platform to work with
such a setup.
2019-07-24 01:16:33 +05:30
Ayub
6db7a08268 Merge pull request #21072 from edx/INCR-408
INCR-408 python3 compatibility
2019-07-23 12:33:40 +05:00
Ayub
d98133a96a Merge pull request #21071 from edx/INCR-407
INCR-407 python3 compatibility
2019-07-23 12:30:41 +05:00
Ayub
829855f6c5 Merge pull request #21070 from edx/INCR-406
INCR-406 python3 compatibility
2019-07-23 12:30:14 +05:00