Mirrors/pokeapi
2
0
Fork 0
mirror of https://github.com/PokeAPI/pokeapi synced 2024-11-26 05:10:21 +00:00
Code Issues Projects Releases Packages Wiki Activity
714 commits 12 branches 8 tags 53 MiB
Commit graph

714 commits

This branch
This branch
All branches
Author SHA1 Message Date
Julian Lawrance
85027ff7f9 Populate Pokemon form types field with types from parent Pokemon if the form has no types of its own 2021-02-19 14:25:14 +00:00
Julian Lawrance
d48e51686c Recreate Pokemon form type DB migration 2021-02-19 14:24:33 +00:00
Julian Lawrance
bbc8cbdf2b Merge remote-tracking branch 'origin' into feature/pokemon-form-types 2021-02-18 20:36:13 +00:00
Julian Lawrance
1e30dac6ea Change README Pokemon form example response to that of Arceus' bug form 2021-02-13 21:50:42 +00:00
Julian Lawrance
88a0cfb999 Remove Pokemon form type data for all default forms 2021-02-13 21:38:21 +00:00
Julian Lawrance
6d9a020cb2 Update Pokemon form docs in README 2021-02-13 21:18:59 +00:00
Julian Lawrance
535ba86f71 Re-create new migration for Pokemon form types 2021-02-13 20:44:50 +00:00
Julian Lawrance
a159550aed Merge remote-tracking branch 'upstream/master' into feature/pokemon-form-types 2021-02-13 18:51:47 +00:00
Alessandro Pezzè
cf1a2d4f51 chore: update sprites/add make command to destroy the db 
fix: run flush non interactively
 2021-02-13 19:27:58 +01:00
Alessandro Pezzè
e2e43d8bda
Merge pull request #457 from phrasmotica/past-pokemon-types 2021-02-12 21:47:21 +01:00
Alessandro Pezzè
b5f014af82
Merge branch 'master' into past-pokemon-types 2021-02-10 20:41:02 +01:00
Alessandro Pezzè
4f4d124148
Merge pull request #568 from PokeAPI/staging 2021-02-09 20:59:24 +01:00
Alessandro Pezzè
ffea952902 refactor: change var names 2021-02-08 19:56:35 +01:00
Alessandro Pezzè
84b5a1874a fix: use string name when not default 2021-02-08 19:54:08 +01:00
Julian Lawrance
39856de97b Format source code again 2021-02-06 22:15:12 +00:00
Julian Lawrance
c513fa5b56 Recreate past types migration again 2021-02-06 22:03:47 +00:00
Julian Lawrance
91f39138bd Format source code 2021-02-06 22:02:36 +00:00
Julian L
c273a42f98
Merge branch 'master' into past-pokemon-types 2021-02-06 21:56:50 +00:00
Julian Lawrance
76ba2ae00e Format source code 2021-02-06 21:52:36 +00:00
Julian Lawrance
55f77c2fdd Remove unnecessary differences with master branch 2021-02-06 21:48:29 +00:00
Julian Lawrance
a988e6d936 Regenerate Pokemon past types migration 2021-02-06 21:32:13 +00:00
Julian Lawrance
6ce7ca413d Merge branch 'master' into past-pokemon-types 2021-02-06 21:29:40 +00:00
Alessandro Pezzè
92213330b3 chore: format wih black 2021-02-05 22:59:44 +01:00
Alessandro Pezzè
257231eeb3 Merge branch 'staging' of https://github.com/PokeAPI/pokeapi into staging 2021-02-05 22:58:46 +01:00
Alessandro Pezzè
46f210ab81 feat: polish code/add female forms sprites 2021-02-05 22:58:23 +01:00
Alessandro Pezzè
06f78e6fd2 feat: build more image sprites 2021-02-05 22:58:23 +01:00
Alessandro Pezzè
2fdbe865f6 sync: update sprites 2021-02-05 22:57:57 +01:00
Alessandro Pezzè
0391268426 feat: polish code/add female forms sprites 2021-02-05 22:57:00 +01:00
Alessandro Pezzè
808a7a8742 feat: build more image sprites 2021-01-29 22:18:05 +01:00
Alessandro Pezzè
2367c4a815
Merge pull request #564 from simonorono/learned_by_pokemon 2021-01-27 19:29:11 +01:00
Simón Oroño
a1bffaddd1 Merge branch 'learned_by_pokemon' of github.com:simonorono/pokeapi into learned_by_pokemon 2021-01-26 19:45:08 -04:00
Simón Oroño
d99a8bb87e Make linter happy 2021-01-26 19:44:54 -04:00
Simón Oroño
87a2590543 Rename field in move endpoint 
Field "pokemon" was renamed "learned_by_pokemon" to better express intent.
 2021-01-26 19:42:28 -04:00
Simón Oroño
3cbeedb3f0
Merge branch 'master' into learned_by_pokemon 2021-01-25 16:54:37 -04:00
Alessandro Pezzè
1ce88ff23d sync: https://github.com/PokeAPI/pokedex/pull/28 2021-01-25 21:51:14 +01:00
Simón Oroño
7c7beb4592 Add a "pokemon" field for the move endpoint 
This field will contain a simple list of pokemon summaries. Each
element on the list represents a pokemon that can learn that move.
 2021-01-23 13:22:37 -04:00
Alessandro Pezzè
85541fff96
Merge pull request #554 from PokeAPI/staging 2021-01-13 10:01:17 +01:00
Alessandro Pezzè
9b1bb9593d sync(data): https://github.com/PokeAPI/pokedex/pull/23 2021-01-11 19:46:03 +01:00
Alessandro Pezzè
6e343cf85c docs: simplify docker setup/remove outdated info 2021-01-11 19:45:28 +01:00
Alessandro Pezzè
9e3f2a2426 chore: add docker commands 2021-01-11 19:44:43 +01:00
Alessandro Pezzè
3c63270fa2 sync: update sprites 2021-01-07 18:10:34 +01:00
Alessandro Pezzè
1f2891d4ec
Merge pull request #549 from zacbullard/master 
Added missing type data for toxtricity-low-key-gmax (10220)
 2021-01-04 11:36:19 +01:00
zacbullard
5c6aac10d9 Added missing type data for toxtricity-low-key-gmax (10220) 2020-12-28 17:10:34 -05:00
Alessandro Pezzè
78d71ed879
Merge pull request #548 from timgates42/bugfix_typo_result 2020-12-28 10:38:45 +01:00
Tim Gates
5e2aeab47b
docs: fix simple typo, rsult -> result 
There is a small typo in pokemon_v2/README.md.

Should read `result` rather than `rsult`.
 2020-12-28 12:36:09 +11:00
Alessandro Pezzè
d0c4023fe6
Merge pull request #545 from PokeAPI/staging 
Adds order to gen8 species
 2020-12-16 15:48:45 +01:00
Alessandro Pezzè
56931b967d data: add order 2020-12-11 17:07:35 +01:00
Alessandro Pezzè
63ee471a14 feat: update submodule [ci skip] 2020-12-05 14:48:17 +01:00
Alessandro Pezzè
5893aded20
Merge pull request #541 from maleclercq/empty_lines 2020-12-04 11:46:25 +01:00
matthieu
b96bf59964 Merge branch 'empty_lines' of https://github.com/maleclercq/pokeapi into empty_lines 2020-12-03 23:59:01 +01:00