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

Dev merge to master #6076

Merged
merged 19 commits into from
Jul 12, 2017
Merged

Dev merge to master #6076

merged 19 commits into from
Jul 12, 2017

Conversation

solderzzc
Copy link
Contributor

Dev merge to master

davidakachaos and others added 9 commits July 9, 2017 12:34
This will return the notifications send by the server and display
them if its a new notification
If you have any Pokemon that Niantic has marked as bad (red slashes) this will notify you. If you set the option, it will also transfer those Pokemon.
BadPokemon worker / Red Slashed Pokemon
@mention-bot
Copy link

@solderzzc, thanks for your PR! By analyzing the history of the files in this pull request, we identified @davidakachaos, @anakin5 and @mjmadsen to be potential reviewers.

solderzzc and others added 10 commits July 10, 2017 11:39
Now check api uses version number returned from PGoAPI rather than comparing to Bossland endpoint.
check_niantic_api logic change
Updated character information at login. Removed items that we no idea when they will ever appear in game, update some name to be the same as in game, added new items.
Updated character information at login. Removed items that we no idea when they will ever appear in game, update some name to be the same as in game, added new items.
Updated Character Information
@davidakachaos
Copy link
Contributor

davidakachaos commented Jul 12, 2017

👍 Looks great

Copy link
Contributor

@davidakachaos davidakachaos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@solderzzc
Copy link
Contributor Author

why the status of pull approve was not changed.

@solderzzc
Copy link
Contributor Author

@davidakachaos maybe you can set it on this link
screen shot 2017-07-12 at 3 43 13 pm

@davidakachaos
Copy link
Contributor

No such an option for me:
schermafbeelding 2017-07-13 om 00 45 25
@solderzzc maybe pull-approve doesn't want me to approve things yet?

@solderzzc
Copy link
Contributor Author

solderzzc commented Jul 12, 2017

@davidakachaos Did you login with github auth? Your name was already on the list.

@davidakachaos
Copy link
Contributor

Yes I did, I also see myself on the member list

@davidakachaos
Copy link
Contributor

davidakachaos commented Jul 12, 2017

👍

Approved with PullApprove

@solderzzc
Copy link
Contributor Author

haha, nice :) finally

@davidakachaos
Copy link
Contributor

schermafbeelding 2017-07-13 om 00 51 26
So all checks have passed now 😄

@solderzzc solderzzc merged commit c07fd94 into master Jul 12, 2017
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.

5 participants