320 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	7555ad779d	update some copy stuff	2015-02-22 13:06:29 +00:00
phalt	dbc7895934	remove xml for now	2014-12-15 10:13:52 +00:00
phalt	3b38fe9aeb	Merge branch 'theoperatore-cors-headers-api'	2014-12-15 10:04:14 +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
Paul Hallett	36ded07c24	Merge pull request #21 from Opalo/master ... Updated settings.py to support xml and json response formats.	2014-12-13 11:07:48 +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	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	42d70ce599	code	2014-12-05 12:32:36 +00:00
phalt	7b0c782758	add contributing details	2014-12-05 12:31:49 +00:00
phalt	7708d42aa3	add blog url	2014-12-05 12:20:17 +00:00
phalt	ab3276ecd1	explain myself	2014-12-04 19:55:38 +00:00
phalt	b152dc9902	README changes	2014-12-04 12:11:57 +00:00
phalt	21a1d4bf46	initial commit	2014-12-04 11:11:46 +00:00