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

235 commits

Author SHA1 Message Date
Julian Lawrance
999e2d1bb9 Fix URLs in Pokemon resource example 2019-11-30 23:31:17 +00:00
Julian Lawrance
5dce336fd3 Add past Pokemon types information to README 2019-11-30 21:21:01 +00:00
Julian Lawrance
0f6881442f Create tests for past Pokemon types 2019-11-30 21:00:26 +00:00
Julian Lawrance
87ce1a593a Create serializer for past Pokemon types 2019-11-30 20:57:15 +00:00
Julian Lawrance
1d9e41d100 Create DB model and migration for past Pokemon types 2019-11-30 20:49:39 +00:00
Kronopt
a5205b5126 fix #423 2019-05-11 20:50:13 -04:00
Charles Marttinen
63b4f9040b chore: Configure PyLint and correct code formatting 2018-10-20 11:35:11 -04:00
Charles Marttinen
4df9920596 chore: Correct code formatting to appease linter 2018-10-20 11:35:11 -04:00
Charles Marttinen
7714b745a3 fix: Update flake8 and pyflake 2018-10-20 11:35:11 -04:00
Charles Marttinen
8832c819e3 chore: Remove python2 compatibility code 2018-10-20 11:35:11 -04:00
Charles Marttinen
3d64938a3f chore: Upgrade to Python 3 and update Django to 2.0 2018-10-20 11:35:11 -04:00
Charles Marttinen
23ba8056ef chore: Update Django to 1.10 2018-10-20 11:35:11 -04:00
Charles Marttinen
ee96433e6d chore: Update Django to 1.9 2018-10-20 11:35:11 -04:00
Charles Marttinen
6663813dc2 fix: Add LocationArea back to REST API 
LocationArea is a special case that was missed when getting rid of the
hit counter.
 2018-10-18 23:18:36 -04:00
Charles Marttinen
76c2b58e4e fix: Remove old website and associated code 
The pokeapi.co website has been rebuilt and moved to a separate
project, so the website in this project is obsolete.

This removes all files and code related to the website, including the
'alerts' and 'hits' apps (which managed website alerts and the hit
counter) and unused site assets (CSS, JS, images).
 2018-10-18 23:18:36 -04:00
