Commit graph

1095 commits

Author SHA1 Message Date
Alessandro Pezzè
a29394ecf5
Merge branch 'staging' into fix-item-names-id 2023-01-15 19:34:21 +01:00
Alessandro Pezzè
65e3354938 Merge branch 'master' into staging 2023-01-15 19:33:15 +01:00
Alessandro Pezzè
e1d2fa8fb3
Merge pull request #806 from giginet/pokemon-moves-sv 2023-01-15 19:29:22 +01:00
Alessandro Pezzè
e2f9e0c859
Merge branch 'master' into pokemon-moves-sv 2023-01-15 18:39:06 +01:00
giginet
1e57075a6b Fill level columns to 0 2023-01-15 16:39:32 +09:00
giginet
05e78f841a Fix item_names IDs 2023-01-15 14:28:34 +09:00
Alessandro Pezzè
58e2cf30d6
Merge pull request #795 from giginet/pokemon-ability-sv 2023-01-14 23:38:37 +01:00
Alessandro Pezzè
9690ea1f00
Merge branch 'master' into pokemon-ability-sv 2023-01-14 22:40:52 +01:00
Naramsim
a7e476969f Merge branch 'staging' of https://github.com/PokeAPI/pokeapi into staging 2023-01-14 22:06:18 +01:00
Naramsim
39b88987c3 feat: trust graphql API call rather than CircleCI injected vars 2023-01-14 22:00:27 +01:00
Alessandro Pezzè
61c5154efa
Merge pull request #787 from giginet/sv-items 2023-01-14 21:44:19 +01:00
Alessandro Pezzè
4535015922
Merge branch 'master' into sv-items 2023-01-14 21:43:57 +01:00
giginet
bb56e09af5 Fill cost info 2023-01-14 18:14:28 +09:00
Alessandro Pezzè
94914b1926
Merge branch 'master' into pokemon-moves-sv 2023-01-13 22:04:57 +01:00
Alessandro Pezzè
ba99279d6a Merge branch 'master' of https://github.com/PokeAPI/pokeapi 2023-01-13 12:41:57 +01:00
Alessandro Pezzè
a77600ab8d docs: add query 2023-01-13 12:41:53 +01:00
Alessandro Pezzè
571fbb1b60
Merge pull request #799 from giginet/missing-form-info 2023-01-13 12:13:47 +01:00
Alessandro Pezzè
4c289d55bf
Merge branch 'master' into missing-form-info 2023-01-13 12:13:38 +01:00
Alessandro Pezzè
b7ba9146bf
Merge pull request #798 from giginet/ability-name 2023-01-13 12:13:23 +01:00
Alessandro Pezzè
e6f0b21fe7
Merge branch 'master' into ability-name 2023-01-13 12:13:16 +01:00
Alessandro Pezzè
51535ad6e8
Merge pull request #805 from giginet/fix-new-base-stats 2023-01-13 12:13:04 +01:00
Alessandro Pezzè
cf7ada72ee
Merge pull request #797 from giginet/sv-form-name 2023-01-13 12:12:40 +01:00
Alessandro Pezzè
b6a458e205
Merge branch 'master' into pokemon-moves-sv 2023-01-13 11:36:06 +01:00
Alessandro Pezzè
67f00cfe15
Merge branch 'master' into sv-form-name 2023-01-13 11:35:39 +01:00
Alessandro Pezzè
79601a7bf8
Merge branch 'master' into fix-new-base-stats 2023-01-13 11:34:40 +01:00
Alessandro Pezzè
bca4d92fd3
Merge branch 'master' into ability-name 2023-01-13 11:33:43 +01:00
Alessandro Pezzè
962601c27e
Merge branch 'master' into missing-form-info 2023-01-13 11:33:12 +01:00
Alessandro Pezzè
a46b449545
Merge pull request #816 from mlemesle/fix/unescaped-comma-in-location-area-prose
Fixes https://github.com/PokeAPI/pokeapi/issues/815
2023-01-13 11:28:59 +01:00
Martin Lemesle
aa998064b7 Add double quotes to surround third column to correctly escape comma in location's name 2023-01-13 01:09:49 +01:00
Alessandro Pezzè
3a103fc658 docs: update docker hub page 2023-01-09 16:45:47 +01:00
Alessandro Pezzè
068c2f433c
Merge pull request #811 from PokeAPI/staging 2023-01-09 16:40:17 +01:00
Alessandro Pezzè
1cbb78f27e feat: update 2023-01-09 16:11:23 +01:00
Alessandro Pezzè
dca0e65ffd
Merge branch 'master' into sv-items 2023-01-09 14:21:31 +01:00
Alessandro Pezzè
61c87de336
Merge pull request #794 from giginet/gender_rate 2023-01-09 13:11:17 +01:00
giginet
5b384a54e6 Merge remote-tracking branch 'origin/master' into missing-form-info 2023-01-09 15:17:25 +09:00
Kohki Miki
a13169009a
Merge branch 'master' into sv-items 2023-01-09 15:06:41 +09:00
Kohki Miki
a7cba02ff3
Merge branch 'master' into gender_rate 2023-01-09 15:06:34 +09:00
Kohki Miki
b3c5eb8d48
Merge branch 'master' into pokemon-ability-sv 2023-01-09 15:06:26 +09:00
Kohki Miki
bf42302019
Merge branch 'master' into sv-form-name 2023-01-09 15:06:20 +09:00
Kohki Miki
5d64a642cc
Merge branch 'master' into ability-name 2023-01-09 15:06:13 +09:00
giginet
2879d91719 Merge remote-tracking branch 'origin/master' into fix-new-base-stats 2023-01-09 15:05:05 +09:00
Alessandro Pezzè
901bda8562 revert: use old ubuntu 2023-01-08 19:22:16 +01:00
Alessandro Pezzè
ec1fb4f645 chore: change machine 2023-01-08 19:12:39 +01:00
Alessandro Pezzè
e0cddea7ec revert: bumb down 2023-01-08 19:10:15 +01:00
Alessandro Pezzè
a2c080e999 chore: update versions 2023-01-08 19:07:48 +01:00
Alessandro Pezzè
9239642fc2 feat: add order and missingmove 2023-01-08 17:59:45 +01:00
Alessandro Pezzè
f050d32127
Merge pull request #793 from giginet/pokemon-forms 2023-01-08 17:17:04 +01:00
Alessandro Pezzè
0755d40691
Merge branch 'master' into pokemon-forms 2023-01-08 17:14:53 +01:00
Alessandro Pezzè
c5834653de
Merge pull request #810 from giginet/new-move-target 2023-01-08 16:25:41 +01:00
giginet
ba8ff8fa3d Remove missing columns 2023-01-08 15:41:33 +09:00