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
254 commits 12 branches 8 tags 53 MiB
Commit graph

254 commits

This branch
This branch
All branches
Author SHA1 Message Date
Paul Hallett
e9df887f64 Merge pull request #125 from phalt/circleci 
Circleci
 2016-03-05 11:47:23 +00:00
phalt
291c325e88 do not lint node stuff 2016-03-05 11:42:58 +00:00
phalt
4bbb7b0a44 final lints 2016-03-05 11:40:41 +00:00
phalt
341b635332 Linting for the entire project 2016-03-05 09:27:25 +00:00
phalt
3867a3bb8d use override instead 2016-03-05 08:31:48 +00:00
phalt
4729bf2429 adding circle.yml in 2016-03-05 08:29:26 +00:00
phalt
36e8781c68 Version bumps, removing whitespaces 2016-03-05 08:26:51 +00:00
Paul Hallett
f6af0441c4 Merge pull request #108 from bdchauvette/master 
Fix #94
 2016-03-03 13:25:31 +00:00
Ben Chauvette
9e89d26a41 Bump minimum DRF version to 3.1.0 2016-03-02 23:30:54 -05:00
Paul Hallett
6da364a297 Merge pull request #117 from PoroCYon/master 
Added new PokeApi.NET version to the wrappers list, fixed typos in docsv2.md again
 2016-03-02 10:43:32 +00:00
Paul Hallett
4d94d764e9 Merge pull request #118 from zaneadix/migration-cleanup 
Migration cleanup
 2016-03-02 10:36:16 +00:00
Adickes
5f8359a2bb remove crap file 2016-03-01 19:57:48 -05:00
Adickes
effe512e61 merge migrations paths 2016-03-01 19:56:44 -05:00
PoroCYon
4321738ca4 fixed broken sprites stuff 2016-03-01 22:12:18 +01:00
PoroCYon
bfe9089953 _ 2016-03-01 19:58:06 +01:00
PoroCYon
b6aeeb7781 more fixes 2016-03-01 19:57:12 +01:00
PoroCYon
5914bc5dcf Updated docsv2.md (2/2) 2016-03-01 19:55:11 +01:00
PoroCYon
72f8d1e3c0 Updated docsv2.md (1/?) 2016-03-01 17:44:58 +01:00
PoroCYon
5952580cd6 Update docsv2.html 2016-03-01 17:09:13 +01:00
PoroCYon
f1514426c2 Update docsv1.html 
Link now points to GitLab.
 2016-03-01 17:08:18 +01:00
Paul Hallett
8dbfafd166 Merge pull request #70 from OrangeCrush/master 
Add a Dockerfile to build the application as a container
 2016-03-01 09:56:45 +00:00
Maxwell Friederichs
5357992688 Changed Dockerfile over to use postgres. Adding custom config for the Dockerfile. 2016-02-29 21:05:25 -06:00
Maxwell Friederichs
e3bcb68b11 Remove references to make setup 2016-02-27 21:51:06 -06:00
Maxwell Friederichs
37060cf1b1 Added documentation in the README.md file for the Docker build process. 2016-02-27 21:51:06 -06:00
Maxwell Friederichs
0d95145bfb Adding a Dockerfile for automated app builds. 
Implements pokeapi/issues#37
 2016-02-27 21:51:06 -06:00
Paul Hallett
ea5d443631 Merge pull request #111 from zaneadix/flavor-texts 
Flavor texts
 2016-02-25 09:42:25 +00:00
Zane Adickes
42b2177a43 Merge pull request #110 from zaneadix/sprites 
sprites for v2-images
 2016-02-25 00:26:17 -05:00
Zane Adickes
552ae130d1 sprites for v2-images 2016-02-25 00:09:40 -05:00
Zane Adickes
421a87fdc4 Merge branch 'v2-images' into flavor-texts 2016-02-25 00:04:58 -05:00
Zane Adickes
69a492231b Merge pull request #104 from zaneadix/v2-images 
V2 images
 2016-02-25 00:03:46 -05:00
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