Connor Turland
|
77d39d6649
|
redid so they won't interfere
|
2016-03-12 09:48:07 +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 |
|
|
Devin Howard
|
73b82801cc
|
consistent permissions
|
2016-03-11 21:32:18 +08:00 |
|
|
Devin Howard
|
615eaf580e
|
mapping policy
|
2016-03-11 21:30:54 +08:00 |
|
|
Devin Howard
|
d8cc588efb
|
basics of admin_override policy function
|
2016-03-11 21:25:24 +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
|
ef60aefe88
|
fix js bug
|
2016-03-11 07:59:22 +11:00 |
|
|
Connor Turland
|
616dc9ed0e
|
messages weren't being displayed in order
|
2016-03-01 12:55:00 +13:00 |
|
|
Connor Turland
|
26025d6ee9
|
store the right number of mappers in conversation
|
2016-03-01 12:30:49 +13:00 |
|
|
Connor Turland
|
dd457d8362
|
remove npm debug
|
2016-03-01 12:26:09 +13:00 |
|
|
Connor Turland
|
bd5c88fb0b
|
display initial state of call to new mapper
|
2016-03-01 12:25:38 +13:00 |
|
|
Devin Howard
|
2e6493fd23
|
Merge pull request #478 from metamaps/feature/cleanup
remove unneeded https stuff & more
|
2016-02-29 16:51:49 +08:00 |
|
|
Connor Turland
|
4e92d4c2c5
|
change video border width
|
2016-02-29 17:05:36 +13:00 |
|
|
Connor Turland
|
d50923b6bd
|
fix js bug
|
2016-02-29 17:05:11 +13:00 |
|
|
Connor Turland
|
c6fea78054
|
merge develop
|
2016-02-29 13:58:47 +13:00 |
|
|
Devin Howard
|
e64a16f1b8
|
main#home view simplify for only unauthenticated users
|
2016-02-28 18:55:48 +08: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
|
155eac41d8
|
@ symbols unneeded
|
2016-02-28 17:24:00 +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
|
3ed6ffbdba
|
@record/@user in topic/synapse policy
|
2016-02-28 13:29:33 +08:00 |
|
|
Devin Howard
|
1e01ff8bc9
|
map policy
|
2016-02-28 13:28:28 +08:00 |
|
|
Devin Howard
|
cec6d3bfcd
|
handle pundit errors with http 403
|
2016-02-28 13:24:55 +08:00 |
|
|
Devin Howard
|
bc7db85c8c
|
update map index views
|
2016-02-28 13:14:34 +08:00 |
|
|
Devin Howard
|
bbc36de628
|
update maps spec
|
2016-02-28 12:30:41 +08:00 |
|
|
Devin Howard
|
8ef847bd6d
|
factor maps#index into 4 separate functions
|
2016-02-28 12:30:41 +08:00 |
|
|
Devin Howard
|
baca4aac83
|
synapse policy
|
2016-02-28 12:30:41 +08:00 |
|
|
Devin Howard
|
52facb9c1d
|
topic policy
|
2016-02-28 12:30:41 +08:00 |
|
|
Devin Howard
|
66f1d2ec0b
|
install pundit
|
2016-02-28 12:30:41 +08:00 |
|
|
Devin Howard
|
8916ff20b6
|
Merge pull request #477 from metamaps/feature/metacode-icon-on-aws
metacode icons on aws (fixes #445)
|
2016-02-28 12:19:00 +08:00 |
|
|
Devin Howard
|
ba1427af45
|
update rspec for metacodes
|
2016-02-26 14:20:14 +08:00 |
|
|
Devin Howard
|
ac1d4f70b6
|
show old image on metacode edit form; tweak css of admin area
|
2016-02-26 14:06:37 +08:00 |
|
|
Connor Turland
|
f9b23499dc
|
styling. add self to participants
|
2016-02-26 12:43:27 +13: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
|
941b37b8e2
|
Merge pull request #476 from metamaps/feature/cleanup
cleanup some TODO items
|
2016-02-24 10:19:45 +08:00 |
|
|
Devin Howard
|
e1b2ddde7d
|
add another TODO...
|
2016-02-23 19:04:39 +08:00 |
|
|
Devin Howard
|
09ceb8ceec
|
move 4 global variables into Metamaps namespace
|
2016-02-23 19:04:30 +08:00 |
|
|
Devin Howard
|
59f84cfe20
|
cleanup TODO lines
|
2016-02-23 18:59:45 +08:00 |
|
|
Devin Howard
|
7a74668c8d
|
tweaks to lightboxes view post-SSL
|
2016-02-23 18:56:50 +08:00 |
|
|
Devin Howard
|
295534e4ab
|
migrate to using aws/paperclip for metacodes. RUN RAKE TASK ON PRODUCTION
|
2016-02-23 14:58:20 +08:00 |
|
|
Devin Howard
|
cb43ebce92
|
Merge pull request #474 from metamaps/feature/fix-synapse-mappings
don't need xloc or yloc for Synapse mappings
|
2016-02-22 12:33:05 +08:00 |
|
|
Devin Howard
|
b385efafa9
|
don't need xloc or yloc for Synapse mappings
|
2016-02-21 17:25:39 +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 |
|