568 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Simón Oroño	3cbeedb3f0	Merge branch 'master' into learned_by_pokemon	2021-01-25 16:54:37 -04:00
Alessandro Pezzè	1ce88ff23d	sync: https://github.com/PokeAPI/pokedex/pull/28	2021-01-25 21:51:14 +01: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
Alessandro Pezzè	85541fff96	Merge pull request #554 from PokeAPI/staging	2021-01-13 10:01:17 +01:00
Alessandro Pezzè	9b1bb9593d	sync(data): https://github.com/PokeAPI/pokedex/pull/23	2021-01-11 19:46:03 +01:00
Alessandro Pezzè	6e343cf85c	docs: simplify docker setup/remove outdated info	2021-01-11 19:45:28 +01:00
Alessandro Pezzè	9e3f2a2426	chore: add docker commands	2021-01-11 19:44:43 +01:00
Alessandro Pezzè	3c63270fa2	sync: update sprites	2021-01-07 18:10:34 +01:00
Alessandro Pezzè	1f2891d4ec	Merge pull request #549 from zacbullard/master ... Added missing type data for toxtricity-low-key-gmax (10220)	2021-01-04 11:36:19 +01:00
zacbullard	5c6aac10d9	Added missing type data for toxtricity-low-key-gmax (10220)	2020-12-28 17:10:34 -05:00
Alessandro Pezzè	78d71ed879	Merge pull request #548 from timgates42/bugfix_typo_result	2020-12-28 10:38:45 +01: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è	d0c4023fe6	Merge pull request #545 from PokeAPI/staging ... Adds order to gen8 species	2020-12-16 15:48:45 +01:00
Alessandro Pezzè	56931b967d	data: add order	2020-12-11 17:07:35 +01:00
Alessandro Pezzè	63ee471a14	feat: update submodule [ci skip]	2020-12-05 14:48:17 +01:00
Alessandro Pezzè	5893aded20	Merge pull request #541 from maleclercq/empty_lines	2020-12-04 11:46:25 +01:00
matthieu	b96bf59964	Merge branch 'empty_lines' of https://github.com/maleclercq/pokeapi into empty_lines	2020-12-03 23:59:01 +01:00
matthieu	33f708a149	update leafeon and glaceon	2020-12-03 23:58:30 +01:00
maleclercq	31d6c1add5	Merge branch 'master' into empty_lines	2020-12-03 09:56:36 +01:00
Alessandro Pezzè	ce0013efc7	Merge pull request #543 from PokeAPI/staging ... Fix abilities	2020-12-03 09:36:46 +01:00
Alessandro Pezzè	da9c4c5b99	data: fix abilities as per https://github.com/PokeAPI/api-data/pull/62#issuecomment-736749492	2020-12-01 21:24:10 +01:00
matthieu	10b20624f0	Remove 4 empty lines (when trigger evolution was the location)	2020-12-01 08:57:25 +01:00
Alessandro Pezzè	832c4d10e3	Merge pull request #540 from PokeAPI/staging ... Sync data	2020-11-30 22:39:37 +01:00
Alessandro Pezzè	b9844c8c1b	sync: data ... Contains data from @myoKun345 (https://github.com/PokeAPI/pokedex/pull/18) and @tomi-912 (https://github.com/PokeAPI/pokedex/pull/19)	2020-11-30 20:44:37 +01:00
Alessandro Pezzè	44dbfab905	Merge pull request #539 from PokeAPI/staging	2020-11-24 21:44:56 +01:00
Alessandro Pezzè	bc9d5b1ebf	chore: bump black	2020-11-23 22:11:23 +01: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è	fa4c09675a	bug: increment order	2020-11-23 21:22:04 +01:00
Alessandro Pezzè	d6a5568280	fix: 1	2020-11-23 21:04:19 +01:00
Alessandro Pezzè	4b346086da	fix: add evolution trigger	2020-11-23 20:37:44 +01:00
Alessandro Pezzè	8f5b45b96b	fix: add rain info	2020-11-23 19:57:33 +01:00
Alessandro Pezzè	d3f87bdfd7	feat: sync data ... most of it is from @myoKun345 (https://github.com/PokeAPI/pokedex/pull/17) plus some leftovers I forgot	2020-11-23 19:37:38 +01:00
Alessandro Pezzè	fb1c28c194	fix: don't post status updates when in a cron job	2020-11-16 19:16:18 +01:00
Alessandro Pezzè	e91e567811	Update config.yml ... [skip ci]	2020-10-24 18:40:22 +02:00
Alessandro Pezzè	fc662bdb12	Rename feature_request.yml to feature_request.md	2020-10-12 09:44:30 +02:00
Alessandro Pezzè	e77f43bdb8	Rename bug_report.yml to bug_report.md	2020-10-12 09:44:02 +02:00
Alessandro Pezzè	8a8e31980e	Merge pull request #529 from PokeAPI/staging	2020-10-08 11:18:21 +02:00
Alessandro Pezzè	5b3b2f7465	Merge branch 'master' into staging	2020-10-08 11:04:32 +02:00
Alessandro Pezzè	988e4562c1	Merge pull request #530 from PokeAPI/Naramsim-patch-1	2020-10-08 11:03:45 +02:00
Alessandro Pezzè	69dda8b183	chore: cron deploy staging	2020-10-04 16:14:34 +02:00
Alessandro Pezzè	5e803da514	fix: update ability description	2020-10-03 18:43:49 +02:00
Alessandro Pezzè	894a8bc737	feat: use 2.4 manifest	2020-10-03 18:43:34 +02:00
Alessandro Pezzè	6d4a1a9846	Merge pull request #527 from Purukitto/patch-1 ... Fix License badge's link	2020-09-19 10:51:45 +02:00
Pulkit Sambhavi Singh	57c3369302	Fix License badge's link	2020-09-19 11:31:28 +05:30
Alessandro Pezzè	4a51836454	Merge pull request #526 from PokeAPI/staging	2020-09-07 10:59:13 +02:00
Alessandro Pezzè	841cb964ff	Merge pull request #524 from AndreArrebola/lgpe-movenames	2020-09-07 10:57:29 +02:00
Alessandro Pezzè	6b33ed2bc6	play: allow null values	2020-09-02 19:57:00 +02:00
Alessandro Pezzè	f6512caa72	feat: add missing commas	2020-09-02 19:42:48 +02:00
Alessandro Pezzè	e76b278774	Merge branch 'master' into lgpe-movenames	2020-09-02 15:35:30 +02:00