Commits

Branch selector

 master

User selector

All users

Datepicker

All time

Commit History

Commits on Nov 30, 2015

• Merge pull request #69 from zaneadix/more-data

  Show description for ea0d5c7
  zaneadix

  committed
  ea0d5c7

  Copy full SHA for ea0d5c7

Commits on Nov 27, 2015

• migration clean up

  zaneadix

  committed
  5c563dc

  Copy full SHA for 5c563dc

Commits on Nov 26, 2015

• tests now handling all convenience attributes in all apis

  zaneadix

  committed
  3d8e9a7

  Copy full SHA for 3d8e9a7

Commits on Nov 16, 2015

• evolution-chain bug fix

  zaneadix

  committed
  300f1a9

  Copy full SHA for 300f1a9

• I feel like theres a ton of good convenience resource linking going on now

  zaneadix

  committed
  342ea98

  Copy full SHA for 342ea98

• tests covering all endpoints. working on adding some convenience attributes to api resources to help connect them two way style. tests will probably need some small tweaks

  zaneadix

  committed
  1f480ce

  Copy full SHA for 1f480ce

Commits on Nov 10, 2015

• clean up

  zaneadix

  committed
  43f97fd

  Copy full SHA for 43f97fd

• cleaned up the berry mess

  zaneadix

  committed
  75e39ba

  Copy full SHA for 75e39ba

Commits on Nov 8, 2015

• fished serving almost all data (with the exception of machines and some csv files that didnt have data yet but have been updated in veekuns repo. TESTS STILL NEED TO BE DONE.

  zaneadix

  committed
  aa1d7d9

  Copy full SHA for aa1d7d9

Commits on Nov 5, 2015

• apis for locations, location areas, encounters, encounter rates, characteristics, contests, super contests

  zaneadix

  committed
  c1f1f9a

  Copy full SHA for c1f1f9a

Commits on Oct 29, 2015

• Merge pull request #66 from zaneadix/build-fix

  Show description for 0d666b1
  zaneadix

  committed
  0d666b1

  Copy full SHA for 0d666b1

• fix build steps

  zaneadix

  committed
  db91f73

  Copy full SHA for db91f73

• starting a few more api endpoints (locations and encounters)

  zaneadix

  committed
  b099558

  Copy full SHA for b099558

Commits on Oct 28, 2015

• Merge pull request #62 from zaneadix/tests

  Show description for 10d7614
  phalt

  committed
  10d7614

  Copy full SHA for 10d7614

• whoops I commented a bunch of crap out

  zaneadix

  committed
  ede6577

  Copy full SHA for ede6577

Commits on Oct 27, 2015

• Finished tests for all current API endpoints (34 of them)

  zaneadix

  committed
  44151e1

  Copy full SHA for 44151e1

Commits on Oct 23, 2015

• half of api tests are done

  zaneadix

  committed
  f3654c3

  Copy full SHA for f3654c3

Commits on Oct 18, 2015

• starting tests

  zaneadix

  committed
  176802e

  Copy full SHA for 176802e

Commits on Oct 7, 2015

• Merge pull request #53 from zaneadix/rest-framework

  Show description for b5ab3d3
  zaneadix

  committed
  b5ab3d3

  Copy full SHA for b5ab3d3

Commits on Oct 6, 2015

• Merge branch 'master' of https://github.com/phalt/pokeapi into safe-merge

  zaneadix

  committed
  f175d63

  Copy full SHA for f175d63

• Merge pull request #58 from zaneadix/v1-data

  Show description for a0c2015
  zaneadix

  committed
  a0c2015

  Copy full SHA for a0c2015

• Merge branch 'rest-framework' of https://github.com/zaneadix/pokeapi into rest-framework

  zaneadix

  committed
  1a09d2c

  Copy full SHA for 1a09d2c

• About 80% of data is being served

  zaneadix

  committed
  df503e3

  Copy full SHA for df503e3

• About 80% of data is being served

  zaneadix

  committed
  926ce05

  Copy full SHA for 926ce05

Commits on Oct 3, 2015

• got some functions working. issue with egg groups though

  zaneadix

  committed
  5de650e

  Copy full SHA for 5de650e

• little more work on pokemon evolution chains

  zaneadix

  committed
  6d7fd53

  Copy full SHA for 6d7fd53

Commits on Oct 2, 2015

• Merge pull request #56 from lazerwalker/patch-1

  Show description for da708cb
  zaneadix

  committed
  da708cb

  Copy full SHA for da708cb

• Update v2 db setup instructions to use local config

  Show description for 6ba3f02
  lazerwalker

  committed
  6ba3f02

  Copy full SHA for 6ba3f02

Commits on Sep 28, 2015

• Merge pull request #55 from zaneadix/build-fix

  Show description for b3e91bc
  phalt

  committed
  b3e91bc

  Copy full SHA for b3e91bc

Commits on Sep 27, 2015

• fix issue renaming 'introduces_in_version_group' to 'introduced_in_version_group' in migrations

  zaneadix

  committed
  20a8826

  Copy full SHA for 20a8826

• Renamed PokemonMoveMethod models to MoveLearnMethod because it just damn well makes more sense when I'm reading the code and I assume anyone else will feel the same way. Also, progress on many api …

  Show description for 163e29c
  zaneadix

  committed
  163e29c

  Copy full SHA for 163e29c

Commits on Sep 19, 2015

• get rid of that dumb bash_profile file

  zaneadix

  committed
  b9c0cbf

  Copy full SHA for b9c0cbf

• Started on pokemon. theyre a bit more complex than v1. not sure hot to break them up.

  zaneadix

  committed
  16c4ae3

  Copy full SHA for 16c4ae3

Commits on Sep 15, 2015

• Pokedex resources. Getting closer to Pokemon resources

  zaneadix

  committed
  3b8b1a6

  Copy full SHA for 3b8b1a6

Commits on Sep 12, 2015

• squashed them 'grations again? thanks for making me merge them back in git. What did I do to deserve this?

  zaneadix

  committed
  c958ed9

  Copy full SHA for c958ed9

Pagination

Previous

Next