github.com/PokeAPI/pokeapi commits | Ecosyste.ms: OpenCollective

test nav

59bacbf78e4b51900649756e8ae835191be2ca8b authored about 9 years ago by Adickes <[email protected]>

json payload test

ef3ad994937db1044c5ebca316a40fe1c449d4b5 authored about 9 years ago by Adickes <[email protected]>

Merge branch 'docs' of https://github.com/zaneadix/pokeapi into docs

a2afb122899e85afae7a07d745e7eecb9be92d4b authored about 9 years ago by Adickes <[email protected]>

work for the day

e664020ce361c350724573f14414b3d1ddfac4a4 authored about 9 years ago by Adickes <[email protected]>

Merge pull request #69 from zaneadix/more-data

More data serving

ea0d5c7ab33ab02255e7f5beefa4b1d1a1f6f219 authored about 9 years ago by Zane Adickes <[email protected]>

good start to getting documentation workied out in a readme.

dfd2c839910385cbc377042e60aa65c660c31e5f authored about 9 years ago by Adickes <[email protected]>

link test

009100ef3403660381cb4af77726c2e63350c722 authored about 9 years ago by Adickes <[email protected]>

link test three

801dacf3b049b6bf970e362acf077ef466818447 authored about 9 years ago by Adickes <[email protected]>

link test two

730ff956f95c83e9ee2707d196081a165faf54af authored about 9 years ago by Adickes <[email protected]>

link test

17c60f6443d3660550057e1f553a2e14cdce1e5c authored about 9 years ago by Adickes <[email protected]>

start docs

64a60daa2569e839fc12f1593efbecd9ea01544c authored about 9 years ago by Adickes <[email protected]>

migration clean up

5c563dcb273193c2144a006f177a5730807a0da3 authored about 9 years ago by Adickes <[email protected]>

tests now handling all convenience attributes in all apis

3d8e9a7649beda6f741dcbefbe06f94fb73b91d5 authored about 9 years ago by Adickes <[email protected]>

evolution-chain bug fix

300f1a9b790a0f90b1cf92be579b5e8dc24a61f1 authored about 9 years ago by Adickes <[email protected]>

I feel like theres a ton of good convenience resource linking going on now

342ea98b878497a1e166210e07c05ee21e0ed320 authored about 9 years ago by Adickes <[email protected]>

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

1f480cedac5670e264b754c79f00515be85163cf authored about 9 years ago by Adickes <[email protected]>

clean up

43f97fd4662b586cf347c0504ea251a0d204cf7f authored about 9 years ago by Adickes <[email protected]>

cleaned up the berry mess

75e39ba530d60fec24bbd25e330378f34365c5d0 authored about 9 years ago by Adickes <[email protected]>

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.

aa1d7d99393d31987913fde88f7637903faccba7 authored about 9 years ago by Adickes <[email protected]>

apis for locations, location areas, encounters, encounter rates, characteristics, contests, super contests

c1f1f9ace765855357a11b6a66f9b168999d7044 authored about 9 years ago by Adickes <[email protected]>

Merge pull request #66 from zaneadix/build-fix

fix build steps

0d666b130363b26621c339e5f8415a02dcd4806b authored about 9 years ago by Zane Adickes <[email protected]>

fix build steps

db91f73085821504a60e64c15a68ae52b704a77e authored about 9 years ago by Adickes <[email protected]>

starting a few more api endpoints (locations and encounters)

b099558de299d3f47c735d406fcd14926c4e1cad authored about 9 years ago by Adickes <[email protected]>

Merge pull request #62 from zaneadix/tests

Tests done for current api endpoints

10d761432aea04ae368ff8a9dfcfe7308cf4f864 authored about 9 years ago by Paul Hallett <[email protected]>

whoops I commented a bunch of crap out

ede6577c17a48a60a2cf48c2560cd6e3d553262b authored about 9 years ago by Zane Adickes <[email protected]>

Finished tests for all current API endpoints (34 of them)

44151e1963548382150c3a9e52785386991e051e authored about 9 years ago by Adickes <[email protected]>

half of api tests are done

f3654c34580ba8799f83d8a738626eecfce0a07a authored about 9 years ago by Adickes <[email protected]>

starting tests

176802e4745c3cdbc32e1e6607a9d61d5689f503 authored about 9 years ago by Adickes <[email protected]>

Merge pull request #53 from zaneadix/rest-framework

Many api resources serving data. Currently no tests. We need tests.

b5ab3d3f080c86bb18290ebb6fae5d0a3042443a authored about 9 years ago by Zane Adickes <[email protected]>

Merge branch 'master' of https://github.com/phalt/pokeapi into safe-merge

f175d6323ffd000bb44e46740c367d94b4ff7f89 authored about 9 years ago by Adickes <[email protected]>

Merge pull request #58 from zaneadix/v1-data

Building v1 data

a0c2015d5e802795cc9c5c08d41a3e9f68140974 authored about 9 years ago by Zane Adickes <[email protected]>

Merge branch 'rest-framework' of https://github.com/zaneadix/pokeapi into rest-framework

1a09d2cdbac22507bf51c505a2046f80804f4533 authored about 9 years ago by Adickes <[email protected]>

About 80% of data is being served

df503e34242f4d79cd542fe206d6095872a2a386 authored about 9 years ago by Adickes <[email protected]>

About 80% of data is being served

926ce0513927a1cf385ca4a28e53ff5e0477adba authored about 9 years ago by Adickes <[email protected]>

got some functions working. issue with egg groups though

5de650ebea951067f8b60dbef5112651f1a0a131 authored about 9 years ago by Adickes <[email protected]>

little more work on pokemon evolution chains

6d7fd53ece65bd9432fdfcc5a92cd3bc44ac3be1 authored about 9 years ago by Adickes <[email protected]>

Merge pull request #56 from lazerwalker/patch-1

Update v2 db setup instructions to use local config

da708cb48d67115bfb9f469da987f37aa47352a3 authored about 9 years ago by Zane Adickes <[email protected]>

Update v2 db setup instructions to use local config

Trying to set up a local instance, I ran into some minor trouble trying to import the v2 since t...

6ba3f02b9a304614b89aa3ff61f24828ff936b1e authored about 9 years ago by Mike <[email protected]>

Merge pull request #55 from zaneadix/build-fix

Build fix

b3e91bc7d6086b8b3242de64fc1dcf83209cd649 authored about 9 years ago by Paul Hallett <[email protected]>

fix issue renaming 'introduces_in_version_group' to 'introduced_in_version_group' in migrations

20a8826d7fbdf2e1f12ea3858f0fa904d537ee77 authored about 9 years ago by Adickes <[email protected]>

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.

163e29c527308efea2a0018e8846a3ecad457de0 authored about 9 years ago by Adickes <[email protected]>

get rid of that dumb bash_profile file

b9c0cbf4b3e3a683bb66f24032734a4f9167cbe3 authored over 9 years ago by Adickes <[email protected]>

Started on pokemon. theyre a bit more complex than v1. not sure hot to break them up.

16c4ae33eae2f5355806d610751b50472c23efd8 authored over 9 years ago by Adickes <[email protected]>

Pokedex resources. Getting closer to Pokemon resources

3b8b1a6cf0fe894268158bdc818fd1c1ab28b2cb authored over 9 years ago by Zane Adickes <[email protected]>

squashed them 'grations again? thanks for making me merge them back in git. What did I do to deserve this?

c958ed99994ca7139ab0e1524350471681fcf02f authored over 9 years ago by Zane Adickes <[email protected]>

Merge remote-tracking branch 'origin/rest-framework' into rest-framework

7c13c5812d12c96f758b9a95f91184cbbdedc1b3 authored over 9 years ago by Zane Adickes <[email protected]>

squashed them 'grations

3f47b258bcf25b2f7a13e7f4be9485c417f3f2d2 authored over 9 years ago by Zane Adickes <[email protected]>

Serving Language, Generation, Version, Ability, Type

b8cf2128a3b1d4129445bd345c4e3e8493d14b43 authored over 9 years ago by Adickes <[email protected]>

Language should be totally done.

bcc7ea9df45c11d963fcb84521d5f455ad5957b1 authored over 9 years ago by Zane Adickes <[email protected]>

little cleanup

a0c0d62699e2b871f93abca1fef9fd1410b1d76e authored over 9 years ago by Adickes <[email protected]>

Serving lists/details and full ability detail data

ff63705a4d28e0da87ef8a63692c06b392bac3b9 authored over 9 years ago by Zane Adickes <[email protected]>

Getting started with the APIs. A few serving lists and details by name or pk

8eff28a8727c5a2561a8ca7fd7376424280b4963 authored over 9 years ago by Zane Adickes <[email protected]>

merge with what @phalt has done so far

744193dcabf874a1da8feb1494a654a59ecbc392 authored over 9 years ago by Zane Adickes <[email protected]>

Start on Ability api

