Zane Adickes
bd508937ae
Additional Data
...
Filling out remaining data so Models have complete associations.
Data and models added for:
Pokemon
Moves
Pal Park
Berries
Regions
Pokeathlon
Contests
SuperContests
Items
Encounters
Locations
2015-04-20 23:38:33 -04:00
Zane Adickes
49926dc026
Completed Models/Build Script
...
-Added models for Pokemon, Moves, and all other remaining models.
-Added new models to build script
-Build script will now clean and reset auto-incrementers for each table
in pokeapi_co_db
-Build script now runs against both postgres and sqlite (dev)
-Added all models to admin site registry
-Added instructions for building out db in README
2015-04-20 23:31:59 -04:00
Zane Adickes
5ad1cb0ea5
Revert "Pokemon/Move Models"
...
This reverts commit 1882c47f90
2015-04-20 21:46:34 -04:00
Zane Adickes
5e9296f948
Revert "Added Remaining Data and Models"
...
This reverts commit b069ee991b
2015-04-20 21:43:55 -04:00
Zane Adickes
87b53aadbf
Revert b069ee9..28035e5
...
This rolls back to commit b069ee991b
2015-04-20 21:43:18 -04:00
Zane Adickes
28035e5aeb
Merge remote-tracking branch 'origin/master'
...
Conflicts:
data/v2/build.py
2015-04-19 22:26:20 -04:00
Zane Adickes
b069ee991b
Added Remaining Data and Models
...
Data and models added for:
Pal Park
Berries
Regions
Pokeathlon
Contests
SuperContests
Items
Encounters
Locations
2015-04-19 22:24:14 -04:00
Zane Adickes
35f4fa5889
unnecessary 'replaces' array
2015-04-12 22:54:35 -04:00
Zane Adickes
4890407482
Just adding instructions
...
really complicated things
2015-04-12 22:48:28 -04:00
Zane Adickes
1882c47f90
Pokemon/Move Models
...
-Added models for Pokemon, Moves, and all other remaining models.
-Added new models to build script
-Build script will now clean and reset auto-incrementers for each table
in pokeapi_co_db
-Build script now runs against both postgres and sqlite (dev)
-Some v2 cvs files had no data in them. Pulled in the data from veekun
where necessary.
-Added all models to admin site registry
-Added instructions for building out db in README
2015-04-12 22:29:36 -04:00
phalt
0a9fde247d
More serializers
2015-04-11 11:16:04 +01:00
phalt
edcba6a101
update for new models
2015-04-11 11:12:38 +01:00
phalt
ba049cc936
Merge branch 'master' into rest-framework
...
Conflicts:
config/settings.py
pokemon_v2/admin.py
pokemon_v2/models.py
2015-04-11 11:05:59 +01:00
Paul Hallett
278f241119
Merge pull request #33 from zaneadix/master
...
Base Model Implementations
2015-04-11 11:00:42 +01:00
Zane Adickes
b6b6ff0938
Move Models
...
Created models for all move related models and added build steps for
each
2015-04-09 00:45:23 -04:00
unknown
5d5914fb2e
Missed the migrations
2015-04-08 10:25:59 -04:00
unknown
42ff3af715
Squashed migrations and cleaned up config/settings
2015-04-08 09:57:29 -04:00
Zane Adickes
fc4fe24270
More of the same for now
2015-04-07 08:14:31 -04:00
Zane Adickes
be211d7f39
Some Migration?
...
I dunno. Git is telling me this changed but I don’t think it did.
2015-04-06 00:30:23 -04:00
Zane Adickes
9a255298fc
More Models
...
Whole bunch of modelin’ goin’ on around here
2015-04-06 00:27:59 -04:00
Paul Hallett
cac94aaba5
Merge pull request #32 from TheIronDeveloper/node-wrapper
...
Adding a node-wrapper to the /docs pages
2015-04-05 11:15:11 +01:00
Tyler Stark
a7bca542e9
Adding a node-wrapper to the /docs pages
...
Updating the docs page to include a node wrapper that I made.
2015-04-04 13:01:55 -07:00
Paul Hallett
43d68a9f23
Merge pull request #30 from TheIronDeveloper/updateDocs
...
Updating Documentation
2015-04-04 20:07:39 +01:00
Tyler Stark
e983c14d93
Updating Documentation
...
Updating documentation to more accurately describe the descriptions
field.
This PR:
* changed `descriptions/1/` to `descriptions/2`
* Updated the response to match what `descriptions/2` provides
Please see https://github.com/phalt/pokeapi/issues/29 for more details
2015-04-04 11:41:44 -07:00
Zane Adickes
d9720665b8
more ability stuff
2015-04-03 08:03:02 -04:00
Zane Adickes
7a7c2d9737
ability stuff
2015-04-02 08:21:39 -04:00
Zane Adickes
9938788abb
playing the fiddle
...
indulging my desire to help
2015-03-30 21:02:29 -04:00
Paul Hallett
f1448020a3
Merge pull request #26 from vamsivarikuti/sidebar
...
fixed #5 sidebar from scrolling off the screen
2015-03-29 11:25:36 +01:00
Paul Hallett
5818918622
Progress - sprite resource implemented and testing
2015-03-11 20:07:30 +00:00
Vamsi V
ed400f363a
fixed sidebar scrolling off the screen
2015-02-27 15:31:52 +05:30
root
f9abad1722
live server update
2015-02-22 17:26:45 +00:00
phalt
9adcec8eac
inital rest_framework progress
2015-02-22 17:11:40 +00:00
phalt
7555ad779d
update some copy stuff
2015-02-22 13:06:29 +00:00
phalt
dbc7895934
remove xml for now
2014-12-15 10:13:52 +00:00
phalt
3b38fe9aeb
Merge branch 'theoperatore-cors-headers-api'
2014-12-15 10:04:14 +00:00
phalt
5e1432a677
fix conflicts
2014-12-15 10:03:41 +00:00
phalt
456c77f55e
Merge branch 'master' of github.com:phalt/pokeapi
2014-12-15 10:01:58 +00:00
phalt
8a880fe60d
changed pokemon_v1 to pokemon backwards compat
2014-12-15 10:01:53 +00:00
Paul Hallett
36ded07c24
Merge pull request #21 from Opalo/master
...
Updated settings.py to support xml and json response formats.
2014-12-13 11:07:48 +00:00
Opalo
d52c10875e
Update settings.py
...
Added 'xml' to 'TASTYPIE_DEFAULT_FORMATS' as in http://django-tastypie.readthedocs.org/en/latest/settings.html
2014-12-10 20:45:10 +01:00
Alex Petersen
e3433a4244
change origin on tests
2014-12-07 11:56:21 -05:00
Alex Petersen
f515394451
new lines in tests
2014-12-07 11:38:15 -05:00
Alex Petersen
ec50da1dcb
updated as per pull request#19
2014-12-07 11:32:09 -05:00
Alex Petersen
3337817bf9
added CORS middleware with basic installation / tests for v1 & v2 apis
2014-12-06 17:57:42 -05:00
phalt
42d70ce599
code
2014-12-05 12:32:36 +00:00
phalt
7b0c782758
add contributing details
2014-12-05 12:31:49 +00:00
phalt
7708d42aa3
add blog url
2014-12-05 12:20:17 +00:00
phalt
ab3276ecd1
explain myself
2014-12-04 19:55:38 +00:00
phalt
b152dc9902
README changes
2014-12-04 12:11:57 +00:00
phalt
21a1d4bf46
initial commit
2014-12-04 11:11:46 +00:00
