Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Python3 and Django2.2 upgrade] part 2 - Use unicode #608

Merged
merged 15 commits into from
Aug 18, 2020

Conversation

noliveleger
Copy link
Contributor

@noliveleger noliveleger commented Apr 21, 2020

Related to #602

 # Conflicts:
 #	onadata/apps/api/permissions.py
 #
 # Conflicts:
 #	onadata/apps/api/tests/viewsets/test_connect_viewset.py
 #	onadata/apps/api/tests/viewsets/test_user_profile_viewset.py
 #	onadata/apps/api/tests/viewsets/test_user_viewset.py
 #	onadata/apps/api/tests/viewsets/test_xform_viewset.py
 #	onadata/apps/api/viewsets/connect_viewset.py
 #	onadata/apps/api/viewsets/user_profile_viewset.py
 #	onadata/apps/api/viewsets/user_viewset.py
 #	onadata/libs/serializers/user_profile_serializer.py
 #	onadata/libs/serializers/user_serializer.py
@noliveleger noliveleger changed the title [Python3 and Django2 upgrade] part 2 - Use unicode [Python3 and Django1.11 upgrade] part 2 - Use unicode Jul 16, 2020
@noliveleger noliveleger changed the title [Python3 and Django1.11 upgrade] part 2 - Use unicode [Python3 and Django2.2 upgrade] part 2 - Use unicode Jul 16, 2020
 # Conflicts:
 #	onadata/apps/viewer/management/commands/remongo.py
 # Conflicts:
 #	onadata/apps/api/management/__init__.py
 #	onadata/apps/api/management/commands/__init__.py
 #	onadata/apps/api/management/commands/set_api_permissions.py
 #	onadata/apps/api/tests/viewsets/test_abstract_viewset.py
 #	onadata/apps/main/forms.py
 #	onadata/libs/serializers/metadata_serializer.py
 #	onadata/libs/serializers/password_reset_serializer.py
 #	onadata/libs/tests/serializers/test_password_reset_serializer.py
 #	onadata/libs/tests/test_permissions.py
@jnm jnm merged commit c3323e5 into kobokitten Aug 18, 2020
@jnm jnm deleted the kobokitten-unicode branch August 18, 2020 22:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants