25 commits

Author	SHA1	Message	Date
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
Adickes	a0c0d62699	little cleanup	2015-09-10 19:02:06 -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
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
Paul Hallett	278f241119	Merge pull request #33 from zaneadix/master ... Base Model Implementations	2015-04-11 11:00:42 +01:00
unknown	42ff3af715	Squashed migrations and cleaned up config/settings	2015-04-08 09:57:29 -04:00
Zane Adickes	7a7c2d9737	ability stuff	2015-04-02 08:21:39 -04:00
Paul Hallett	5818918622	Progress - sprite resource implemented and testing	2015-03-11 20:07:30 +00:00
root	f9abad1722	live server update	2015-02-22 17:26:45 +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
phalt	5e1432a677	fix conflicts	2014-12-15 10:03:41 +00:00
phalt	456c77f55e	Merge branch 'master' of github.com:phalt/pokeapi	2014-12-15 10:01:58 +00:00
phalt	8a880fe60d	changed pokemon_v1 to pokemon backwards compat	2014-12-15 10:01:53 +00:00
Opalo	d52c10875e	Update settings.py ... Added 'xml' to 'TASTYPIE_DEFAULT_FORMATS' as in http://django-tastypie.readthedocs.org/en/latest/settings.html	2014-12-10 20:45:10 +01: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