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

1528 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Alessandro Pezzè
7f3d32de57
Merge pull request #965 from JulesLetters/typo-minds-eye 
Fix Mind's Eye ability to have apostrophe
 2023-11-26 17:27:01 +09:00
Justin Dowell
571361e26c Fix Mind's Eye ability to have apostrophe 2023-11-25 00:54:28 -06:00
Alessandro Pezzè
e6ba307c22
Merge pull request #957 from penelopeysm/sinnoh-starters 
Add SV learnset for Sinnoh starters
 2023-11-12 14:33:18 +09:00
Penelope Yong
3ff04231bb
Add SV learnset for Sinnoh starters 
Closes #956
 2023-11-11 14:46:11 +00:00
Alessandro Pezzè
0dfb20d121
Merge pull request #954 from JintoYamanaka/add_stat_changes 2023-11-08 23:53:08 +09:00
Alessandro Pezzè
d88716bacc
Merge branch 'master' into add_stat_changes 2023-11-08 22:46:25 +09:00
JintoYamanaka
49380605ed Add 'stat_changes' entries for 4 moves 
Included the missing 'stat_changes' for Stockpile, Memento, Defog, and Shell Smash to accurately reflect their in-game effects.
 2023-11-08 20:52:20 +09:00
Alessandro Pezzè
f96e236849
Merge pull request #953 from PokeAPI/format-newblack-serializer 2023-11-08 19:21:01 +09:00
Naramsim
8ba6f94c0c refactor/fix: format/sprite test 2023-11-08 11:11:56 +01:00
Naramsim
5237c4ccc9 refactor: format with new black 2023-11-08 10:44:55 +01:00
Naramsim
3fa2b6952f fix: don't add or replace parts of the sprites' URL 2023-11-08 10:22:56 +01:00
Alessandro Pezzè
369d09f390
Merge pull request #951 from 14239/master 2023-11-08 09:11:59 +09:00
14239
5eb8a4e95d Only rearrange edited move's order 2023-11-06 20:23:55 +09:00
14239
ca8a3a6a07 Merge branch 'master' of https://github.com/14239/pokeapi 2023-11-06 20:19:32 +09:00
14239
73ea615bfb Revert "Add order for Level 1 moves in Gen 9" 
This reverts commit 123bae116a.
 2023-11-06 20:14:34 +09:00
Alessandro Pezzè
aad0c8e5fd
Merge branch 'master' into master 2023-11-06 11:49:44 +01:00
Naramsim
e63ce54b80 refactor: run black 2023-11-06 11:38:12 +01:00
Alessandro Pezzè
203f3979cd
Merge branch 'master' into master 2023-11-06 11:20:38 +01:00
Alessandro Pezzè
3e4a710d07
refactor: format 2023-11-06 08:55:57 +01:00
Alessandro Pezzè
ccf4c80198
Merge pull request #949 from LeonEstrak/fix_sprites_url 
Fix: Sprites URL in GraphQL
 2023-11-06 08:25:52 +01:00