Commit graph

184 commits

Author SHA1 Message Date
Julian Lawrance
9a03a7da42 Merge branch 'feature/pokemon-form-types' of https://github.com/phrasmotica/pokeapi into feature/pokemon-form-types 2021-02-19 14:33:54 +00:00
Julian Lawrance
49072e9c45 Format source code 2021-02-19 14:25:39 +00:00
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
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
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
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
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
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è
464aeea4af fix: run black 2020-11-23 22:05:49 +01:00
Alessandro Pezzè
71d75c3540 feat: extend pokemon_name to 60 char 2020-11-23 21:57:30 +01:00
Alessandro Pezzè
a131421889
Update and rename 0006_auto_20200815_0610.py to 0007_auto_20200815_0610.py 2020-08-15 21:43:23 +02:00
Alessandro Pezzè
7dcc930d79
fix(lint): remove spaces 2020-08-15 21:39:11 +02:00
Alessandro Pezzè
b2c381a89e
Merge branch 'master' into master 2020-08-15 21:32:56 +02:00
Raghav Nair
25e026cc6a Removing ultrabeast column and only updating is_legendary and is_mythical 2020-08-14 22:14:09 -07:00
Alessandro Pezzè
8c10abd909 refactor: merge migrations
:
2020-08-11 19:33:12 +02:00
Raghav Nair
d13b2f3b7d Formatting 2020-08-09 16:15:21 -07:00
Raghav Nair
60b3e6aa4d Adding migrations 2020-08-09 12:43:06 -07:00
Raghav Nair
8c82794a04 Using black to format tests file 2020-08-09 12:41:24 -07:00
Raghav Nair
99dabe387c Updating PokemonSpecies serializer, fields, tests 2020-08-09 12:35:45 -07:00
Alessandro Pezzè
7ceba2f1b1 refactor: apply black 2020-08-01 12:24:38 +02:00
Alessandro Pezzè
047575ff41 play: add some pokemon 2020-08-01 12:00:09 +02:00
Alessandro Pezzè
47044317e4 add migration 2020-07-25 22:14:00 +02:00
Alessandro Pezzè
bf02891d1e
Update models.py 2020-07-25 21:52:01 +02:00
Christian Garza
f44da153fb Fix linting errors 2020-07-10 02:59:05 -07:00
Christian Garza
a14271a67a Extend pokemon sprites to include dream-world images from submodule 2020-07-09 23:58:11 -07:00
Christian Garza
20c5d31be4 Increase max length for PokemonSprites 2020-07-09 23:25:48 -07:00
Andrés Ignacio Torres
6f1479d21c
prevent server error on invalid numeric id lookup 2020-05-03 09:02:07 -04:00
Julian Lawrance
d983f29543 Add tests for Pokemon form types 2020-04-25 14:25:00 +01:00
Julian Lawrance
98d67b19ed Create model, serialiser and migration for Pokemon form types 2020-04-25 14:10:50 +01:00
Julian Lawrance
fee75ea61d Address PR comments 2020-04-21 23:30:23 +01:00
Julian Lawrance
4f8a9258f9 Add test for Wurmple evolution chain fix 2020-04-13 20:07:43 +01:00
Julian Lawrance
a3ed4f035c Serialize evolution chains recursively to fix Wurmple evolution 2020-04-13 14:14:48 +01:00
Paul Hallett
867fd9c23a blacked 2020-02-24 13:18:14 +13:00
Paul Hallett
d5d55dad7f Autoformat entire project, tidy up makefile 2020-02-24 13:18:14 +13:00
Alessandro Pezzè
c7e10bd044 feat: address new max length for iso639 2020-02-23 23:58:13 +01:00
Julian Lawrance
7a2e0c4f41 Fix line lengths for pylint 2019-11-30 23:42:46 +00:00
Julian Lawrance
999e2d1bb9 Fix URLs in Pokemon resource example 2019-11-30 23:31:17 +00:00