-
Notifications
You must be signed in to change notification settings - Fork 0
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
Fix merge #7
Fix merge #7
Commits on Sep 14, 2016
-
Configuration menu - View commit details
-
Copy full SHA for eaa3aa3 - Browse repository at this point
Copy the full SHA eaa3aa3View commit details -
Configuration menu - View commit details
-
Copy full SHA for e6de045 - Browse repository at this point
Copy the full SHA e6de045View commit details
Commits on Sep 17, 2016
-
updated windows link for nodejs, was 4.4.7 move to 4.5.0
Configuration menu - View commit details
-
Copy full SHA for b7f4f2d - Browse repository at this point
Copy the full SHA b7f4f2dView commit details
Commits on Sep 18, 2016
-
Move commandline page from wiki to docs (#1326)
Reorganizing to keep docs in docs
Configuration menu - View commit details
-
Copy full SHA for 0ecc55a - Browse repository at this point
Copy the full SHA 0ecc55aView commit details -
Configuration menu - View commit details
-
Copy full SHA for b915646 - Browse repository at this point
Copy the full SHA b915646View commit details
Commits on Sep 19, 2016
-
Configuration menu - View commit details
-
Copy full SHA for c9188e3 - Browse repository at this point
Copy the full SHA c9188e3View commit details
Commits on Sep 21, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 9589922 - Browse repository at this point
Copy the full SHA 9589922View commit details -
Configuration menu - View commit details
-
Copy full SHA for 92e3e6c - Browse repository at this point
Copy the full SHA 92e3e6cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 705432e - Browse repository at this point
Copy the full SHA 705432eView commit details -
Prevent header from cutting off bottom (#1343)
Same issue/fix as #873, this time affecting the stats side bar instead of the menu bar
Configuration menu - View commit details
-
Copy full SHA for da262ef - Browse repository at this point
Copy the full SHA da262efView commit details -
Close info window upon second click (#1238)
Currently the info window for Pokémon, Gyms, etc. can only be closed with the little x. This adds a stateful click handler that closes the info window with a second click. Implements #1237
Configuration menu - View commit details
-
Copy full SHA for 647209e - Browse repository at this point
Copy the full SHA 647209eView commit details -
Decrease Number of Upserted Rows (#1091)
* Decrease step size * Check the type of DB
Configuration menu - View commit details
-
Copy full SHA for a3cd518 - Browse repository at this point
Copy the full SHA a3cd518View commit details -
setup.bat now won't set paths if already set, now also installs npm (#…
…770) * Various fixes Updated to install npm and now includes more user output. Now also won't set paths if already set, which was a problem if you ran the setup more than once. * Update setup.bat * Updated to not use temp files As requested by Balthamel, it now no longer uses a temp file but rathers stores it in a variable.
Configuration menu - View commit details
-
Copy full SHA for ef11873 - Browse repository at this point
Copy the full SHA ef11873View commit details -
Configuration menu - View commit details
-
Copy full SHA for b52ba3b - Browse repository at this point
Copy the full SHA b52ba3bView commit details -
Fully Implement On Demand Mode(Conflicts resolved) (#1271)
* On demand mode * On demand mode * On demand mode * On demand mode * Pause before checking time in service
Configuration menu - View commit details
-
Copy full SHA for 0813b62 - Browse repository at this point
Copy the full SHA 0813b62View commit details -
Configuration menu - View commit details
-
Copy full SHA for ceda521 - Browse repository at this point
Copy the full SHA ceda521View commit details -
Suppress virtual keyboard - update - mobile OS detection (#1289)
* [Fix] issue #622, statistics 2x Uncaught TypeError * Fix lint errors * Prevent OSK on Touch * Select Boxes prevent Virtual Keyboard Appearing on Touch Devices * remove unnecessary loop * basic mobile os detection
Configuration menu - View commit details
-
Copy full SHA for ac8a732 - Browse repository at this point
Copy the full SHA ac8a732View commit details
Commits on Sep 22, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 03207ff - Browse repository at this point
Copy the full SHA 03207ffView commit details -
Fix for some cases of 0,0,0 returns (#1097)
Some users reporting 0,0,0 returns on subsequent auth token refreshes after the first.
Configuration menu - View commit details
-
Copy full SHA for d8e8ce8 - Browse repository at this point
Copy the full SHA d8e8ce8View commit details -
Update pull request template (#399)
* Update pull request template * Changed checklist into a comment * Stupid markdown comments
Configuration menu - View commit details
-
Copy full SHA for 6f442b3 - Browse repository at this point
Copy the full SHA 6f442b3View commit details -
Auth Update for nginx.md (#221)
* Auth Update for nginx.md Adding large block for httpd nginx authentication with reverse proxy * Update nginx.md
Configuration menu - View commit details
-
Copy full SHA for 19b71c6 - Browse repository at this point
Copy the full SHA 19b71c6View commit details
Commits on Sep 23, 2016
-
Removed references to third party docker container (#1359)
* Removed references to third party container * Changed references to container we control
Configuration menu - View commit details
-
Copy full SHA for 10fdf16 - Browse repository at this point
Copy the full SHA 10fdf16View commit details -
SpawnPoint Scanning Confusion - changed --spawnpoints-only to --skip-…
…empty (#1372) * Change --spawnpoints-only to --skip-empty Change --spawnpoints-only to --skip-empty with better description in order to stop the confusion between TBTerra's Spawnpoint Scanning and this. * Update commandline.md to include --skip-empty
Configuration menu - View commit details
-
Copy full SHA for 4b79e61 - Browse repository at this point
Copy the full SHA 4b79e61View commit details
Commits on Sep 24, 2016
-
* Added little Linux thing * Some doc updates * little thing * changed 2nd gen link * added loc gen
Configuration menu - View commit details
-
Copy full SHA for ad9e3cb - Browse repository at this point
Copy the full SHA ad9e3cbView commit details -
Enhance Statistics Panel (#1241)
* Test Commit * Revert "Test Commit" aa This reverts commit e87c9d5. * Add sortable Pokemon stats table * Put back accidentally deleted PokeGyms stats code * add link to Pokedex * Styling fixes for statistics panel * Fix listing errors * fix some PokéSpelling errors * Only count visible pokemon/gyms/pokestops Correct issue (that has apparently existed for a while?) where items not currently on screen were included in the stats. * fix linting errors
Configuration menu - View commit details
-
Copy full SHA for f6b94d9 - Browse repository at this point
Copy the full SHA f6b94d9View commit details -
add option to specify config file on command line or via env variable #…
Configuration menu - View commit details
-
Copy full SHA for 82f26f2 - Browse repository at this point
Copy the full SHA 82f26f2View commit details -
Configuration menu - View commit details
-
Copy full SHA for d3c9a9e - Browse repository at this point
Copy the full SHA d3c9a9eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 70de5c3 - Browse repository at this point
Copy the full SHA 70de5c3View commit details -
Escaping ampersand in html (#1380)
It's groundbreaking. My valid html OCD is kicking in again :D
Configuration menu - View commit details
-
Copy full SHA for 81829d3 - Browse repository at this point
Copy the full SHA 81829d3View commit details
Commits on Sep 27, 2016
-
Add gym levels to markers (alternative to #351) and misc gym marker u…
…pgrades (#782) * Added gym levels to marker icons Relocated code for determining gym levels to a new function getGymLevel() * Gym Level Markers * Compressed changed files (4.9kb ->1.4kb) * Fixed ternary operator order You guys are right. I didn't even think of it * Made the gymPrestige array a global variable Made gymPrestige a global variable as opposed to a local variable in the event that other features use this data in the future (such as #666) * Add gym style option * Choose between gym marker styles * lint fix * Reorganized forts for multiple gym styles * Reload icons on demand Used to wait until a mapUpdate(), but that could take up to 5 seconds * Fixed lint error * Lossless and optimized large versions Original large version had heavy artifacts and were not compressed. Harmony: 35.7KB -> 20.2KB Instinct: 17.6KB -> 10.1KB Mystic: 27.4KB -> 11.6KB Valor: 29.0KB -> 13.9KB Uncontested: 43.2KB -> 14.6KB * High-res gym markers for mobile When viewing on mobile, the images get enlarged in order to have the same "size" as when viewing on the desktop, resulting in blurry images * High-res gym markers for mobile Same thing as the ingame markers * Load and scale back a higher res version Mobile users will be able to load the markers without them being blurry * Whoops, didn't realize stats used these too * Changed default gym marker to in-game * Resize icons based on higher res icons * Revert default gym markers back to shield * Forgot these Somehow I forgot to upload these when I added the css for #arenaList :/
Configuration menu - View commit details
-
Copy full SHA for f3b4efb - Browse repository at this point
Copy the full SHA f3b4efbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 627783e - Browse repository at this point
Copy the full SHA 627783eView commit details
Commits on Sep 28, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 03ea3bd - Browse repository at this point
Copy the full SHA 03ea3bdView commit details -
Enable pulling each pokemons IVs and Moves by starting their encounte…
…r. (#1272) * Scan for IVs and moves Clean implementation, bug free? * Don't ignore moves.json * whoopsie tabsies * im on a roll here * whitespace is really hard guys * whitespace is really hard guys * I'm sorry travis senpai * Don't pass the whole dictonary to pokemonLabel on top of everything else * Notifications based off % perfection From owraight's branch * praise travis * Fix 0/0/0 results from atypical spawnpoints? Some spawnpoints spawn the same encounter multiple times an hour. This should prevent those points from being skipped over in the parsing process. * minor text fixes * Fix get_encountered_pokemon oops. Thanks sLoPPydrive. * Default to a whitelist, support a black one * Stop erroneous empty results when rescanning pokemon Keep track of of pokemon that get skipped over druing the parsing phase so we don't think we're getting 0 results from the server. * Minor text fixes * Minorer text fixes * No more white/black flip --encounter-blacklist (-eblk) is back, and --encounter-whitelist (-ewht) is here now. * Fix up the white/blacklists Now they're in a mutually exclusive group, and it properly encounter everything if neither list is set. * sorry travis * derp * leave me alone travis * Improve moves.json handling Use #1316 more useful moves.json and support move names being translated * Reduce db requests to one per cell Instead of one per pokemon. Thanks jchristi and DiscoTim * text minor fixes * Handle failed encounters * Minor fixes to the config.ini.example
Configuration menu - View commit details
-
Copy full SHA for 9b3927e - Browse repository at this point
Copy the full SHA 9b3927eView commit details