Alessandro Pezzè
9203a0d286 Sun and moon data (#305) 
* badges

* Added CSV from Veekun

* added sprites from Veekun website

* quick fixes for an Exception

* bumped dependencies version

* add comment on how to upgrade to Django 1.11

* added some reminds to caching, our official wrappers and the true cost of the server

* remove index.html from sprites

* update to conform django-rest-framework 3.3.0 guidelines

* lint
 2017-10-21 13:21:23 +00:00
Paul Hallett
404f23abd1 Change URL from PokéAPI to gh for sprites (#257) 2016-08-13 18:35:42 +01:00
sentwistler
28bd7ccd67 move flavor texts now available (#220) 
* move flavor texts now available

* fix failed lints

* add documentation for move flavor text field
 2016-07-05 09:42:03 +01:00
Sargun Vohra
d6ae95c617 Redo PokemonEncounterView (#212) 
* redo PokemonEncounterView (fix #210)
 2016-06-25 13:33:52 -04:00
Sargun Vohra
cf19dcca29 Pokemon form names (#213) 
* added names and form names to the pokemon-form resource

* document pokemon form names

* close #185
 2016-06-25 12:56:24 -04:00
Sargun Vohra
f8c641716e Link moves to machines (#211) 
* add Machines resource to link TM/HM items to moves

* document new Machines resource

* fix #198
 2016-06-25 12:45:20 -04:00
Sargun Vohra
fce9410c50 Fix for dealing with name format (#207) 
* Allow plus in names (fix #146)

* Handle id/name that does not match the format instead of throwing an error
 2016-06-04 12:27:36 -04:00
Sargun Vohra
1890ad9512 Allow negative IDs (fix #145) (#206) 2016-06-04 11:18:45 +01:00
Paul Hallett
4919c0674d DB index, improve Pokemon performance (#194) 
* DB index, improve Pokemon performance

* fix test

* blep
 2016-05-30 14:58:03 +01:00
Sargun Vohra
ba7cfafbc4 use empty list instead of null for evolution details (#191) 2016-05-25 09:01:23 +01:00
Sargun Vohra
254937c673 Always wrap evolution details in a list (#190) 
* fix #188, always wrap evolution details in a list

* update evolution details test to accomodate fix
 2016-05-24 14:56:15 +01:00
Paul Bowsher
13becdb6a8 Fix a typo (#184) 
`abailable` -> `available`
 2016-05-09 09:24:32 +01:00
Paul Hallett
422d98fff2 Optimisations (#174) 
* removed all the things causing slow times on data

* fixup look sharp

* use ujson

* bep
 2016-04-30 13:02:27 +01:00
Shohei Shimomura
0bce568bce Update pokemon_v2/README.md (#153) 2016-04-23 11:06:16 +01:00
smasher164
2bf7a9667b Update docs and readme to show that /location/ and /location-area/ only take an id, not a name. 2016-03-16 19:29:53 -04:00
Mordechai Zuber
3242948828 Fix for phalt/pokeapi#120 2016-03-09 16:52:00 +02:00
phalt
e12586a536 Fix migrations again 2016-03-05 12:14:10 +00:00
phalt
4bbb7b0a44 final lints 2016-03-05 11:40:41 +00:00
phalt
341b635332 Linting for the entire project 2016-03-05 09:27:25 +00:00
phalt
36e8781c68 Version bumps, removing whitespaces 2016-03-05 08:26:51 +00:00
Adickes
effe512e61 merge migrations paths 2016-03-01 19:56:44 -05:00
Zane Adickes
421a87fdc4 Merge branch 'v2-images' into flavor-texts 2016-02-25 00:04:58 -05:00
Zane Adickes
77c69889e1 clean merge 2016-02-25 00:02:51 -05:00
Zane Adickes
a16e6418e5 pokemon flavor texts now available 2016-02-24 23:55:59 -05:00
Paul Hallett
c9661531b0 Merge pull request #79 from zaneadix/New-Data 
updated data with all of latest veekun updates
 2016-02-23 10:06:21 +00:00
Zane Adickes
12640795ff Merge pull request #88 from SiMylo/master 
Fixing Issue #85 (Duplicated Move Data)
 2016-02-18 23:20:58 -05:00
Zane Adickes
ec58b95478 images implemented for pokmon, pokemon forms and items 2016-02-16 01:31:19 -05:00
Zane Adickes
fdcfae9c5c merge with phalt 2016-02-12 23:44:08 -05:00
PoroCYon
1f57a68964 Fixed type info in the docs 2016-02-13 02:36:09 +01:00
PoroCYon
e54370aa25 Fixed more typos in the docs 2016-02-12 21:28:48 +01:00
PoroCYon
5587ebd9ac Fixed typos in README (fixes #97) 
I've left `pokédexes` as it is.
 2016-02-12 12:46:02 +01:00
Zane Adickes
396bbd45ae adding some images 2016-02-10 08:09:36 -05:00
Zane Adickes
399643aa87 get started 2016-02-09 23:11:37 -05:00
SiMylo
cba1cbe292 Using PEP 0008 as Guide 
Attempting to incorporate the style guide linked by phalt.  Should have
no functional changes, but is hopefully easier to read/review.
 2016-02-08 08:28:55 -06:00
SiMylo
b08392cd3e Shorten Line Lengths 
Refactoring a little so the line lengths will be shorter?
 2016-02-05 08:11:48 -06:00
SiMylo
58a7b287f4 Fixing Issue #85 (Duplicated Move Data) 
Contains a fix and testing for the following issue:

I found that we are sometimes sending multiple exact duplicates of
pokemon move data when there are different levels at which a pokemon
learns a move for different version groups.  I found that the problem
was that we were using order_by('level') and duplicate('move_id') .
This link explains why this behavior happens.
https://docs.djangoproject.com/en/1.7/ref/models/querysets/#distinct
 2016-02-03 14:24:48 -06:00
Zane Adickes
d6ca4a3f60 had a stash mistake on the last push. this should be a complete push 2016-01-26 21:09:44 -05:00
Zane Adickes
91e84b7079 reorganiztion and clean up. 2016-01-09 10:55:39 -05:00
Zane Adickes
b1302233aa still need to re-organize v2 docs and work on doc navigation 2016-01-07 08:20:10 -05:00
Zane Adickes
66370dad44 ui using django templates 2016-01-06 17:10:05 -05:00
Zane Adickes
90a0066f33 oh well nevermind 2016-01-04 19:39:50 -05:00
Zane Adickes
f9e528dd38 cleanup. navigation between version uis 2016-01-01 20:05:39 -05:00
Zane Adickes
00408c89e2 home page try it out. contributors. started docs. 2016-01-01 16:48:41 -05:00
Zane Adickes
0fda377b8c new ui code in angular 2015-12-30 08:22:15 -05:00
Zane Adickes
d0909e1cc3 updated data with all of latest veekun updates 2015-12-28 00:00:14 -05:00
Adickes
0828ffd84c identify a few arrays 2015-12-08 13:04:15 -05:00
Adickes
e83363cd67 small whoops again 2015-12-08 13:02:32 -05:00
Adickes
adf94814f9 small whoops 2015-12-08 13:01:53 -05:00
Adickes
b4f5680b42 added aditional get methods for each resource and corrected a few things 2015-12-08 12:57:28 -05:00
Adickes
7d25324ac0 added aditional get methods for each resource and corrected a few things 2015-12-08 12:55:48 -05:00
Adickes
714aa0b34d scrub out some unnecessary changes 2015-12-04 09:35:31 -05:00
Adickes
c454c3d2a0 fixed a bunch of links 2015-12-04 09:05:49 -05:00
Adickes
758bdbf877 probably finalized docs 2015-12-04 00:07:19 -05:00
Adickes
b5364be71b adding a few more json examples 2015-12-02 00:36:29 -05:00
Adickes
6422ee2411 adding json examples 2015-12-02 00:05:16 -05:00
Adickes
a3c2c17701 test nav table 2015-12-01 20:00:20 -05:00
Adickes
f1b0c9ecbc test nav again 2015-12-01 19:27:15 -05:00
Adickes
c4761152c0 test nav 2015-12-01 19:25:56 -05:00
Adickes
59bacbf78e test nav 2015-12-01 19:21:01 -05:00
Adickes
ef3ad99493 json payload test 2015-12-01 19:01:17 -05:00
Adickes
e664020ce3 work for the day 2015-12-01 13:47:46 -05:00
Adickes
dfd2c83991 good start to getting documentation workied out in a readme. 2015-11-29 18:39:38 -05:00
Adickes
009100ef34 link test 2015-11-28 18:52:05 -05:00
Adickes
801dacf3b0 link test three 2015-11-28 11:35:53 -05:00
Adickes
730ff956f9 link test two 2015-11-28 11:33:32 -05:00
Adickes
17c60f6443 link test 2015-11-28 11:25:30 -05:00
Adickes
64a60daa25 start docs 2015-11-28 09:30:55 -05:00
Adickes
5c563dcb27 migration clean up 2015-11-27 01:48:00 +01:00
Adickes
3d8e9a7649 tests now handling all convenience attributes in all apis 2015-11-26 02:18:35 +01:00
Adickes
300f1a9b79 evolution-chain bug fix 2015-11-16 15:42:24 -05:00
Adickes
342ea98b87 I feel like theres a ton of good convenience resource linking going on now 2015-11-16 14:23:41 -05:00
Adickes
1f480cedac tests covering all endpoints. working on adding some convenience attributes to api resources to help connect them two way style. tests will probably need some small tweaks 2015-11-15 22:29:30 -05:00
Adickes
43f97fd466 clean up 2015-11-10 14:23:46 -05:00
Adickes
75e39ba530 cleaned up the berry mess 2015-11-10 14:20:06 -05:00
Adickes
aa1d7d9939 fished serving almost all data (with the exception of machines and some csv files that didnt have data yet but have been updated in veekuns repo. TESTS STILL NEED TO BE DONE. 2015-11-08 16:26:02 -05:00
Adickes
c1f1f9ace7 apis for locations, location areas, encounters, encounter rates, characteristics, contests, super contests 2015-11-05 09:55:14 -05:00
Adickes
b099558de2 starting a few more api endpoints (locations and encounters) 2015-10-29 13:46:15 -04:00
Adickes
44151e1963 Finished tests for all current API endpoints (34 of them) 2015-10-27 09:36:33 -04:00
Adickes
f3654c3458 half of api tests are done 2015-10-23 00:56:01 -04:00
Adickes
176802e474 starting tests 2015-10-18 19:01:33 -04:00
Adickes
df503e3424 About 80% of data is being served 2015-10-06 13:09:07 -04:00
Adickes
6d7fd53ece little more work on pokemon evolution chains 2015-10-02 23:40:21 -04:00
Adickes
163e29c527 Renamed PokemonMoveMethod models to MoveLearnMethod because it just damn well makes more sense when I'm reading the code and I assume anyone else will feel the same way. Also, progress on many api resources. 2015-09-26 23:20:19 -05:00
Adickes
16c4ae33ea Started on pokemon. theyre a bit more complex than v1. not sure hot to break them up. 2015-09-19 18:13:41 -04:00
Zane Adickes
3b8b1a6cf0 Pokedex resources. Getting closer to Pokemon resources 2015-09-15 08:26:47 -04:00
Zane Adickes
c958ed9999 squashed them 'grations again? thanks for making me merge them back in git. What did I do to deserve this? 2015-09-12 19:05:16 -04:00
Zane Adickes
7c13c5812d Merge remote-tracking branch 'origin/rest-framework' into rest-framework 2015-09-12 18:57:11 -04:00
Zane Adickes
3f47b258bc squashed them 'grations 2015-09-12 18:55:45 -04:00
Adickes
b8cf2128a3 Serving Language, Generation, Version, Ability, Type 2015-09-12 00:53:46 -04:00
Zane Adickes
bcc7ea9df4 Language should be totally done. 2015-09-11 08:15:45 -04:00
Adickes
a0c0d62699 little cleanup 2015-09-10 19:02:06 -04:00
Zane Adickes
ff63705a4d Serving lists/details and full ability detail data 2015-09-10 00:03:18 -04:00
Zane Adickes
8eff28a872 Getting started with the APIs. A few serving lists and details by name or pk 2015-09-09 00:28:33 -04:00
Zane Adickes
744193dcab merge with what @phalt has done so far 2015-09-05 22:10:13 -04:00
Zane Adickes
3798d3b4cf Start on Ability api 2015-09-05 21:22:06 -04:00
Zane Adickes
49926dc026 Completed Models/Build Script 
-Added models for Pokemon, Moves, and all other remaining models.

-Added new models to build script

-Build script will now clean and reset auto-incrementers for each table
in pokeapi_co_db

-Build script now runs against both postgres and sqlite (dev)

-Added all models to admin site registry

-Added instructions for building out db in README
 2015-04-20 23:31:59 -04:00
Zane Adickes
5ad1cb0ea5 Revert "Pokemon/Move Models" 
This reverts commit 1882c47f90.
 2015-04-20 21:46:34 -04:00
Zane Adickes
5e9296f948 Revert "Added Remaining Data and Models" 
This reverts commit b069ee991b.
 2015-04-20 21:43:55 -04:00
Zane Adickes
b069ee991b Added Remaining Data and Models 
Data and models added for:
Pal Park
Berries
Regions
Pokeathlon
Contests
SuperContests
Items
Encounters
Locations
 2015-04-19 22:24:14 -04:00
Zane Adickes
1882c47f90 Pokemon/Move Models 
-Added models for Pokemon, Moves, and all other remaining models.

-Added new models to build script

-Build script will now clean and reset auto-incrementers for each table
in pokeapi_co_db

-Build script now runs against both postgres and sqlite (dev)

-Some v2 cvs files had no data in them. Pulled in the data from veekun
where necessary.

-Added all models to admin site registry

-Added instructions for building out db in README
 2015-04-12 22:29:36 -04:00
phalt
0a9fde247d More serializers 2015-04-11 11:16:04 +01:00
phalt
edcba6a101 update for new models 2015-04-11 11:12:38 +01:00
phalt
ba049cc936 Merge branch 'master' into rest-framework 
Conflicts:
	config/settings.py
	pokemon_v2/admin.py
	pokemon_v2/models.py
 2015-04-11 11:05:59 +01:00
Zane Adickes
b6b6ff0938 Move Models 
Created models for all move related models and added build steps for
each
 2015-04-09 00:45:23 -04:00
unknown
5d5914fb2e Missed the migrations 2015-04-08 10:25:59 -04:00
unknown
42ff3af715 Squashed migrations and cleaned up config/settings 2015-04-08 09:57:29 -04:00
Zane Adickes
fc4fe24270 More of the same for now 2015-04-07 08:14:31 -04:00
Zane Adickes
be211d7f39 Some Migration? 
I dunno. Git is telling me this changed but I don’t think it did.
 2015-04-06 00:30:23 -04:00
Zane Adickes
9a255298fc More Models 
Whole bunch of modelin’ goin’ on around here
 2015-04-06 00:27:59 -04:00
Zane Adickes
d9720665b8 more ability stuff 2015-04-03 08:03:02 -04:00
Zane Adickes
7a7c2d9737 ability stuff 2015-04-02 08:21:39 -04:00
Zane Adickes
9938788abb playing the fiddle 
indulging my desire to help
 2015-03-30 21:02:29 -04:00
Paul Hallett
5818918622 Progress - sprite resource implemented and testing 2015-03-11 20:07:30 +00:00
phalt
9adcec8eac inital rest_framework progress 2015-02-22 17:11:40 +00:00
phalt
dbc7895934 remove xml for now 2014-12-15 10:13:52 +00:00
Alex Petersen
e3433a4244 change origin on tests 2014-12-07 11:56:21 -05:00
Alex Petersen
f515394451 new lines in tests 2014-12-07 11:38:15 -05:00
Alex Petersen
ec50da1dcb updated as per pull request#19 2014-12-07 11:32:09 -05:00
Alex Petersen
3337817bf9 added CORS middleware with basic installation / tests for v1 & v2 apis 2014-12-06 17:57:42 -05:00
phalt
21a1d4bf46 initial commit 2014-12-04 11:11:46 +00:00