Mirrors/pokeapi
2
0
Fork 0
mirror of https://github.com/PokeAPI/pokeapi synced 2024-11-28 14:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity
1598 commits 12 branches 8 tags 53 MiB
Commit graph

1598 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alessandro Pezzè
8f8d913274
Merge branch 'master' into add-showdown-field-to-pokemon 2023-12-21 05:09:32 +09:00
Alessandro Pezzè
ff017a66a8
Merge pull request #981 from giginet/indigo-disk-abilities 
Add abilities since Indigo Disk
 2023-12-21 02:56:58 +09:00
Alessandro Pezzè
91af07921d
Merge pull request #980 from giginet/indigo-blue-pokemon 
Add missing data of Pokémon since Indigo Disk
 2023-12-21 02:56:31 +09:00
giginet
949f78cbf2 Fix gender_rate 2023-12-20 23:02:35 +09:00
giginet
bd2cd992d5 Fix ID 2023-12-20 22:57:50 +09:00
giginet
3134465587 Add pokemon_abilities for new pokemon 2023-12-20 22:54:27 +09:00
giginet
8a36880298 Add new abilities 2023-12-20 22:48:51 +09:00
giginet
1b37bc6cea Add pokemon_form_names 2023-12-20 22:39:37 +09:00
giginet
dc9ee18bec Add pokemon names for all languages 2023-12-20 22:35:53 +09:00
giginet
9bea2b6eaa Add types for new pokemon 2023-12-20 22:12:13 +09:00
giginet
82db2f319b Add base stats of new pokemon 2023-12-20 22:02:09 +09:00
giginet
8485cfc68e Add pokemon_forms 2023-12-20 21:51:55 +09:00
Alessandro Pezzè
d2d8987968
Merge pull request #979 from giginet/indigo-blue-moves 
Add moves introduced in Indigo Disk
 2023-12-20 20:37:58 +09:00
Alessandro Pezzè
f826edc283
Merge pull request #975 from WyattC16/addIndigoDiskPokemon 
add indigo disk pokedex and pokemon
 2023-12-20 19:32:00 +09:00
giginet
e5b310eace Change power of Luster Purge and Mist Ball 2023-12-17 16:59:10 +09:00
giginet
6f6b752dd5 Add move names 2023-12-17 16:55:16 +09:00
giginet
fd9fa1a464 Add moves available since Indigo Disk 2023-12-17 16:35:05 +09:00
FallenDeity
545e1a0826 feat: Add showdown field to pokemon api resource 2023-12-16 09:56:19 +05:30
Wyatt Condon
c166545eff fix issue with last commit 2023-12-15 07:58:46 -05:00
Wyatt Condon
b6ce75406a fix hydrapple evolution 2023-12-15 07:45:05 -05:00
WyattC16
583a596c1f
Merge branch 'master' into addIndigoDiskPokemon 2023-12-15 07:41:32 -05:00
Alessandro Pezzè
f9225dc825
Merge pull request #976 from PokeAPI/staging 2023-12-15 16:07:01 +09:00
Alessandro Pezzè
0fccf81059
Merge branch 'master' into staging 2023-12-15 16:06:51 +09:00
Naramsim
e8a2b6f21e chore: get PR number in the right folder/grammar 2023-12-15 08:05:13 +01:00
Wyatt Condon
2ca2bfe11a add indigo disk pokedex and pokemon 2023-12-14 13:24:23 -05:00
Naramsim
4d098942d3 cicd: get pr number earlier 2023-12-13 11:22:36 +01:00
Alessandro Pezzè
3bb4692082
Merge pull request #974 from PokeAPI/staging 2023-12-13 17:18:36 +09:00
Naramsim
bd6b4c82c5 cicd: revert checking out staging/add commit and push 2023-12-13 08:26:31 +01:00
Naramsim
912f1353de cicd: run on custom network/refactor commit message 2023-12-13 03:33:03 +01:00
Naramsim
ca9ba173ca cicd: use newer images 2023-12-13 02:36:44 +01:00
Naramsim
a2ef2e9fdc cicd: run in shell 2023-12-12 09:39:12 +01:00
Naramsim
caefada677 cicd: test updater staging script 2023-12-12 09:32:41 +01:00
Alessandro Pezzè
ae88bdd55d
Merge pull request #961 from PokeAPI/staging 2023-12-01 11:11:42 +09:00
Naramsim
35f4712ed3 cicd: run on PRs 2023-11-30 15:03:43 +01:00
Naramsim
f7f2be7c1b cicd: try add build image action 2023-11-30 09:14:49 +01:00
Naramsim
b348e60d2c refactor: merge migrations 2023-11-30 04:09:39 +01:00
Simón Oroño
b3d6608283 Fix tests for sprites 
Moved the declaration of sprite_data variables closer to their actual
usage.
 2023-11-26 11:57:16 -04:00
Simón Oroño
61c21853ef Fix serializers for ItemSprites and PokemonFormSprites 2023-11-26 11:57:16 -04:00
Simón Oroño
76f7a340e6 Use JSONField instead of CharField for sprites 
The models affected were PokemonFormSprites and ItemSprites. This was
done to ensure they are properly returned when querying those tables
with Hasura.
 2023-11-26 11:57:16 -04:00
Simón Oroño
0dcaf0d0a0 Remove unused packages in requirements.txt 2023-11-26 11:57:16 -04:00
Simón Oroño
d57fd5ab01 Add a Makefile rule for running the tests inside the docker container 2023-11-26 11:57:16 -04:00
Simón Oroño
45efd0702c Remove root __init__.py file 
This was preventing the tests from running.
 2023-11-26 11:57:16 -04:00
Simón Oroño
db33cfc1a4 Format missing files 2023-11-26 11:57:16 -04:00
Simón Oroño
d1e2d9c5b4 Use new JSON field in Django instead of Postgres custom one 2023-11-26 11:57:16 -04:00
Simón Oroño
8f716cdbf0 Update Django to version 3.1 
Some third-party packages had to be updated and some new settings were
added due to `manage.py` not running.
 2023-11-26 11:57:16 -04:00
Simón Oroño
30e8a01253 Format migration 0014_auto_20231119_0303.py 2023-11-26 11:57:16 -04:00
Simón Oroño
49d970f0ed Remove unused serializer class PokemonSpritesSerializer 2023-11-26 11:57:16 -04:00
Simón Oroño
6ff2c0c217 Fix serialization of pokemon sprites 2023-11-26 11:57:16 -04:00
Simón Oroño
fa14336516 Stop encoding sprites when inserting them on the database 
Since the column is now jsonb, we need to stop encoding it or it gets
inserted as a string rather than a JSON object.
 2023-11-26 11:57:16 -04:00
Simón Oroño
218864dfbc Make the type of the sprites column in pokemon_v2_pokemonsprites jsonb 
This is so Hasura automatically transforms the field into an array
instead of a JSON encoded in a string.

Migration was generated by the `makemigrations` command.
 2023-11-26 11:57:16 -04:00