Zane Adickes
77c69889e1
clean merge
2016-02-25 00:02:51 -05:00
Zane Adickes
a16e6418e5
pokemon flavor texts now available
2016-02-24 23:55:59 -05:00
Paul Hallett
c9661531b0
Merge pull request #79 from zaneadix/New-Data
...
updated data with all of latest veekun updates
2016-02-23 10:06:21 +00:00
Zane Adickes
12640795ff
Merge pull request #88 from SiMylo/master
...
Fixing Issue #85 (Duplicated Move Data)
2016-02-18 23:20:58 -05:00
Zane Adickes
08c4e351e2
remove images for now
2016-02-18 00:04:49 -05:00
Paul Hallett
3c6f33a50f
Merge pull request #100 from PoroCYon/master
...
Fixed more typos in the docs
2016-02-16 17:37:45 +00:00
Zane Adickes
791d6853d6
forgot to uncomment some things
2016-02-16 01:47:05 -05:00
Zane Adickes
ec58b95478
images implemented for pokmon, pokemon forms and items
2016-02-16 01:31:19 -05:00
Paul Hallett
f3b82954c0
Merge pull request #101 from TheTommyTwitch/master
...
pokedex promise, the first v2 wrapper is done!
2016-02-15 10:10:07 +00:00
Thomas Asadurian
81963fee23
pokedex promise, the first v2 wrapper is done
2016-02-13 10:30:50 -08:00
Zane Adickes
fdcfae9c5c
merge with phalt
2016-02-12 23:44:08 -05:00
PoroCYon
1f57a68964
Fixed type info in the docs
2016-02-13 02:36:09 +01:00
PoroCYon
e54370aa25
Fixed more typos in the docs
2016-02-12 21:28:48 +01:00
Paul Hallett
f0595fcbe9
Merge pull request #98 from bdchauvette/master
...
Fix leftover merge conflict from stash
2016-02-12 12:10:40 +00:00
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
Ben Chauvette
84b8e7c256
Fix leftover merge conflict from stash
2016-02-11 22:36:39 -05:00
Zane Adickes
396bbd45ae
adding some images
2016-02-10 08:09:36 -05:00
Zane Adickes
399643aa87
get started
2016-02-09 23:11:37 -05:00
SiMylo
a080077b2c
Merge pull request #2 from SiMylo/dev
...
Using PEP 0008 as Guide
2016-02-08 08:31:01 -06:00
SiMylo
cba1cbe292
Using PEP 0008 as Guide
...
Attempting to incorporate the style guide linked by phalt. Should have
no functional changes, but is hopefully easier to read/review.
2016-02-08 08:28:55 -06:00
SiMylo
17d4197214
Merge pull request #1 from SiMylo/dev
...
Shorten Line Lengths
2016-02-05 08:12:56 -06:00
SiMylo
b08392cd3e
Shorten Line Lengths
...
Refactoring a little so the line lengths will be shorter?
2016-02-05 08:11:48 -06:00
SiMylo
58a7b287f4
Fixing Issue #85 (Duplicated Move Data)
...
Contains a fix and testing for the following issue:
I found that we are sometimes sending multiple exact duplicates of
pokemon move data when there are different levels at which a pokemon
learns a move for different version groups. I found that the problem
was that we were using order_by('level') and duplicate('move_id') .
This link explains why this behavior happens.
https://docs.djangoproject.com/en/1.7/ref/models/querysets/#distinct
2016-02-03 14:24:48 -06: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
Zane Adickes
d0909e1cc3
updated data with all of latest veekun updates
2015-12-28 00:00:14 -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
