Commit graph

11 commits

Author SHA1 Message Date
Connor Turland
540b35c757 Merge branch 'feature/no-cancancan' into develop 2016-03-24 20:47:35 -07:00
Connor Turland
42eea78bc4 Merge branch 'fix/typo' into develop 2016-03-24 20:47:23 -07:00
Devin Howard
530a16cadb instantiate_resource 2016-03-25 10:26:32 +08:00
Devin Howard
34d3a80db1 use new pundit-enabled snorlax 2016-03-25 10:07:57 +08:00
Connor Turland
14dfe3c926 styling for doorkeeper and api functional 2016-03-24 17:16:27 -07:00
Connor Turland
bf4fbbeb06 fix tokens 2016-03-12 12:26:23 +11:00
Connor Turland
521aa6b5d0 function no longer exists 2016-03-12 11:58:26 +11:00
Connor Turland
fc1a7fd23d api: adjust serializers 2016-03-12 10:05:42 +11:00
Connor Turland
669b337d04 changes for api 2016-03-12 09:37:18 +11:00
Connor Turland
ccfba03fdb clean up duplicate code 2016-03-11 17:26:54 +11:00
Connor Turland
059591b78b first pass at important API endpoints, token auth 2016-03-11 17:16:04 +11:00