Commit graph

  • b7e6145bce Merge pull request #40 from zaneadix/Complete-Models Paul Hallett 2015-05-18 09:12:09 +0100
  • 45121a2d0e Merge pull request #39 from zaneadix/New-Data Paul Hallett 2015-05-18 09:11:53 +0100
  • dc3bf8b9c4 Merge 5ad1cb0ea5 into 278f241119 #35 Zane Adickes 2015-04-21 03:39:05 +0000
  • bd508937ae Additional Data #39 Zane Adickes 2015-04-20 23:38:33 -0400
  • 49926dc026 Completed Models/Build Script #40 Zane Adickes 2015-04-20 23:31:59 -0400
  • 5ad1cb0ea5 Revert "Pokemon/Move Models" #35 Zane Adickes 2015-04-20 21:46:34 -0400
  • 5e9296f948 Revert "Added Remaining Data and Models" Zane Adickes 2015-04-20 21:43:55 -0400
  • 87b53aadbf Revert b069ee9..28035e5 Zane Adickes 2015-04-20 21:43:18 -0400
  • 28035e5aeb Merge remote-tracking branch 'origin/master' Zane Adickes 2015-04-19 22:26:20 -0400
  • b069ee991b Added Remaining Data and Models Zane Adickes 2015-04-19 22:24:14 -0400
  • 35f4fa5889 unnecessary 'replaces' array Zane Adickes 2015-04-12 22:54:35 -0400
  • 4890407482 Just adding instructions Zane Adickes 2015-04-12 22:48:28 -0400
  • 1882c47f90 Pokemon/Move Models Zane Adickes 2015-04-12 22:29:36 -0400
  • 0a9fde247d More serializers #25 phalt 2015-04-11 11:16:04 +0100
  • edcba6a101 update for new models phalt 2015-04-11 11:12:38 +0100
  • ba049cc936 Merge branch 'master' into rest-framework phalt 2015-04-11 11:05:59 +0100
  • 278f241119 Merge pull request #33 from zaneadix/master Paul Hallett 2015-04-11 11:00:42 +0100
  • b6b6ff0938 Move Models #33 Zane Adickes 2015-04-09 00:45:23 -0400
  • 5d5914fb2e Missed the migrations unknown 2015-04-08 10:25:59 -0400
  • 42ff3af715 Squashed migrations and cleaned up config/settings unknown 2015-04-08 09:57:29 -0400
  • fc4fe24270 More of the same for now Zane Adickes 2015-04-07 08:14:31 -0400
  • be211d7f39 Some Migration? Zane Adickes 2015-04-06 00:30:23 -0400
  • 9a255298fc More Models Zane Adickes 2015-04-06 00:27:59 -0400
  • cac94aaba5 Merge pull request #32 from TheIronDeveloper/node-wrapper Paul Hallett 2015-04-05 11:15:11 +0100
  • a7bca542e9 Adding a node-wrapper to the /docs pages #32 Tyler Stark 2015-04-04 13:01:55 -0700
  • 43d68a9f23 Merge pull request #30 from TheIronDeveloper/updateDocs Paul Hallett 2015-04-04 20:07:39 +0100
  • e983c14d93 Updating Documentation #30 Tyler Stark 2015-04-04 11:40:25 -0700
  • d9720665b8 more ability stuff Zane Adickes 2015-04-03 08:03:02 -0400
  • 7a7c2d9737 ability stuff Zane Adickes 2015-04-02 08:21:39 -0400
  • 9938788abb playing the fiddle Zane Adickes 2015-03-30 21:02:29 -0400
  • f1448020a3 Merge pull request #26 from vamsivarikuti/sidebar Paul Hallett 2015-03-29 11:25:36 +0100
  • 5818918622 Progress - sprite resource implemented and testing Paul Hallett 2015-03-11 20:07:30 +0000
  • 44a33c7214 Combined all abilities csv's #38 Akhil Indurti 2015-03-05 18:23:10 -0500
  • ed400f363a fixed sidebar scrolling off the screen #26 Vamsi V 2015-02-27 15:31:52 +0530
  • f9abad1722 live server update root 2015-02-22 17:26:45 +0000
  • 9adcec8eac inital rest_framework progress phalt 2015-02-22 17:11:40 +0000
  • 7555ad779d update some copy stuff phalt 2015-02-22 13:06:29 +0000
  • 2446941210 Merge pull request #1 from immewnity/xml-patch #24 immewnity 2015-02-20 08:48:46 -0600
  • 2658272b54 Add XML support immewnity 2015-02-20 08:48:19 -0600
  • dbc7895934 remove xml for now phalt 2014-12-15 10:13:52 +0000
  • 3b38fe9aeb Merge branch 'theoperatore-cors-headers-api' phalt 2014-12-15 10:04:14 +0000
  • 5e1432a677 fix conflicts phalt 2014-12-15 10:03:41 +0000
  • 456c77f55e Merge branch 'master' of github.com:phalt/pokeapi phalt 2014-12-15 10:01:58 +0000
  • 8a880fe60d changed pokemon_v1 to pokemon backwards compat phalt 2014-12-15 10:01:53 +0000
  • 36ded07c24 Merge pull request #21 from Opalo/master Paul Hallett 2014-12-13 11:07:48 +0000
  • d52c10875e Update settings.py #21 Opalo 2014-12-10 20:45:10 +0100
  • baacc0ff93 Merge e3433a4244 into 42d70ce599 #19 Alex Petersen 2014-12-07 16:56:32 +0000
  • e3433a4244 change origin on tests #19 Alex Petersen 2014-12-07 11:56:21 -0500
  • f515394451 new lines in tests Alex Petersen 2014-12-07 11:38:15 -0500
  • ec50da1dcb updated as per pull request#19 Alex Petersen 2014-12-07 11:32:09 -0500
  • 3337817bf9 added CORS middleware with basic installation / tests for v1 & v2 apis Alex Petersen 2014-12-06 17:57:42 -0500
  • 42d70ce599 code phalt 2014-12-05 12:32:36 +0000
  • 7b0c782758 add contributing details phalt 2014-12-05 12:31:49 +0000
  • 7708d42aa3 add blog url phalt 2014-12-05 12:20:17 +0000
  • ab3276ecd1 explain myself phalt 2014-12-04 19:55:38 +0000
  • b152dc9902 README changes phalt 2014-12-04 12:11:57 +0000
  • 21a1d4bf46 initial commit phalt 2014-12-04 11:11:46 +0000