github.com/PokeAPI/pokeapi commits | Ecosyste.ms: OpenCollective

Merge pull request #127 from phalt/migrations

build script fixes

82eab471a4f6be4002592b33b58216291926f0f3 authored almost 9 years ago by Paul Hallett <[email protected]>

build script fixes

944af0455deba2a926b5f2059c05df5d69ae1c7e authored almost 9 years ago by phalt <[email protected]>

Merge pull request #126 from phalt/migrations

Fix migrations again

001154fd0d95e2396892d780542b999f984e6b11 authored almost 9 years ago by Paul Hallett <[email protected]>

Fix migrations again

e12586a536ab0debe16a0b3ebb273550efbb1bdf authored almost 9 years ago by phalt <[email protected]>

Merge pull request #125 from phalt/circleci

Circleci

e9df887f64693093e80c75a41fdedf07a50bd986 authored almost 9 years ago by Paul Hallett <[email protected]>

do not lint node stuff

291c325e88b9e322ea43d00d68a775fabee4502d authored almost 9 years ago by phalt <[email protected]>

final lints

4bbb7b0a44eb5335e17ca76cb5b4df124a43debd authored almost 9 years ago by phalt <[email protected]>

Linting for the entire project

341b635332c2c0db0ad38181f434db245ea994ca authored almost 9 years ago by phalt <[email protected]>

use override instead

3867a3bb8daeaa68d36232bf104ffab845b149b5 authored almost 9 years ago by phalt <[email protected]>

adding circle.yml in

4729bf2429f9a8f1cba9940176e9462d268cd576 authored almost 9 years ago by phalt <[email protected]>

Version bumps, removing whitespaces

36e8781c6809a147ef6cf03dbf4adc5c7bbacbdb authored almost 9 years ago by phalt <[email protected]>

Merge pull request #108 from bdchauvette/master

Fix #94

f6af0441c4e2c547d08844f097f2b11608895b87 authored almost 9 years ago by Paul Hallett <[email protected]>

Bump minimum DRF version to 3.1.0

9e89d26a416673d1e354c25f2fa84075f070339c authored almost 9 years ago by Ben Chauvette <[email protected]>

Merge pull request #117 from PoroCYon/master

Added new PokeApi.NET version to the wrappers list, fixed typos in docsv2.md again

6da364a2979ce23cd6301a4a64f26d6705909e9c authored almost 9 years ago by Paul Hallett <[email protected]>

Merge pull request #118 from zaneadix/migration-cleanup

Migration cleanup

4d94d764e9e9339cc32b569c24d7326e4667a871 authored almost 9 years ago by Paul Hallett <[email protected]>

remove crap file

5f8359a2bba646d13c76bf93a953d596b2b78e27 authored almost 9 years ago by Adickes <[email protected]>

merge migrations paths

effe512e61f5c06c9844031ff5d8b981b306f859 authored almost 9 years ago by Adickes <[email protected]>

fixed broken sprites stuff

4321738ca45174c2621d89bd9f77f2969f8c1a4c authored almost 9 years ago by PoroCYon <[email protected]>

_

bfe9089953ea90da64705944ec61ec8ff3632033 authored almost 9 years ago by PoroCYon <[email protected]>

more fixes

b6aeeb77811d02e30b8d5c81c5abf376a2f31781 authored almost 9 years ago by PoroCYon <[email protected]>

Updated docsv2.md (2/2)

5914bc5dcfbd61db89334e6f9298b918d7639310 authored almost 9 years ago by PoroCYon <[email protected]>

Updated docsv2.md (1/?)

72f8d1e3c07536d051adbae0ab908a6b1f22e96d authored almost 9 years ago by PoroCYon <[email protected]>

Update docsv2.html

5952580cd64b4001daeb06edb9c57f594d80e13b authored almost 9 years ago by PoroCYon <[email protected]>

Update docsv1.html

Link now points to GitLab.

f1514426c2a08c9a60f82c858fdac8726c2959d7 authored almost 9 years ago by PoroCYon <[email protected]>

Merge pull request #70 from OrangeCrush/master

Add a Dockerfile to build the application as a container

8dbfafd16673ddf105faba02c2378dfb049baa2e authored almost 9 years ago by Paul Hallett <[email protected]>

Changed Dockerfile over to use postgres. Adding custom config for the Dockerfile.

5357992688cb94e4e4616d6ea68a172de19a108b authored almost 9 years ago by Maxwell Friederichs <[email protected]>

