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.

Sign up for GitHub

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

Jump to bottom

Dev merge to master #4843

Merged
merged 70 commits into from
Aug 28, 2016
Merged

Dev merge to master #4843

merged 70 commits into from
Aug 28, 2016

Conversation

solderzzc
Copy link
Contributor

No description provided.

nap and others added 30 commits August 21, 2016 11:05
Added option to go towards Pokemon throught fort
5bfffb2
Added option to go towards Pokemon throught fort
5ac2f6f
random release number
18eb880
Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot int…
262d232 
…o my-new-feature
Update pokecli.py
9e79e59
Support for log_delay for all tasks
d383929
Added configuration for log_delay
3fc40e1
Added tests for log_delay
a0938b7
@walkerlee
Use alpine python as pokegoweb image
ef86ed3
@walkerlee
Use user config cache and do not share configs folder on public web
684dbce
Rename log_delay in log_interval
3287687
Added log_interval to docs
4e0348a
Sync Branch + Resolve Conflitcs
a6d4e1a
@th3w4y
rectify cache invalidation issue in Dockerfile after merge of #4730
f9d2aeb
@th3w4y
busybox tar does not support --strip-components argument - added and …
aaed322 
…removed regular tar in a RUN step
@solderzzc
Merge pull request #4492 from Napator/my-new-feature
c8630f5 
Added some variance in max amount of pokemon bag before releasing
@th3w4y
split pgoencrypt part into a different layer
f45670f
Restored submodule reference
6d783f4
@solderzzc
Merge pull request #4724 from Gzerox/delay-task-logs
0c6d332 
Delay task logs
@alexyaoyang
Shift daily_catch_limit to catch block for #4742 (#4784)
caa3db8 
* Change config for #4742

* Change config for #4742
@solderzzc
Merge pull request #4783 from th3w4y/docker
fa2025f 
Minimize docker image (continuation of #4730)
@duttonw
Correctly tracking inventory changes to the cached inventory
39ff8bd 
based on BriceSD work #3860
polyline alt added & minor fixes
ab4cf30
minor fix
fb9b1cd
@solderzzc
Merge pull request #4789 from kanemasa1987/poly_alt
5c97022 
Polyline altitude
@rawgni
added separate config
61de70f
@solderzzc
Exit script when detect daily limit hit.
75631a2
@rawgni
fix test file to load auth
38a8dba
@solderzzc
Merge pull request #4731 from walkerlee/update-docker-compose-files
f026833 
Update docker compose files and keep user config safe
@mjmadsen
Fix for #4724
71b2ed9
rawgni and others added 28 commits August 27, 2016 06:43
@rawgni @mjmadsen
fix incubator (#4803)
f0623bd
@kowloon
Seperate sorting for breakable and unbreakable incubator
cb9a6a6
@DeXtroTip
Fixed a bug where cached inventory wasn't being updated on recycle_it…
0b11c11 
…ems.py
@solderzzc
Merge pull request #4809 from DeXtroTip/recycle_cached_inv_fix
87f8374 
Fix cached inventory not updated
@solderzzc
Merge pull request #4798 from rawgni/evolve_all_except
4750842 
Evolve all except
@solderzzc
Merge pull request #4801 from sohje/impr-4227-rvt-4742
dd43ba8 
Improvements of #4732, revert broken changes from #4742, some pep-8
@solderzzc
Merge pull request #4802 from askovpen/master
f8cfc5a 
Added Telegram support
@solderzzc
Merge pull request #4810 from developerllazy/dev
44307ae 
Seperate sorting for breakable and unbreakable incubator
@askovpen
config.json -> auth.json
03adc8d
@askovpen
fix
7f135d6
@askovpen
fix
ff240b7
@solderzzc
Merge pull request #4813 from askovpen/dev
5e23388 
telegram config.json -> auth json
@rawgni @mjmadsen
add missing default auth file (#4824)
456cd1b 
* add missing default auth file

* fix error msg
@askovpen @mjmadsen
fix disabled (#4819)
ac5e0db
@Gobberwart @mjmadsen
Fix bot crash at start on permaban (#4822)
5f027f5
@ffigueroa @mjmadsen
Added auth param to run.sh and auth generator to setup.sh (#4814)
9a99751 
* Added auth.json to run.sh

* Param auth for run.sh

* Added auth generator for setup.sh

* Modified config generator and added auth generator

* Modified setup.sh
@LuckyMe4Evers @mjmadsen
PokemonGo-Bot-Configurator Adapted (#4825)
b7be689 
* PokemonGo-Bot-Configurator Adapted

Adapted PokemonGo-Bot-Configurator to work with the new auth.json file.

* wrong

* PokemonGo-Bot-Configurator Adapted

Adapted PokemonGo-Bot-Configurator to work with the new auth.json file.
@extink @mjmadsen
Clean logging option (#3706)
566a3f7 
* Add clean logging functionality

* Change example configs to include nested logging configurations
@askovpen
add telegram event handler
e290203
@askovpen
config change
3a2dfee
@solderzzc
Merge pull request #4831 from askovpen/dev
81384b3 
add telegram event handler
@th3w4y
update docker instructions
8af40fa
@solderzzc
Merge pull request #4833 from th3w4y/patch-1
e58855f 
update docker instructions in installation.md
@duttonw
remove equip_badge call, iso version does not add eqiup_badge to play…
2e6bf25 
…er data when badge is awarded. so this may have been in their api but it was never fully implemented
@solderzzc
Merge pull request #4839 from duttonw/equip_badge_call_not_needed
9e30e83 
remove equip_badge call, iso version does not add eqiup_badge to play…
@solderzzc
One to improve pull approval.yml.
542bf88
@alexyaoyang
Fix bug from #4822 (#4842)
0171e17
@solderzzc
Update README.md
5e70608
@solderzzc
Copy link
Contributor Author

solderzzc commented Aug 28, 2016 •
edited by alexyaoyang
Loading

👍

Approved with PullApprove

@solderzzc solderzzc merged commit bc97886 into master Aug 28, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.