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

1607 commits

This branch
This branch
All branches
Author SHA1 Message Date
Charles Marttinen
ee96433e6d chore: Update Django to 1.9 2018-10-20 11:35:11 -04:00
Charles Marttinen
6663813dc2 fix: Add LocationArea back to REST API 
LocationArea is a special case that was missed when getting rid of the
hit counter.
 2018-10-18 23:18:36 -04:00
Charles Marttinen
d25b66662e chore: Remove API v1 2018-10-18 23:18:36 -04:00
Charles Marttinen
76c2b58e4e fix: Remove old website and associated code 
The pokeapi.co website has been rebuilt and moved to a separate
project, so the website in this project is obsolete.

This removes all files and code related to the website, including the
'alerts' and 'hits' apps (which managed website alerts and the hit
counter) and unused site assets (CSS, JS, images).
 2018-10-18 23:18:36 -04:00
Charles Marttinen
d8483e9a67 fix: Remove unused apps from settings 2018-10-18 23:18:36 -04:00
Sargun Vohra
b436fdbc83 Update version of psycopg2 
Versions below 2.7 no longer work on recent version of Ubuntu.
See https://github.com/psycopg/psycopg2/issues/594.
 2018-09-16 03:27:33 -07:00
Tim Malone
db8fdcfd60 chore - add missing lint step in CircleCI 2.0 config 2018-09-10 09:41:51 +10:00
Mark Tse
cbfd195e8b chore - migrate to CircleCI 2.0; resolves #359. 2018-09-10 09:41:51 +10:00
Charles Marttinen
2cb886eee3 Implement suggested naming changes 2018-09-10 06:25:02 +10:00
Charles Marttinen
8ef1a9b931 Update README with changes made to DB build script 2018-09-10 06:25:02 +10:00
Charles Marttinen
9d4f893a69 Improve performance of database build script 
The remainder of the build script has been converted to use
`bulk_create()`. Running the build script on my machine with a
PostgresQL database took only 5 minutes 40 seconds, and with
SQLite 26 minutes 18 seconds.
 2018-09-10 06:25:02 +10:00
Charles Marttinen
def70662f1 Modify database build script to use bulk_create (WIP) 2018-09-10 06:25:02 +10:00
Alessandro Pezzè
6cac759270
Merge pull request #341 from cmmartti/windows_build_script 
Fix v2 database build script to work on Windows
 2018-06-04 13:33:49 +02:00
Alessandro Pezzè
fae52a460b
Merge pull request #340 from lmerotta/patch-2 
New PHP Wrapper, with lazy-loading and POPOs
 2018-06-04 13:31:26 +02:00
lmerotta
852feaa3e5
Added lmerotta/phpokeapi to the offical wrappers 2018-06-03 23:21:44 +02:00
Charles Marttinen
b12d8576d9 Fix v2 database build script to work on Windows 
Image sprite paths should be Unix-style, but the build script used the
OS default, so the process failed on Windows.
 2018-06-02 19:29:18 -04:00
