Connor Turland
|
14dfe3c926
|
styling for doorkeeper and api functional
|
2016-03-24 17:16:27 -07:00 |
|
Connor Turland
|
c4890274f2
|
switch messages to use pundit
|
2016-03-23 16:29:26 -07:00 |
|
Connor Turland
|
1ee33b843f
|
Merge branch 'develop' into feature/realtime.video
|
2016-03-14 21:40:25 +11:00 |
|
Connor Turland
|
8bd032472d
|
topic related things weren't working at all
|
2016-03-14 21:36:34 +11:00 |
|
Connor Turland
|
604087c592
|
Merge branch 'develop' into feature/realtime.video
|
2016-03-14 10:45:16 +11:00 |
|
Connor Turland
|
11e57c1b37
|
rebase onto develop which now has API and pundit
|
2016-03-13 10:36:38 +11:00 |
|
Connor Turland
|
efe13dc7c0
|
Merge branch 'develop' into feature/api
|
2016-03-12 21:30:27 +11:00 |
|
Connor Turland
|
f58185fd40
|
Merge branch 'feature/pundit' into develop
|
2016-03-12 21:26:06 +11:00 |
|
Connor Turland
|
446619c451
|
omg not having this was breaking things
|
2016-03-12 13:20:15 +11:00 |
|
Connor Turland
|
8b8db40c67
|
Merge branch 'feature/pundit' into feature/api
|
2016-03-12 12:59:42 +11:00 |
|
Connor Turland
|
a295c61322
|
json response was broken
|
2016-03-12 12:58:13 +11:00 |
|
Connor Turland
|
e4ac5b0134
|
Merge branch 'feature/pundit' into feature/api
|
2016-03-12 12:40:11 +11:00 |
|
Connor Turland
|
bf4fbbeb06
|
fix tokens
|
2016-03-12 12:26:23 +11:00 |
|
Devin Howard
|
bb03b49d80
|
update main controller (searching) to use policies
|
2016-03-12 09:09:41 +08:00 |
|
Connor Turland
|
521aa6b5d0
|
function no longer exists
|
2016-03-12 11:58:26 +11:00 |
|
Connor Turland
|
a78312f90c
|
Merge branch 'feature/pundit' into feature/api.pundit
|
2016-03-12 11:49:41 +11:00 |
|
Connor Turland
|
d0aecc0b31
|
pundit: make it work
|
2016-03-12 11:47:24 +11:00 |
|
Connor Turland
|
dc6ccd2022
|
pundit: fixing up topics and synapses
|
2016-03-12 11:47:05 +11:00 |
|
Connor Turland
|
1cf3182e75
|
pundit: exclude topic action
|
2016-03-12 11:46:52 +11:00 |
|
Connor Turland
|
5f3f5212c5
|
pundit: syntax error
|
2016-03-12 11:46:18 +11:00 |
|
Connor Turland
|
d8c328468e
|
changess for pundit
|
2016-03-12 11:45:39 +11:00 |
|
Connor Turland
|
cb79f2deae
|
pundit: make it work
|
2016-03-12 11:16:46 +11:00 |
|
Connor Turland
|
bef21341c6
|
pundit: fixing up topics and synapses
|
2016-03-12 11:10:30 +11:00 |
|
Connor Turland
|
09a7b336bf
|
pundit: exclude topic action
|
2016-03-12 10:13:22 +11:00 |
|
Connor Turland
|
0095a8daf4
|
pundit: syntax error
|
2016-03-12 10:06:00 +11:00 |
|
Connor Turland
|
fc1a7fd23d
|
api: adjust serializers
|
2016-03-12 10:05:42 +11:00 |
|
Connor Turland
|
450db5eb8d
|
changes for pundit
|
2016-03-12 09:37:32 +11:00 |
|
Connor Turland
|
669b337d04
|
changes for api
|
2016-03-12 09:37:18 +11:00 |
|
Connor Turland
|
e6017c4129
|
Merge remote-tracking branch 'origin/feature/pundit' into feature/api.pundit
|
2016-03-12 07:19:19 +11:00 |
|
Devin Howard
|
eb56755068
|
implement five policies into their controllers
|
2016-03-11 22:10:31 +08:00 |
|
Devin Howard
|
7395811ba5
|
handle unauthorized with baaaaad 403
|
2016-03-11 21:35:48 +08: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 |
|
Connor Turland
|
616dc9ed0e
|
messages weren't being displayed in order
|
2016-03-01 12:55:00 +13:00 |
|
Connor Turland
|
c6fea78054
|
merge develop
|
2016-02-29 13:58:47 +13:00 |
|
Devin Howard
|
ef5d85c2bf
|
before_filter => before_action
|
2016-02-28 17:48:35 +08:00 |
|
Devin Howard
|
36c5ddab1f
|
before_filter => before_action
|
2016-02-28 17:48:18 +08:00 |
|
Devin Howard
|
895b872bda
|
remove unneeded https stuff
|
2016-02-28 17:15:09 +08:00 |
|
Devin Howard
|
25774d9f16
|
remove unneeded https stuff
|
2016-02-28 16:57:25 +08:00 |
|
Devin Howard
|
cbb6b648be
|
implement main_policy (headless). also remove all @current references
|
2016-02-28 16:53:59 +08:00 |
|
Devin Howard
|
bc7db85c8c
|
update map index views
|
2016-02-28 13:14:34 +08:00 |
|
Devin Howard
|
8ef847bd6d
|
factor maps#index into 4 separate functions
|
2016-02-28 12:30:41 +08:00 |
|
Devin Howard
|
66f1d2ec0b
|
install pundit
|
2016-02-28 12:30:41 +08:00 |
|
Devin Howard
|
40cd1ebb5c
|
modify metacodes to instead have two fields, and validate that only one is present. Manual icons can be entered through rake tasks or on the rails console or in db seed
|
2016-02-25 14:49:48 +08:00 |
|
Devin Howard
|
40a833b069
|
Merge pull request #473 from metamaps/feature/fix-invite-link
fix get_invite_link function. fixes #471
|
2016-02-21 15:22:34 +08:00 |
|
Devin Howard
|
e629a9bf71
|
fix get_invite_link function. fixes #471
|
2016-02-19 18:09:46 +08:00 |
|
Devin Howard
|
7b9c6459e3
|
allow embedding
|
2016-02-19 09:23:39 +08:00 |
|
Devin Howard
|
056ef2b5b6
|
smoother synapse creation with clicks/tabs
|
2016-02-14 15:19:35 +08:00 |
|
Devin Howard
|
6d0dcec1ba
|
mess with metacode tests
|
2016-02-09 12:43:34 +08:00 |
|
Devin Howard
|
43bdda61de
|
maps controller spec passes, 3 pending
|
2016-02-09 11:48:07 +08:00 |
|