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

326 commits

This branch
This branch
All branches
Author SHA1 Message Date
sh0hei
5bc832bf46 Merge branch 'master' into add_mascalade-pokeapi_to_api_v1 2016-03-16 09:53:33 +09:00
Paul Hallett
cd6a2da586 Merge pull request #133 from M-Zuber/patch-1 
Doc fixes
 2016-03-15 15:06:28 +00:00
Mordechai Zuber
2f7736f48e Merge branch 'master' into patch-1 2016-03-15 15:58:21 +02:00
sh0hei
76614bfdbd Add mascalade-pokeapi wrapper to v1 docs 2016-03-15 21:06:18 +09:00
Paul Hallett
2a99a016fa Merge pull request #144 from pokesource/pokekotlin-moved 
Update PokeKotlin link because it has moved
 2016-03-15 09:24:31 +00:00
Sargun Vohra
a56b42f08d Update PokeKotlin link because it has moved 2016-03-14 20:42:51 -04:00
Paul Hallett
d389d04718 Merge pull request #139 from darkcl/master 
Add PokemonKit, a wrapper written in swift
 2016-03-14 09:32:34 +00:00
Yeung Yiu Hung
73561a5661 Add PokemonKit, a wrapper written in swift 2016-03-12 21:30:40 +08:00
Mordechai Zuber
3242948828 Fix for phalt/pokeapi#120 2016-03-09 16:52:00 +02:00
Mordechai Zuber
e50ae665de Update docsv2.md 2016-03-09 11:41:41 +02:00
Mordechai Zuber
a7def4945b Fix issue phalt/pokeapi#121 2016-03-08 19:38:45 +02:00
Mordechai Zuber
834094295a Fix phalt/pokeapi#132 2016-03-08 19:36:27 +02:00
Mordechai Zuber
0ae7421ae6 Fix issue phalt/pokeapi#131 2016-03-08 19:34:23 +02:00
Paul Hallett
a5876d952d Merge pull request #130 from sargunster/pokekotlin-wrapper 
Add PokeKotlin wrapper to v2 docs
 2016-03-08 17:18:11 +00:00
Sargun Vohra
c5a1658816 add PokeKotlin wrapper to v2 docs 2016-03-07 12:37:24 -05:00
Paul Hallett
de524e19d8 Merge pull request #129 from phalt/rollback 
Rollback
 2016-03-07 11:00:37 +00:00
root
bd30096d43 version rollback 2016-03-07 10:54:51 +00:00
root
921493826c version rollback 2016-03-07 10:54:13 +00:00
Paul Hallett
82eab471a4 Merge pull request #127 from phalt/migrations 
build script fixes
 2016-03-05 12:26:46 +00:00
phalt
944af0455d build script fixes 2016-03-05 12:25:50 +00:00
Paul Hallett
001154fd0d Merge pull request #126 from phalt/migrations 
Fix migrations again
 2016-03-05 12:18:58 +00:00
phalt
e12586a536 Fix migrations again 2016-03-05 12:14:10 +00:00
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