3798d3b4cf014a843f91c757af15cbff39b49be0 authored over 9 years ago by Zane Adickes <[email protected]>

Merge branch 'master' of https://github.com/phalt/pokeapi

5b4ceda75ff755691edfea949f21e9c1d5c0f0f0 authored over 9 years ago by Zane Adickes <[email protected]>

Merge branch 'New-Data' into Complete-Models

e830c8c47f4ceb8114f7eefccc985ebf9ab603e0 authored over 9 years ago by Zane Adickes <[email protected]>

Merge pull request #40 from zaneadix/Complete-Models

Complete models and improved build script

b7e6145bceaa6ca574d5bc39c2868334739f38d8 authored over 9 years ago by Paul Hallett <[email protected]>

Merge pull request #39 from zaneadix/New-Data

New data

45121a2d0e692796e5700f86251bef4d18e69bfe authored over 9 years ago by Paul Hallett <[email protected]>

Additional Data

Filling out remaining data so Models have complete associations.
Data and models added for:
Poke...

bd508937ae80032dc1993962daaf167362efa53f authored over 9 years ago by Zane Adickes <[email protected]>

Completed Models/Build Script

-Added models for Pokemon, Moves, and all other remaining models.

-Added new models to build sc...

49926dc026c6b058745d416f39beb2720152a7ea authored over 9 years ago by Zane Adickes <[email protected]>

Revert "Pokemon/Move Models"

This reverts commit 1882c47f90e69cc1235438def8bf6546b9528295.

5ad1cb0ea5e3f7bc77559bfe38aa2d8a1dfbcdbf authored over 9 years ago by Zane Adickes <[email protected]>

Revert "Added Remaining Data and Models"

This reverts commit b069ee991b3ee83b9d3c21e8e8016ae3375b97dc.

5e9296f9488cda2a9b0361889ab35aaded7e1519 authored over 9 years ago by Zane Adickes <[email protected]>

Revert b069ee9..28035e5

This rolls back to commit b069ee991b3ee83b9d3c21e8e8016ae3375b97dc.

87b53aadbf24960196befdd9c1690fb6da29e951 authored over 9 years ago by Zane Adickes <[email protected]>

Merge remote-tracking branch 'origin/master'

Conflicts:
data/v2/build.py

28035e5aeb7482626346702ec29bbbe74e489333 authored over 9 years ago by Zane Adickes <[email protected]>

Added Remaining Data and Models

Data and models added for:
Pal Park
Berries
Regions
Pokeathlon
Contests
SuperContests
Items
Enco...

b069ee991b3ee83b9d3c21e8e8016ae3375b97dc authored over 9 years ago by Zane Adickes <[email protected]>

unnecessary 'replaces' array

35f4fa5889a12e978a19bb314dc420c85d92800b authored over 9 years ago by Zane Adickes <[email protected]>

Just adding instructions

really complicated things

4890407482e97a30265a26dd2d5a9cd3655064e3 authored over 9 years ago by Zane Adickes <[email protected]>

Pokemon/Move Models

-Added models for Pokemon, Moves, and all other remaining models.

-Added new models to build sc...

1882c47f90e69cc1235438def8bf6546b9528295 authored over 9 years ago by Zane Adickes <[email protected]>

More serializers

0a9fde247dfbf8d6f7defa26d99765ead26f6877 authored over 9 years ago by phalt <[email protected]>

update for new models

edcba6a1010dea6c656cb4f9def28fa233209e54 authored over 9 years ago by phalt <[email protected]>

Merge branch 'master' into rest-framework

Conflicts:
config/settings.py
pokemon_v2/admin.py
pokemon_v2/models.py

ba049cc936436d9a25194a314c4defbe59e13b75 authored over 9 years ago by phalt <[email protected]>

Merge pull request #33 from zaneadix/master

Base Model Implementations

278f241119d21f5da46a16e23e89abc47ba9e9b7 authored over 9 years ago by Paul Hallett <[email protected]>

Move Models

Created models for all move related models and added build steps for
each

b6b6ff09385ff6640c32c26052f9e1c894f60542 authored over 9 years ago by Zane Adickes <[email protected]>

Missed the migrations

5d5914fb2e2f2ee5388d00d0b449ad59ecb015d4 authored over 9 years ago by unknown <[email protected]>

Squashed migrations and cleaned up config/settings

42ff3af715b9c10849596999207b7270e03b1465 authored over 9 years ago by unknown <[email protected]>

More of the same for now

