62 commits

Author	SHA1	Message	Date
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
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