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

Fix merge #7

Merged
merged 33 commits into from
Sep 28, 2016
Merged

Fix merge #7

merged 33 commits into from
Sep 28, 2016

Commits on Sep 14, 2016

  1. Configuration menu
    Copy the full SHA
    eaa3aa3 View commit details
    Browse the repository at this point in the history
  2. Matches Polyfill (#1100)

    DiscoTim authored and FrostTheFox committed Sep 14, 2016
    Configuration menu
    Copy the full SHA
    e6de045 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2016

  1. Update index.rst (#1322)

    updated windows link for nodejs, was 4.4.7 move to 4.5.0
    gabaod authored and FrostTheFox committed Sep 17, 2016
    Configuration menu
    Copy the full SHA
    b7f4f2d View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2016

  1. Move commandline page from wiki to docs (#1326)

    Reorganizing to keep docs in docs
    primaxius authored and FrostTheFox committed Sep 18, 2016
    Configuration menu
    Copy the full SHA
    0ecc55a View commit details
    Browse the repository at this point in the history
  2. fixes (#1327)

    There! More example.py
    primaxius authored and FrostTheFox committed Sep 18, 2016
    Configuration menu
    Copy the full SHA
    b915646 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2016

  1. Configuration menu
    Copy the full SHA
    c9188e3 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2016

  1. webworker (#1287)

    DiscoTim authored and FrostTheFox committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    9589922 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    92e3e6c View commit details
    Browse the repository at this point in the history
  3. Correct multi-acc doc

    FrostTheFox authored Sep 21, 2016
    Configuration menu
    Copy the full SHA
    705432e View commit details
    Browse the repository at this point in the history
  4. Prevent header from cutting off bottom (#1343)

    Same issue/fix as #873, this time affecting the stats side bar instead of the menu bar
    Studio-XP authored and FrostTheFox committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    da262ef View commit details
    Browse the repository at this point in the history
  5. 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
    FabianSperrle authored and FrostTheFox committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    647209e View commit details
    Browse the repository at this point in the history
  6. Decrease Number of Upserted Rows (#1091)

    * Decrease step size
    
    * Check the type of DB
    maddhatter authored and FrostTheFox committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    a3cd518 View commit details
    Browse the repository at this point in the history
  7. 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.
    oskhen authored and FrostTheFox committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    ef11873 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    b52ba3b View commit details
    Browse the repository at this point in the history
  9. 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
    KyleBoyer authored and FrostTheFox committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    0813b62 View commit details
    Browse the repository at this point in the history
  10. Fix alphabetical order (#1110)

    averylarry authored and FrostTheFox committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    ceda521 View commit details
    Browse the repository at this point in the history
  11. 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
    DiscoTim authored and FrostTheFox committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    ac8a732 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2016

  1. Configuration menu
    Copy the full SHA
    03207ff View commit details
    Browse the repository at this point in the history
  2. 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.
    rbryson74 authored and FrostTheFox committed Sep 22, 2016
    Configuration menu
    Copy the full SHA
    d8e8ce8 View commit details
    Browse the repository at this point in the history
  3. Update pull request template (#399)

    * Update pull request template
    
    * Changed checklist into a comment
    
    * Stupid markdown comments
    Xcelled authored and FrostTheFox committed Sep 22, 2016
    Configuration menu
    Copy the full SHA
    6f442b3 View commit details
    Browse the repository at this point in the history
  4. Auth Update for nginx.md (#221)

    * Auth Update for nginx.md
    
    Adding large block for httpd nginx authentication with reverse proxy
    
    * Update nginx.md
    cmachikas authored and FrostTheFox committed Sep 22, 2016
    Configuration menu
    Copy the full SHA
    19b71c6 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2016

  1. Removed references to third party docker container (#1359)

    * Removed references to third party container
    
    * Changed references to container we control
    Ashex authored and FrostTheFox committed Sep 23, 2016
    Configuration menu
    Copy the full SHA
    10fdf16 View commit details
    Browse the repository at this point in the history
  2. 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
    primaxius authored and FrostTheFox committed Sep 23, 2016
    Configuration menu
    Copy the full SHA
    4b79e61 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2016

  1. Few doc updates (#1373)

    * Added little Linux thing
    
    * Some doc updates
    
    * little thing
    
    * changed 2nd gen link
    
    * added loc gen
    FrostTheFox authored Sep 24, 2016
    Configuration menu
    Copy the full SHA
    ad9e3cb View commit details
    Browse the repository at this point in the history
  2. 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
    TechLinkRon authored and FrostTheFox committed Sep 24, 2016
    Configuration menu
    Copy the full SHA
    f6b94d9 View commit details
    Browse the repository at this point in the history
  3. add option to specify config file on command line or via env variable #…

    …1341 - Rebased (#1376)
    
    * add option to specify config file on command line or via env variable
    
    original PR 1341
    
    * Add new config file documentation
    
    Original PR 1341
    
    * Update commandline.md with new config file flags
    
    Original PR 1341
    primaxius authored and FrostTheFox committed Sep 24, 2016
    Configuration menu
    Copy the full SHA
    82f26f2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d3c9a9e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    70de5c3 View commit details
    Browse the repository at this point in the history
  6. Escaping ampersand in html (#1380)

    It's groundbreaking. My valid html OCD is kicking in again :D
    Studio-XP authored and FrostTheFox committed Sep 24, 2016
    Configuration menu
    Copy the full SHA
    81829d3 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2016

  1. 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 :/
    Studio-XP authored and FrostTheFox committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    f3b4efb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    627783e View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2016

  1. [FAQ.md] Updated formula

    Thanks OurFlagIsMined :3
    FrostTheFox authored Sep 28, 2016
    Configuration menu
    Copy the full SHA
    03ea3bd View commit details
    Browse the repository at this point in the history
  2. 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
    MangoScango authored and FrostTheFox committed Sep 28, 2016
    Configuration menu
    Copy the full SHA
    9b3927e View commit details
    Browse the repository at this point in the history