Remove references to make setup

e3bcb68b11fa8d632c5d47e132b96321aabcf709 authored almost 9 years ago by Maxwell Friederichs <[email protected]>

Added documentation in the README.md file for the Docker build process.

37060cf1b1507fd240604f85aa996c44bb224b0c authored almost 9 years ago by Maxwell Friederichs <[email protected]>

Adding a Dockerfile for automated app builds.

Implements pokeapi/issues#37

0d95145bfb92177dcccae225ce00fae28c6114fa authored almost 9 years ago by Maxwell Friederichs <[email protected]>

Merge pull request #111 from zaneadix/flavor-texts

Flavor texts

ea5d443631e7947cf3b82523309b50df785840fe authored almost 9 years ago by Paul Hallett <[email protected]>

Merge pull request #110 from zaneadix/sprites

sprites for v2-images

42b2177a4317d9637f0d265b45d1da32748e4fb1 authored almost 9 years ago by Zane Adickes <[email protected]>

sprites for v2-images

552ae130d18714e543acef5809683e3b8749682c authored almost 9 years ago by Zane Adickes <[email protected]>

Merge branch 'v2-images' into flavor-texts

421a87fdc45c6671c89138e4c1d1a79368a13d5b authored almost 9 years ago by Zane Adickes <[email protected]>

Merge pull request #104 from zaneadix/v2-images

V2 images

69a492231ba9e63a7a4a3cb317c0741d7549bd7b authored almost 9 years ago by Zane Adickes <[email protected]>

clean merge

77c69889e17b2b26a5e17735900a911cb3e653c1 authored almost 9 years ago by Zane Adickes <[email protected]>

pokemon flavor texts now available

a16e6418e575fa7833557ca5ed672cd4243b3728 authored almost 9 years ago by Zane Adickes <[email protected]>

Merge pull request #79 from zaneadix/New-Data

updated data with all of latest veekun updates

c9661531b08a5e377522efe9bc925f6bd2a00f26 authored almost 9 years ago by Paul Hallett <[email protected]>

Merge pull request #88 from SiMylo/master

Fixing Issue #85 (Duplicated Move Data)

12640795ffda714ef0d3e4f40983578fcef13155 authored almost 9 years ago by Zane Adickes <[email protected]>

remove images for now

08c4e351e224c00d78a4c83e573976eec9c1f608 authored almost 9 years ago by Zane Adickes <[email protected]>

Merge pull request #100 from PoroCYon/master

Fixed more typos in the docs

3c6f33a50f139fa17c0801ea77f88e6dd1ebfc1d authored almost 9 years ago by Paul Hallett <[email protected]>

forgot to uncomment some things

791d6853d6dc4285889995ecd1ac3b8b5afcbcda authored almost 9 years ago by Zane Adickes <[email protected]>

images implemented for pokmon, pokemon forms and items

ec58b954782aaccf9d7434825d3c4f5113cd6423 authored almost 9 years ago by Zane Adickes <[email protected]>

Merge pull request #101 from TheTommyTwitch/master

pokedex promise, the first v2 wrapper is done!

f3b82954c085bfbef7b979f96efb1b1ce9113fd4 authored almost 9 years ago by Paul Hallett <[email protected]>

pokedex promise, the first v2 wrapper is done

81963fee23b4c2a2124c1cd10ae9975b57d64d1f authored almost 9 years ago by Thomas Asadurian <[email protected]>

merge with phalt

fdcfae9c5c283f5085fa349ef5cf5da8cf9c9bb9 authored almost 9 years ago by Zane Adickes <[email protected]>

Fixed type info in the docs

1f57a689643318af39b096cd79820ef2fafdcce2 authored almost 9 years ago by PoroCYon <[email protected]>

Fixed more typos in the docs

e54370aa25970e40ff3a7bd5464e000ff3404289 authored almost 9 years ago by PoroCYon <[email protected]>

Merge pull request #98 from bdchauvette/master

Fix leftover merge conflict from stash

f0595fcbe9fc87b54068b808c2ae9b16874c573f authored almost 9 years ago by Paul Hallett <[email protected]>

Merge pull request #99 from PoroCYon/master

