Adickes
1f480cedac
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
2015-11-15 22:29:30 -05:00
Adickes
43f97fd466
clean up
2015-11-10 14:23:46 -05:00
Adickes
75e39ba530
cleaned up the berry mess
2015-11-10 14:20:06 -05:00
Adickes
aa1d7d9939
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.
2015-11-08 16:26:02 -05:00
Adickes
c1f1f9ace7
apis for locations, location areas, encounters, encounter rates, characteristics, contests, super contests
2015-11-05 09:55:14 -05:00
Zane Adickes
0d666b1303
Merge pull request #66 from zaneadix/build-fix
...
fix build steps
2015-10-29 15:15:17 -04:00
Adickes
db91f73085
fix build steps
2015-10-29 15:09:28 -04:00
Adickes
b099558de2
starting a few more api endpoints (locations and encounters)
2015-10-29 13:46:15 -04:00
Paul Hallett
10d761432a
Merge pull request #62 from zaneadix/tests
...
Tests done for current api endpoints
2015-10-28 10:19:08 +00:00
Zane Adickes
ede6577c17
whoops I commented a bunch of crap out
2015-10-28 00:28:21 -04:00
Adickes
44151e1963
Finished tests for all current API endpoints (34 of them)
2015-10-27 09:36:33 -04:00
Adickes
f3654c3458
half of api tests are done
2015-10-23 00:56:01 -04:00
Adickes
176802e474
starting tests
2015-10-18 19:01:33 -04:00
Zane Adickes
b5ab3d3f08
Merge pull request #53 from zaneadix/rest-framework
...
Many api resources serving data. Currently no tests. We need tests.
2015-10-07 09:12:31 -04:00
Adickes
f175d6323f
Merge branch 'master' of https://github.com/phalt/pokeapi into safe-merge
2015-10-06 18:42:03 -04:00
Zane Adickes
a0c2015d5e
Merge pull request #58 from zaneadix/v1-data
...
Building v1 data
2015-10-06 13:12:29 -04:00
Adickes
1a09d2cdba
Merge branch 'rest-framework' of https://github.com/zaneadix/pokeapi into rest-framework
2015-10-06 13:10:14 -04:00
Adickes
df503e3424
About 80% of data is being served
2015-10-06 13:09:07 -04:00
Adickes
926ce05139
About 80% of data is being served
2015-10-06 13:03:02 -04:00
Adickes
5de650ebea
got some functions working. issue with egg groups though
2015-10-03 00:36:39 -04:00
Adickes
6d7fd53ece
little more work on pokemon evolution chains
2015-10-02 23:40:21 -04:00
Zane Adickes
da708cb48d
Merge pull request #56 from lazerwalker/patch-1
...
Update v2 db setup instructions to use local config
2015-10-02 12:49:12 -04:00
Mike
6ba3f02b9a
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 the README's command to open a python shell wasn't passing in the settings config file flag, resulting in the v2 db import script trying to hit a postgres instance instead of the sqlite file.
This just adds that flag to the README.
2015-10-02 10:47:11 -04:00
Paul Hallett
b3e91bc7d6
Merge pull request #55 from zaneadix/build-fix
...
Build fix
2015-09-28 09:17:03 +01:00
Adickes
20a8826d7f
fix issue renaming 'introduces_in_version_group' to 'introduced_in_version_group' in migrations
2015-09-26 23:58:11 -05:00
Adickes
163e29c527
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.
2015-09-26 23:20:19 -05:00
Adickes
b9c0cbf4b3
get rid of that dumb bash_profile file
2015-09-19 18:17:10 -04:00
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
Zane Adickes
bcc7ea9df4
Language should be totally done.
2015-09-11 08:15:45 -04:00
Adickes
a0c0d62699
little cleanup
2015-09-10 19:02:06 -04:00
Zane Adickes
ff63705a4d
Serving lists/details and full ability detail data
2015-09-10 00:03:18 -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
Zane Adickes
5b4ceda75f
Merge branch 'master' of https://github.com/phalt/pokeapi
2015-05-18 22:45:12 -04:00
Zane Adickes
e830c8c47f
Merge branch 'New-Data' into Complete-Models
2015-05-18 22:29:10 -04:00
Paul Hallett
b7e6145bce
Merge pull request #40 from zaneadix/Complete-Models
...
Complete models and improved build script
2015-05-18 09:12:09 +01:00
Paul Hallett
45121a2d0e
Merge pull request #39 from zaneadix/New-Data
...
New data
2015-05-18 09:11:53 +01:00
Zane Adickes
bd508937ae
Additional Data
...
Filling out remaining data so Models have complete associations.
Data and models added for:
Pokemon
Moves
Pal Park
Berries
Regions
Pokeathlon
Contests
SuperContests
Items
Encounters
Locations
2015-04-20 23:38:33 -04:00
Zane Adickes
49926dc026
Completed Models/Build Script
...
-Added models for Pokemon, Moves, and all other remaining models.
-Added new models to build script
-Build script will now clean and reset auto-incrementers for each table
in pokeapi_co_db
-Build script now runs against both postgres and sqlite (dev)
-Added all models to admin site registry
-Added instructions for building out db in README
2015-04-20 23:31:59 -04:00
Zane Adickes
5ad1cb0ea5
Revert "Pokemon/Move Models"
...
This reverts commit 1882c47f90
2015-04-20 21:46:34 -04:00
Zane Adickes
5e9296f948
Revert "Added Remaining Data and Models"
...
This reverts commit b069ee991b
2015-04-20 21:43:55 -04:00
Zane Adickes
87b53aadbf
Revert b069ee9..28035e5
...
This rolls back to commit b069ee991b
2015-04-20 21:43:18 -04:00
Zane Adickes
28035e5aeb
Merge remote-tracking branch 'origin/master'
...
Conflicts:
data/v2/build.py
2015-04-19 22:26:20 -04:00
Zane Adickes
b069ee991b
Added Remaining Data and Models
...
Data and models added for:
Pal Park
Berries
Regions
Pokeathlon
Contests
SuperContests
Items
Encounters
Locations
2015-04-19 22:24:14 -04:00
