Updated changes from master #375
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…le (#372) * added emailVerified field * added fields to check if the email is verified * added custom type mapping and mutation for userSendEmailVerification * added send email verification mutuation and tests * properly showing the send/re-send verification * removed id field from graph since we're not using it * made changes to viewmodel and tests * fixed view model tests * added verficationError test, added verificationButton output * renamed output * renamed output again
* showing manual network error check * added documentation for connection manager * fixed checkstyle errors we're g2g * fixed registering and unregistering our service * removed unregister from onDestroy * reverted line changes
* added register receiver to onPause * removed register from onStart
# Conflicts: # app/src/main/java/com/kickstarter/libs/BaseActivity.java # app/src/main/java/com/kickstarter/mock/services/MockApolloClient.kt # app/src/main/java/com/kickstarter/services/ApolloClientType.kt # app/src/main/java/com/kickstarter/services/KSApolloClient.kt # app/src/main/res/layout/activity_change_password.xml
eoji
approved these changes
Nov 13, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merged in changes from master