lmerotta
84e1696369
New PHP Wrapper, with lazy-loading and POPOs 2018-06-02 01:02:32 +02:00
Paul Hallett
6bccfd315c Update about.html 2017-10-22 12:25:09 +00:00
root
6a5644b197 Put back requirements to not break the server 2017-10-22 12:18:57 +00:00
Alessandro Pezzè
9203a0d286 Sun and moon data (#305) 
* badges

* Added CSV from Veekun

* added sprites from Veekun website

* quick fixes for an Exception

* bumped dependencies version

* add comment on how to upgrade to Django 1.11

* added some reminds to caching, our official wrappers and the true cost of the server

* remove index.html from sprites

* update to conform django-rest-framework 3.3.0 guidelines

* lint
 2017-10-21 13:21:23 +00:00
Kronopt
b429bae218 Removed modified/created mention from the docs (#309) 
Discussed in #140
 2017-10-19 09:23:47 +01:00
Paul Hallett
0f4619f3f1 Create CODE_OF_CONDUCT.md (#296) 2017-06-20 11:44:05 +01:00
Greg Hilmes
828d856ba1 Added link to v2docs for a Python wrapper. (#286) 2017-06-19 10:11:12 +01:00
Xavier Damman
b7175f7226 Activating Open Collective (#295) 
* Added CONTRIBUTING.md (optional)

* Added backers and sponsors on the README

* Added call to donate after npm install (optional)

* Reusing contribute text from readme
 2017-06-19 10:10:34 +01:00
didii
1001ebac1b Consistency and URL fix (#260) 2016-09-23 11:29:54 +01:00
Marcus Crane
8ce2bedf06 Rewording, typos and what not (#266) 
* Fixed a few typos, did a wee bit of reworking and fixed/edited some links

* Changed stripe image to use https in order to avoid mixed content requests

* Small rewordings and typo fixed

* Fixed my own typo ;)
 2016-09-12 11:28:42 +01:00
Alessandro Pezzè
a50a65676e badges (#261) 2016-08-25 14:22:18 +01:00
xbony2
042fd74d71 Grammar/spelling fixes (#258) 
* Update home.html

* Update README.md
 2016-08-14 18:04:24 +01:00
Paul Hallett
404f23abd1 Change URL from PokéAPI to gh for sprites (#257) 2016-08-13 18:35:42 +01:00
Paul Hallett
01c36b9a72 Fair use (#255) 
* Update requirements

* Add fair use policy
 2016-08-13 08:59:52 +01:00
Paul Hallett
daa567d218 Update requirements (#254) 2016-08-13 08:58:28 +01:00
Paul Hallett
85dd999396 Add alerts model and UI (#252) 2016-08-13 08:24:56 +01:00
Alessandro Pezzè
a706bfbd9a Nginx 4cpu configuration (#240) 
* Better performance teaks

* moved declarations

* cache api endpoint instead of .json files
 2016-08-12 14:49:57 +01:00
Paul Hallett
7e78458e37 Add digital ocean sponsorship stuff (#239) 2016-07-21 12:13:09 +02:00
Dan Rovito
eb10bbe232 Added PokePHP link to the v2 documentation (#238) 2016-07-17 16:13:30 -04:00
Ricky Elrod
f06b80e6c4 level_learned_at is an integer, not a string (#231) 
Signed-off-by: Ricky Elrod <ricky@elrod.me>
 2016-07-11 09:18:06 +01:00
Ricky Elrod
3b3cdca4c2 pokemon types are a NamedAPIResource (#232) 
Signed-off-by: Ricky Elrod <ricky@elrod.me>
 2016-07-11 09:17:59 +01:00
Ricky Elrod
3ee1d3db00 Type[pokemon] returns a list of TypePokemon (#233) 
Signed-off-by: Ricky Elrod <ricky@elrod.me>
 2016-07-11 09:17:48 +01:00
Ricky Elrod
6712d3b362 Be consistent in use of parens for list type parameter (#229) 
Signed-off-by: Ricky Elrod <ricky@elrod.me>
 2016-07-10 13:01:43 -04:00
Ricky Elrod
64457ba31b Fix duplicated model name in docsv2 document (#228) 
* Fix duplicated model name

Signed-off-by: Ricky Elrod <ricky@elrod.me>

* fix varieties link

Signed-off-by: Ricky Elrod <ricky@elrod.me>
 2016-07-10 13:01:21 -04:00
Sargun Vohra
779951bff2 Update docsv2.md (#226) 
close #225
 2016-07-10 10:32:24 -04:00
Ricky Elrod
1bfd81e10e Fix field name in docsv2 documentation (#227) 2016-07-10 15:17:51 +01:00
Alexandre Boucey
d771c293df Added Docker Compose support for production (#183) 
* Added Docker Compose support for production

* Added rate limiting to nginx
 2016-07-07 13:23:59 +01:00
Paul Hallett
c4b2d52682 Add throttle settings (#223) 
* Add throttle settings

Proposed API rate limit throttling. This should work directly with redis.

* Update settings.py
 2016-07-06 14:04:09 +01:00
Sargun Vohra
05464a2c6d Add missing field in pokemon species docs (#221) 2016-07-05 09:45:46 +01:00
sentwistler
28bd7ccd67 move flavor texts now available (#220) 
* move flavor texts now available

* fix failed lints

* add documentation for move flavor text field
 2016-07-05 09:42:03 +01:00
Peter Jeschke
4803d224ed Fix wrong heights (#219) 
See here: b5e4038f2d
Original commit by AxeBane
 2016-06-28 11:27:28 +01:00
Sargun Vohra
d6ae95c617 Redo PokemonEncounterView (#212) 
* redo PokemonEncounterView (fix #210)
 2016-06-25 13:33:52 -04:00
Sargun Vohra
cf19dcca29 Pokemon form names (#213) 
* added names and form names to the pokemon-form resource

* document pokemon form names

* close #185
 2016-06-25 12:56:24 -04:00
Sargun Vohra
f8c641716e Link moves to machines (#211) 
* add Machines resource to link TM/HM items to moves

* document new Machines resource

* fix #198
 2016-06-25 12:45:20 -04:00