Fixed typos in README (fixes #97)

bf47d012e1c43911487755a4dfd8612a27d95540 authored almost 9 years ago by Paul Hallett <[email protected]>

Merge pull request #1 from PoroCYon/PoroCYon-doc-typo-fix

-oops, ignore this derp-

56566c035d2ce8235c22756e07b165e0d2a87327 authored almost 9 years ago by PoroCYon <[email protected]>

Fixed typos in README (fixes #97)

I've left `pokédexes` as it is.

5587ebd9acfd7d8dc31aab1ee7343df4112f29ee authored almost 9 years ago by PoroCYon <[email protected]>

Fix leftover merge conflict from stash

84b8e7c2562cb9753ce83c6039e765116c3578b5 authored almost 9 years ago by Ben Chauvette <[email protected]>

adding some images

396bbd45aeb7ade44b940188c89856fcf71fab9b authored almost 9 years ago by Zane Adickes <[email protected]>

get started

399643aa87a85d135a9bdd5a63404ac121fc5bae authored almost 9 years ago by Zane Adickes <[email protected]>

Merge pull request #2 from SiMylo/dev

Using PEP 0008 as Guide

a080077b2cbd50079dc859bac485f6dd21e3ba8a authored almost 9 years ago by SiMylo <[email protected]>

Using PEP 0008 as Guide

Attempting to incorporate the style guide linked by phalt. Should have
no functional changes, b...

cba1cbe2927cd44eae15e852f4eff0a64364b532 authored almost 9 years ago by SiMylo <[email protected]>

Merge pull request #1 from SiMylo/dev

Shorten Line Lengths

17d4197214af2541d14e5f7dabe0174f7ac08224 authored almost 9 years ago by SiMylo <[email protected]>

Shorten Line Lengths

Refactoring a little so the line lengths will be shorter?

b08392cd3e26e6f352b9a3909fa1d26216016068 authored almost 9 years ago by SiMylo <[email protected]>

Fixing Issue #85 (Duplicated Move Data)

Contains a fix and testing for the following issue:

I found that we are sometimes sending multi...

58a7b287f4bf12f743894d887d0f4b140dcb7714 authored almost 9 years ago by SiMylo <[email protected]>

Update migrations to allow correct upgrade path

29583e8461131a7c6b9a8272d32ca338591bb66d authored almost 9 years ago by root <root@pokeapi-v2.(none)>

Merge pull request #81 from zaneadix/new-ui

New ui

1b59324630c1ce2c56a97c1f8c80da932d6bcf7d authored almost 9 years ago by Paul Hallett <[email protected]>

had a stash mistake on the last push. this should be a complete push

d6ca4a3f605f37a3a269a8089fddab6897e3d121 authored almost 9 years ago by Zane Adickes <[email protected]>

Merge branch 'new-ui' of https://github.com/zaneadix/pokeapi into new-ui

6dba85c32ad231c3b12939211d0840fd904be55a authored almost 9 years ago by Zane Adickes <[email protected]>

didnt mean to addd this image

572c7eee1d37f05975c9cccb0eb71ddce114fc2c authored almost 9 years ago by Zane Adickes <[email protected]>

delete pikachu image

d5d64576f1793f82fe951900ba5b3f1f7f7f5a1a authored almost 9 years ago by Zane Adickes <[email protected]>

reorganiztion and clean up.

91e84b7079b517d84cd5a6ee6a3a1fc14cec6eda authored almost 9 years ago by Zane Adickes <[email protected]>

need to figure out v2 side nav

734fe626c41b8722e6f98797c76c815eddfd399c authored almost 9 years ago by Zane Adickes <[email protected]>

still need to re-organize v2 docs and work on doc navigation

b1302233aaff3cc489608847da2a9bc220bcf8d0 authored almost 9 years ago by Zane Adickes <[email protected]>

ui using django templates

66370dad445cb35747aa68930948da7070d41614 authored almost 9 years ago by Zane Adickes <[email protected]>

oh well nevermind

90a0066f332b0271bcf4d4ba280329b158fc8575 authored almost 9 years ago by Zane Adickes <[email protected]>

cleanup. navigation between version uis

f9e528dd38da2f20be499665c2fee5c746c4338e authored almost 9 years ago by Zane Adickes <[email protected]>

home page try it out. contributors. started docs.

00408c89e21af7609662d1027f49294a184f8f1f authored almost 9 years ago by Zane Adickes <[email protected]>

Merge pull request #78 from zaneadix/scrub-str

remove templating from strings when building database

35114a5c9a72ed1fd5bef0381178dc8ce638b0a6 authored almost 9 years ago by Paul Hallett <[email protected]>

new ui code in angular

0fda377b8c42d988e39476c1a45b9e86973a038f authored almost 9 years ago by Zane Adickes <[email protected]>

updated data with all of latest veekun updates

d0909e1cc31b4bc0ff8af669254bd3ff6308108d authored almost 9 years ago by Zane Adickes <[email protected]>

remove templating from strings when building database

1f41e3c17f2e12d6cf8f9c06e62c53f7d4e1a6c9 authored almost 9 years ago by Adickes <[email protected]>

Merge pull request #73 from zaneadix/docs

Docs

2c33493741224c07234cea52c84bfad6ef01ea77 authored about 9 years ago by Zane Adickes <[email protected]>

identify a few arrays

0828ffd84ccbbd7367e57a32a5ddb098f6a0b008 authored about 9 years ago by Adickes <[email protected]>

small whoops again

e83363cd676e0446fe64ab39430d910513aed80b authored about 9 years ago by Adickes <[email protected]>

small whoops

adf94814f946b5470c49602c67374d7397ac3c7f authored about 9 years ago by Adickes <[email protected]>

added aditional get methods for each resource and corrected a few things

b4f5680b424dac7de6b996cf25ec10d894b3b26f authored about 9 years ago by Adickes <[email protected]>

added aditional get methods for each resource and corrected a few things

7d25324ac00f21d9956681f81805bef5b3041045 authored about 9 years ago by Adickes <[email protected]>

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. E...

aaa9f756cc3c879cac2fc8f6882a3ae712d375be authored about 9 years ago by Zane Adickes <[email protected]>

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 the...

58645bdff9a6e089b5ffe9dde0346ba33f1e43f6 authored about 9 years ago by nimaje <[email protected]>

avoid starimports

don't use starimports so don't use them in examples

33ae7a60732d515d02795a13b86093040a4cab9a authored about 9 years ago by nimaje <[email protected]>

Merge pull request #2 from zaneadix/improved-build

a few doc changes

a94e95f34b2ff8e3b126c83ad1264298cb381445 authored about 9 years ago by nimaje <[email protected]>

a few doc changes

b58a5b76c31002950ac472f4e14faf6ba8be8a69 authored about 9 years ago by Adickes <[email protected]>

Merge pull request #1 from cstrachan88/patch-1

Update v2 build.py

b5981d70fff9656f1a9e76903f13ac38b08924dc authored about 9 years ago by nimaje <[email protected]>

Update build.py - remove duplicate data load

I noticed that there was a duplicate PokemonGameIndex import in the original build.py for the v2...

41662657a185a296d3dfa917a5cab83d1e453fa3 authored about 9 years ago by Courtney Strachan <[email protected]>

updated README for the new useage of the v2 build script

6dec6e0dd44461e6c48a87756831e69436a52679 authored about 9 years ago by Benjamin Takacs <[email protected]>

renamed `prozess_csv` to `process_csv`

35240b3ae5394b2a0de1753cd8303fb4f3ce4f0f authored about 9 years ago by Benjamin Takacs <[email protected]>

One function for each group of models¬

NOT TESTED YET! Buildscript has not finished yet (needed about 18h until now).

Made `data/v2/__...

5e5854fb7b196c96336e00ca8331ecb1ef7bd7c9 authored about 9 years ago by Benjamin Takacs <[email protected]>

scrub out some unnecessary changes

714aa0b34d67bda36c09f4ab5f32612b71c39c4d authored about 9 years ago by Adickes <[email protected]>

fixed a bunch of links

c454c3d2a030053aa4719c970efe1d84f41a686d authored about 9 years ago by Adickes <[email protected]>

probably finalized docs

758bdbf877d61fb435db98b3c61894ee42bfaa22 authored about 9 years ago by Adickes <[email protected]>

adding a few more json examples

b5364be71b2cb156848a245826d5f8aa9f93884e authored about 9 years ago by Adickes <[email protected]>

adding json examples

6422ee2411518aa7542ab0a66e9d0ab8c6dbca5c authored about 9 years ago by Adickes <[email protected]>

test nav table

a3c2c17701b2001ef53c75938f0a6f28530354ef authored about 9 years ago by Adickes <[email protected]>

test nav again

f1b0c9ecbce174e36b36b2066de1a4914b0efe61 authored about 9 years ago by Adickes <[email protected]>

test nav

c4761152c0fc6f4e47abfc35bf6e890e6d4b5ea8 authored about 9 years ago by Adickes <[email protected]>