fc4fe2427006a4cc5a5b1bcc98ab21aecc5662a6 authored over 9 years ago by Zane Adickes <[email protected]>

Some Migration?

I dunno. Git is telling me this changed but I don’t think it did.

be211d7f3921948a4694de2a6c0e3bf2e7b96ed4 authored over 9 years ago by Zane Adickes <[email protected]>

More Models

Whole bunch of modelin’ goin’ on around here

9a255298fcca3811aec467592487fdd6fba2a4d1 authored over 9 years ago by Zane Adickes <[email protected]>

Merge pull request #32 from TheIronDeveloper/node-wrapper

Adding a node-wrapper to the /docs pages

cac94aaba57648967f81065a384c7bb5184e1dc6 authored over 9 years ago by Paul Hallett <[email protected]>

Adding a node-wrapper to the /docs pages

Updating the docs page to include a node wrapper that I made.

a7bca542e9c04c286881e4d0ba1a95fcd0a28e71 authored over 9 years ago by Tyler Stark <[email protected]>

Merge pull request #30 from TheIronDeveloper/updateDocs

Updating Documentation

43d68a9f2337ab0ccce06f94bede3c5ca2ba7723 authored over 9 years ago by Paul Hallett <[email protected]>

Updating Documentation

Updating documentation to more accurately describe the descriptions
field.

This PR:

* changed ...

e983c14d934f2f8ca0bdf0830f37c669cacd74c2 authored over 9 years ago by Tyler Stark <[email protected]>

more ability stuff

d9720665b84a857e97fb845a2a7195f34497ae07 authored over 9 years ago by Zane Adickes <[email protected]>

ability stuff

7a7c2d973719205848160edbadef89c9c636f528 authored over 9 years ago by Zane Adickes <[email protected]>

playing the fiddle

indulging my desire to help

9938788abbd73b4aec8568e8b74c0e07f07d5370 authored over 9 years ago by Zane Adickes <[email protected]>

Merge pull request #26 from vamsivarikuti/sidebar

fixed #5 sidebar from scrolling off the screen

f1448020a37162ca9a177e750eeba2e8442142bb authored over 9 years ago by Paul Hallett <[email protected]>

Progress - sprite resource implemented and testing

5818918622a7cb6f495848fb26265fe30916b068 authored almost 10 years ago by Paul Hallett <[email protected]>

fixed sidebar scrolling off the screen

ed400f363a0d5cdb89e5dd8f9f1eff4f2f5aa933 authored almost 10 years ago by Vamsi V <[email protected]>

live server update

f9abad1722d17ccf73450fe2c4e0376ca069a53b authored almost 10 years ago by root <root@pokeapi.(none)>

inital rest_framework progress

9adcec8eac8fcd9650a5b805f07155433179f5de authored almost 10 years ago by phalt <[email protected]>

update some copy stuff

7555ad779d9d3005161ea14fafc709343dceab43 authored almost 10 years ago by phalt <[email protected]>

remove xml for now

dbc7895934ae03b75b5a1632022d936d477967e9 authored about 10 years ago by phalt <[email protected]>

Merge branch 'theoperatore-cors-headers-api'

3b38fe9aebd3a6ca1524762d673bd6f514e8ae5d authored about 10 years ago by phalt <[email protected]>

fix conflicts

5e1432a677b8d5bfffc23f1ba92cc7b203354eae authored about 10 years ago by phalt <[email protected]>

Merge branch 'master' of github.com:phalt/pokeapi

456c77f55e18e64ed0cd5dd33f7bc0a9f1294fa4 authored about 10 years ago by phalt <[email protected]>

changed pokemon_v1 to pokemon backwards compat

8a880fe60d2e8b4b690cf37dd80c01d755a96326 authored about 10 years ago by phalt <[email protected]>

Merge pull request #21 from Opalo/master

Updated settings.py to support xml and json response formats.

36ded07c24fc4a00a0a8a7728fde05c440ef6efa authored about 10 years ago by Paul Hallett <[email protected]>

Update settings.py

Added 'xml' to 'TASTYPIE_DEFAULT_FORMATS' as in http://django-tastypie.readthedocs.org/en/latest...

d52c10875e43089a8862b8e6767ce452a0d15d3d authored about 10 years ago by Opalo <[email protected]>

change origin on tests

e3433a4244e1197888fed00b9b8f79b2a07ad974 authored about 10 years ago by Alex Petersen <[email protected]>

new lines in tests

f5153944511fbf0c401b427be2430dc06c2ba556 authored about 10 years ago by Alex Petersen <[email protected]>