Commit graph

6 commits

Author SHA1 Message Date
jakedt
c93c62600d Merge remote-tracking branch 'origin/master' into swaggerlikeus
Conflicts:
	data/database.py
	endpoints/api.py
	endpoints/common.py
	templates/base.html
	test/data/test.db
	test/specs.py
2014-03-19 15:39:44 -04:00
jakedt
3b3d71bfd7 Feed error messages through a cors wrapper so that people on other domains can see what's happening. 2014-03-17 16:57:35 -04:00
jakedt
ddf5f2053c Convert old style jsonschema required params to new style. 2014-03-17 12:25:41 -04:00
jakedt
e4e4f8c553 Migrate teams and orgs. 2014-03-14 14:20:51 -04:00
jakedt
ae6bfb072d Fix some documentation. 2014-03-14 13:24:55 -04:00
jakedt
cd276773ff Port over tokens. 2014-03-14 13:24:01 -04:00