Mirrors/pokeapi
2
0
Fork 0
mirror of https://github.com/PokeAPI/pokeapi synced 2024-11-22 19:33:10 +00:00
Code Issues Projects Releases Packages Wiki Activity
151 commits 12 branches 8 tags 53 MiB
Commit graph

151 commits

This branch
This branch
All branches
Author SHA1 Message Date
Paul Hallett
bf47d012e1 Merge pull request #99 from PoroCYon/master 
Fixed typos in README (fixes #97)
 2016-02-12 12:10:16 +00:00
PoroCYon
56566c035d Merge pull request #1 from PoroCYon/PoroCYon-doc-typo-fix 
-oops, ignore this derp-
 2016-02-12 12:46:56 +01:00
PoroCYon
5587ebd9ac Fixed typos in README (fixes #97) 
I've left `pokédexes` as it is.
 2016-02-12 12:46:02 +01:00
root
29583e8461 Update migrations to allow correct upgrade path 2016-01-31 12:24:53 +00:00
Paul Hallett
1b59324630 Merge pull request #81 from zaneadix/new-ui 
New ui
 2016-01-31 12:03:26 +00:00
Zane Adickes
d6ca4a3f60 had a stash mistake on the last push. this should be a complete push 2016-01-26 21:09:44 -05:00
Zane Adickes
6dba85c32a Merge branch 'new-ui' of https://github.com/zaneadix/pokeapi into new-ui 2016-01-26 20:31:28 -05:00
Zane Adickes
572c7eee1d didnt mean to addd this image 2016-01-09 11:12:09 -05:00
Zane Adickes
d5d64576f1 delete pikachu image 2016-01-09 11:10:42 -05:00
Zane Adickes
91e84b7079 reorganiztion and clean up. 2016-01-09 10:55:39 -05:00
Zane Adickes
734fe626c4 need to figure out v2 side nav 2016-01-08 08:08:40 -05:00
Zane Adickes
b1302233aa still need to re-organize v2 docs and work on doc navigation 2016-01-07 08:20:10 -05:00
Zane Adickes
66370dad44 ui using django templates 2016-01-06 17:10:05 -05:00
Zane Adickes
90a0066f33 oh well nevermind 2016-01-04 19:39:50 -05:00
Zane Adickes
f9e528dd38 cleanup. navigation between version uis 2016-01-01 20:05:39 -05:00
Zane Adickes
00408c89e2 home page try it out. contributors. started docs. 2016-01-01 16:48:41 -05:00
Paul Hallett
35114a5c9a Merge pull request #78 from zaneadix/scrub-str 
remove templating from strings when building database
 2015-12-30 17:33:49 +00:00
Zane Adickes
0fda377b8c new ui code in angular 2015-12-30 08:22:15 -05:00
Adickes
1f41e3c17f remove templating from strings when building database 2015-12-27 00:42:41 -05:00
Zane Adickes
2c33493741 Merge pull request #73 from zaneadix/docs 
Docs
 2015-12-08 13:07:41 -05:00
Adickes
0828ffd84c identify a few arrays 2015-12-08 13:04:15 -05:00
Adickes
e83363cd67 small whoops again 2015-12-08 13:02:32 -05:00
Adickes
adf94814f9 small whoops 2015-12-08 13:01:53 -05:00
Adickes
b4f5680b42 added aditional get methods for each resource and corrected a few things 2015-12-08 12:57:28 -05:00
Adickes
7d25324ac0 added aditional get methods for each resource and corrected a few things 2015-12-08 12:55:48 -05:00
Zane Adickes
aaa9f756cc Merge pull request #75 from nimaje/improve_db_build 
Ran all methods and checked a good portion of the endpoints visually as well as ran the tests. Everything looks good.
 2015-12-08 10:59:55 -05:00
nimaje
58645bdff9 avoid starimports readme. list of functions moved 
don't use starimports so don't use them in examples. the second example for v2 is ok because there it is not clear which functions are needed.
I think the list of functions should be in the section of v2.
 2015-12-07 21:42:07 +01:00
nimaje
33ae7a6073 avoid starimports 
don't use starimports so don't use them in examples
 2015-12-07 21:29:39 +01:00
nimaje
a94e95f34b Merge pull request #2 from zaneadix/improved-build 
a few doc changes
 2015-12-07 21:25:42 +01:00
Adickes
b58a5b76c3 a few doc changes 2015-12-07 15:17:33 -05:00
nimaje
b5981d70ff Merge pull request #1 from cstrachan88/patch-1 
Update v2 build.py
 2015-12-06 08:43:56 +01:00
Courtney Strachan
41662657a1 Update build.py - remove duplicate data load 
I noticed that there was a duplicate PokemonGameIndex import in the original build.py for the v2 import. It's still in your updated build.py so I edited it out.
 2015-12-05 18:54:09 -08:00
Benjamin Takacs
6dec6e0dd4 updated README for the new useage of the v2 build script 2015-12-05 22:44:23 +01:00
Benjamin Takacs
35240b3ae5 renamed prozess_csv to process_csv 2015-12-05 13:21:56 +01:00
Benjamin Takacs
5e5854fb7b One function for each group of models¬ 
NOT TESTED YET! Buildscript has not finished yet (needed about 18h until now).

Made `data/v2/__init__.py` and `config/local.py` python3 compatible.

Writen helper functions because of repeating code:
  + `process_csv`
  + `build_generic`
useage demonstrated with `_build_languages`.

Writen `with_iter` for closing files automatical
when the processing has finished.

Writen for each group of models a function (named `build_`groupname)
and a function `build_all` which calls these functions.
 2015-12-05 12:13:46 +01:00
Adickes
714aa0b34d scrub out some unnecessary changes 2015-12-04 09:35:31 -05:00
Adickes
c454c3d2a0 fixed a bunch of links 2015-12-04 09:05:49 -05:00
Adickes
758bdbf877 probably finalized docs 2015-12-04 00:07:19 -05:00
Adickes
b5364be71b adding a few more json examples 2015-12-02 00:36:29 -05:00
Adickes
6422ee2411 adding json examples 2015-12-02 00:05:16 -05:00
Adickes
a3c2c17701 test nav table 2015-12-01 20:00:20 -05:00
Adickes
f1b0c9ecbc test nav again 2015-12-01 19:27:15 -05:00
Adickes
c4761152c0 test nav 2015-12-01 19:25:56 -05:00
Adickes
59bacbf78e test nav 2015-12-01 19:21:01 -05:00
Adickes
ef3ad99493 json payload test 2015-12-01 19:01:17 -05:00
Adickes
a2afb12289 Merge branch 'docs' of https://github.com/zaneadix/pokeapi into docs 2015-12-01 13:58:43 -05:00
Adickes
e664020ce3 work for the day 2015-12-01 13:47:46 -05:00
Zane Adickes
ea0d5c7ab3 Merge pull request #69 from zaneadix/more-data 
More data serving
 2015-11-30 12:39:13 -05:00
Adickes
dfd2c83991 good start to getting documentation workied out in a readme. 2015-11-29 18:39:38 -05:00
Adickes
009100ef34 link test 2015-11-28 18:52:05 -05:00