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
|
5317711b57
|
Merge branch 'develop' into oauth.provider
|
2016-03-23 18:00:59 -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 |
|
Devin Howard
|
3bb3fa9e73
|
Merge pull request #493 from metamaps/feature/icon-tests
metacode icon tests
|
2016-03-22 14:22:05 +08:00 |
|
Devin Howard
|
b305584d5d
|
Merge pull request #490 from metamaps/feature/call-for-developers
call for developers in Inspect Element window
|
2016-03-22 14:21:52 +08:00 |
|
Devin Howard
|
cb4137c13f
|
Merge pull request #491 from metamaps/feature/rails-intro
add rails intro for newcomers
|
2016-03-22 14:21:38 +08:00 |
|
Connor Turland
|
617dec72b9
|
hide sound option. green 'in call' dot. tooltip
|
2016-03-21 13:08:34 -07:00 |
|
Connor Turland
|
e6ac4b1dcb
|
make metamaps an oauth provider
|
2016-03-19 13:28:55 +11:00 |
|
Devin Howard
|
0c3010be90
|
Small revisions to rails intro
|
2016-03-16 11:45:12 +08:00 |
|
Devin Howard
|
a0d38c8fb8
|
check https manual icons
|
2016-03-16 11:42:51 +08:00 |
|
Devin Howard
|
8b54e53743
|
metacode icon tests
|
2016-03-16 11:39:24 +08:00 |
|
Devin Howard
|
5ea61341eb
|
add rails intro for newcomers
|
2016-03-15 16:16:19 +08:00 |
|
Devin Howard
|
756fe75664
|
call for developers in Inspect Element window
|
2016-03-15 16:06:37 +08:00 |
|
Connor Turland
|
f055f4c7c5
|
Merge branch 'develop' into feature/realtime.video
|
2016-03-14 21:45:36 +11:00 |
|
Connor Turland
|
ac9460be77
|
do still need cancan
|
2016-03-14 21:44:50 +11: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 |
|
Connor Turland
|
10a5a099e7
|
Merge pull request #489 from metamaps/feature/fix-tests
fix tests
|
2016-03-14 18:17:25 +11:00 |
|
Devin Howard
|
5cb5eac9d6
|
Merge pull request #488 from metamaps/feature/no-cancan
no cancan
|
2016-03-14 14:44:35 +08: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
|
32326ff4af
|
update map/topic delete action test
|
2016-03-14 11:47:01 +08:00 |
|
Devin Howard
|
7716462c8f
|
fix topics controller test
|
2016-03-14 11:47:01 +08:00 |
|
Devin Howard
|
ee0ca3ba35
|
Merge pull request #487 from metamaps/feature/pundit
policy specs & remove old permission tests
|
2016-03-14 11:46:09 +08:00 |
|
Devin Howard
|
f7201e048e
|
pending mapping policy
|
2016-03-14 11:15:10 +08:00 |
|
Devin Howard
|
3823c708fd
|
update mapping policy
|
2016-03-14 11:09:27 +08:00 |
|
Devin Howard
|
c5009952f3
|
remove permissions tests
|
2016-03-14 11:03:30 +08:00 |
|
Devin Howard
|
dbb8052a17
|
trifecta of policy tests
|
2016-03-14 11:01:29 +08:00 |
|
Devin Howard
|
88c070cbbd
|
no cancan
|
2016-03-14 10:55:26 +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 |
|