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
808 commits 12 branches 8 tags 53 MiB
Commit graph

808 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christian Garza
7e85f9139b Update sprites submodule 2021-11-14 19:48:10 -08:00
Alessandro Pezzè
eb5b34405a
Merge pull request #665 from Dig2/master 2021-10-29 11:20:23 +02:00
Dig2
227d23ec77
Update nginx.conf 
fix path traversal
 2021-10-29 16:19:32 +08:00
Alessandro Pezzè
2df8f39732
Merge pull request #664 from PokeAPI/home 2021-10-25 19:37:56 +02:00
Alessandro Pezzè
bcd290be71 fix: format code 2021-10-25 19:27:41 +02:00
Alessandro Pezzè
a5ac3fc7e1
Merge pull request #658 from WOTstorm/add_pokemon_home_images_support 2021-10-25 19:26:25 +02:00
Alessandro Pezzè
4088ad9c3c
Merge pull request #662 from PokeAPI/compose 2021-10-24 15:40:28 +02:00
Alessandro Pezzè
575422219a
Merge branch 'master' into compose 2021-10-22 19:39:47 +02:00
Rolf
eb4d313c1d Added Pokémon Home images support. 2021-10-04 20:53:15 +02:00
Alessandro Pezzè
a1eb0f8e67 docs: bump hasura cli. chore(k8s): bump hasura cli 2021-09-23 19:02:08 +02:00
Alessandro Pezzè
c3e602d5b8
docs: update graphql internal link [ci skip] 2021-09-09 13:58:19 +02:00
Alessandro Pezzè
e287b4bc93
Create SECURITY.md 2021-09-09 13:53:37 +02:00
Alessandro Pezzè
6ed7d88df2
Merge pull request #649 from technicity1/master 2021-09-07 15:14:53 +02:00
Umesh
cf104bf2de Fixed typo on species 186 2021-09-06 22:14:17 +05:30
Alessandro Pezzè
84c4bda8be
Merge pull request #648 from stormonster/flavor_typo_species_236 2021-09-06 14:36:52 +02:00
stormonster
36b8e98d87 Actually removed soft hyphen properly this time 2021-09-06 12:45:30 +02:00
stormonster
acd398ce5f Fixed typo on species 236. Fixes issue #646 2021-09-06 11:02:53 +02:00
Alessandro Pezzè
a3aec3971c chore: disable cache 2021-09-01 19:16:46 +02:00
root
fe5a0d8f5e chore: enable cache/store cache on host/allow app takedown 2021-08-31 11:44:01 +00:00
Alessandro Pezzè
f167fcc520 feat: update schema 2021-08-31 12:19:43 +02:00
Alessandro Pezzè
5b6b667a9d chore: tweak perf/disable cache 2021-08-31 12:19:20 +02:00
Alessandro Pezzè
e7c0397d52 chore: move limits/enable apis 2021-08-30 18:24:56 +02:00
Alessandro Pezzè
14c332032d Merge remote-tracking branch 'origin/graphql-opti' into compose 2021-08-30 18:14:20 +02:00
Alessandro Pezzè
4f127e4110 chore: split compose files/rename ssl conf 2021-08-30 18:12:19 +02:00
root
5919d5a1b0 chore: tweaks 2021-08-30 15:22:03 +00:00
Alessandro Pezzè
655ff4f955
Merge pull request #637 from project-pku/farfetchd-name-update 2021-08-12 21:04:57 +02:00
prof64
a68205c236
Merge branch 'master' into farfetchd-name-update 2021-08-11 20:38:08 -04:00
Alessandro Pezzè
a4887eebe0
Merge pull request #640 from thiagodeev/patch-1 2021-08-10 21:06:16 +02:00
Thiago Souza Oliveira Ribeiro
71351622cf
refactor: update license's year 2021-08-06 13:22:29 -03:00
prof64
2ec8c2a47d Update pokemon_species_names.csv 
Changed the apostrophe in Farfetch'd's species name from (’) to (') in English, Spanish, & Italian as per Sword and Shield.
 2021-07-28 03:26:04 -04:00
Alessandro Pezzè
2be93d816c
Merge pull request #634 from phrasmotica/feature/past-type-efficacy 
Add past type damage relations data
 2021-07-24 15:45:50 +02:00
Julian Lawrance
206af8a6fd Remove order column from Generation model and use ID column instead 2021-07-19 19:00:40 +01:00
Julian Lawrance
98eef4d482 Merge remote-tracking branch 'upstream/master' into feature/past-type-efficacy 2021-07-16 23:32:00 +01:00
Julian Lawrance
d8dfd24e43 Amend test_type_api to check for past type relations only including extant types 2021-07-16 22:50:32 +01:00
Julian Lawrance
07c502f498 Determine whether a newer type should be present in a past type efficacy relations set based on generation order rather than ID 2021-07-16 22:32:34 +01:00
Julian Lawrance
0d9bc4f2b9 Run formatter 2021-07-16 22:32:06 +01:00
Julian Lawrance
1173b43ad1 Add order field to Generation model 2021-07-16 22:29:55 +01:00
Alessandro Pezzè
05edde90cf
Merge pull request #633 from PokeAPI/Naramsim-patch-1 2021-07-15 10:33:59 +02:00
Julian Lawrance
8b9e4f171c Merge remote-tracking branch 'upstream/master' into feature/past-type-efficacy 2021-07-14 22:23:11 +01:00
Julian Lawrance
596c9f85fb Remove newer types from past type efficacy relation lists 2021-07-14 21:14:20 +01:00
Alessandro Pezzè
dae07d694b
Update README.md 2021-07-14 15:44:02 +02:00
Alessandro Pezzè
802975a170
Merge pull request #630 from fissionprime/characteristic-fix 2021-07-06 10:39:13 +02:00
fissionprime
68745ace03 old variable 2021-07-06 01:13:28 -04:00
fissionprime
f17a09b15f reformatted with black 2021-07-06 00:58:55 -04:00
fissionprime
1ae3964a5f fixed 'possible_values' field of characteristic endpoint 
loop that adds values to 'possible_values' used wrong value in conditional. Created test to verify behavior is as expected.
 2021-07-05 21:10:39 -04:00
Alessandro Pezzè
0ec78d6d0d
Merge pull request #627 from PokeAPI/staging 2021-07-04 22:25:19 +02:00
Alessandro Pezzè
d0a4397d41 data: remove hp stat change 2021-07-04 19:32:41 +02:00
Alessandro Pezzè
a6d6632abd data: remove HP stat change for ancient power 2021-07-03 20:03:24 +02:00
Alessandro Pezzè
12106f28be
Merge pull request #623 from PokeAPI/k8s 2021-06-23 10:27:47 +02:00
Alessandro Pezzè
11163c4eae ci: remove platforns 2021-06-05 23:19:03 +02:00