Devin Howard
|
0c1e12a301
|
use state machine to implement smarter topic/synapse import
also include better auto-layout of new topics if x/y not specified
|
2016-03-25 16:46:05 +08:00 |
|
|
Devin Howard
|
b47ed7b5b4
|
don't ask about adding 0 topics
|
2016-03-25 16:46:05 +08:00 |
|
|
Devin Howard
|
6df7fa849a
|
bare minimum topic import functionality - use by Ctrl+V onto the map canvas itself
|
2016-03-25 16:46:05 +08:00 |
|
|
Devin Howard
|
6c055ea3b9
|
add missing synapses_csv function (fixes #504)
|
2016-03-25 16:36:05 +08:00 |
|
Connor Turland
|
87d6dfe8de
|
fix the autocomplete
|
2016-03-24 23:36:57 -07:00 |
|
|
Connor Turland
|
b36d5df6cb
|
this may make it work
|
2016-03-24 23:33:26 -07:00 |
|
|
Connor Turland
|
c6f1e3cc4a
|
breaking the mapping_policy
|
2016-03-24 23:29:08 -07:00 |
|
|
Connor Turland
|
fc1dc591f3
|
Merge branch 'copy/version.and.peers' into develop
|
2016-03-24 21:28:24 -07:00 |
|
|
Connor Turland
|
415c9b8ac3
|
final touchups on oauth
|
2016-03-24 21:26:07 -07:00 |
|
|
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
|
b6fac7d49b
|
Merge pull request #420 from metamaps/feature/realtime.video
JUUUUUUUUNTOOOO
|
2016-03-23 17:46:35 -07:00 |
|
|
Connor Turland
|
70bc0959b0
|
update version, date, and peers
|
2016-03-23 16:52:53 -07:00 |
|
|
Connor Turland
|
c4890274f2
|
switch messages to use pundit
|
2016-03-23 16:29:26 -07:00 |
|
|
Connor Turland
|
baa5439f0f
|
auto position videos which haven't been manually positioned
|
2016-03-23 16:12:23 -07:00 |
|
|
Connor Turland
|
617dec72b9
|
hide sound option. green 'in call' dot. tooltip
|
2016-03-21 13:08:34 -07:00 |
|
|
Devin Howard
|
756fe75664
|
call for developers in Inspect Element window
|
2016-03-15 16:06:37 +08:00 |
|
|
Connor Turland
|
1ee33b843f
|
Merge branch 'develop' into feature/realtime.video
|
2016-03-14 21:40:25 +11:00 |
|
|
Connor Turland
|
3e24a088da
|
Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop
|
2016-03-14 21:36:57 +11:00 |
|
|
Connor Turland
|
8bd032472d
|
topic related things weren't working at all
|
2016-03-14 21:36:34 +11:00 |
|
|
Connor Turland
|
f24def8be6
|
fix up javascript errors
|
2016-03-14 21:36:16 +11:00 |
|
|
Devin Howard
|
a05c7dc5fe
|
avoid pundit error if no map specified with a mapping
|
2016-03-14 14:37:01 +08:00 |
|
|
Devin Howard
|
d11f3923dd
|
remove unused has_viewable_synapses function
|
2016-03-14 14:34:36 +08:00 |
|
|
Devin Howard
|
3823c708fd
|
update mapping policy
|
2016-03-14 11:09:27 +08:00 |
|
|
Connor Turland
|
8664cc0bd9
|
Merge branch 'develop' into feature/realtime.video
|
2016-03-14 11:11:11 +11:00 |
|
|
Connor Turland
|
579c36ec75
|
ensure the search box opens
|
2016-03-14 11:10:18 +11:00 |
|
|
Connor Turland
|
6715ba7e7f
|
not a function
|
2016-03-14 11:03:11 +11:00 |
|
|
Connor Turland
|
604087c592
|
Merge branch 'develop' into feature/realtime.video
|
2016-03-14 10:45:16 +11:00 |
|
|
Connor Turland
|
6f5258cbb7
|
needed a policy for tokens
|
2016-03-14 08:19:26 +11:00 |
|
Harlan T Wood
|
3fbb3d1dc9
|
more token entropy
|
2016-03-13 00:56:10 -08:00 |
|
|
Connor Turland
|
72b2e8f8f2
|
doesn't look good for now, take it out, add it later
|
2016-03-13 11:58:09 +11:00 |
|
|
Connor Turland
|
77d69dd2a3
|
turns out we do need delayed_job
|
2016-03-13 11:56:18 +11:00 |
|
|
Connor Turland
|
11e57c1b37
|
rebase onto develop which now has API and pundit
|
2016-03-13 10:36:38 +11:00 |
|
|
Connor Turland
|
b236f4c689
|
handle not logged in scenarios
|
2016-03-13 02:41:32 +11:00 |
|
|
Connor Turland
|
3aec00e07c
|
just don't include mappable for now
|
2016-03-13 02:28:39 +11:00 |
|
|
Connor Turland
|
f072e39c4c
|
pundit: sometimes no user
|
2016-03-13 02:27:05 +11:00 |
|
|
Connor Turland
|
ada29c6832
|
cleanup
|
2016-03-12 21:35:56 +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
|
7f86810f62
|
remove things again not needed
|
2016-03-12 11:53:12 +11:00 |
|
|
Connor Turland
|
a78312f90c
|
Merge branch 'feature/pundit' into feature/api.pundit
|
2016-03-12 11:49:41 +11:00 |
|
|
Connor Turland
|
bc505a1361
|
pundit: now updating maps actually works
|
2016-03-12 11:47:40 +11:00 |
|
|
Connor Turland
|
5d179ae5ec
|
pundit: policy didn't exist
|
2016-03-12 11:47:32 +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
|
bd3afff069
|
pundit: fix queries
|
2016-03-12 11:46:31 +11:00 |
|
|
Connor Turland
|
5f3f5212c5
|
pundit: syntax error
|
2016-03-12 11:46:18 +11:00 |
|
|
Connor Turland
|
2d53922f1c
|
can load maps
|
2016-03-12 11:46:01 +11:00 |
|
|
Connor Turland
|
d8c328468e
|
changess for pundit
|
2016-03-12 11:45:39 +11:00 |
|
|
Connor Turland
|
d0fd676aa0
|
pundit: now updating maps actually works
|
2016-03-12 11:35:03 +11:00 |
|
|
Connor Turland
|
fdd9351378
|
pundit: policy didn't exist
|
2016-03-12 11:24:49 +11:00 |
|
|
Connor Turland
|
cb79f2deae
|
pundit: make it work
|
2016-03-12 11:16:46 +11:00 |
|
|
Connor Turland
|
4ed00240eb
|
api: revert silly js change
|
2016-03-12 11:15:14 +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
|
c7075dab48
|
pundit: fix queries
|
2016-03-12 10:10:31 +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
|
623b3c7ad7
|
can load maps
|
2016-03-12 09:54:23 +11:00 |
|
|
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
|
bd5c88fb0b
|
display initial state of call to new mapper
|
2016-03-01 12:25:38 +13: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
|
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
|
baca4aac83
|
synapse policy
|
2016-02-28 12:30:41 +08:00 |
|