glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
1659 commits 40 branches 27 tags 58 MiB
Commit graph

1659 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Connor Turland e1c0509c91 Merge pull request #520 from metamaps/develop 
fix request invite
 2016-03-27 12:12:26 -07:00
Connor Turland 3c03d30c08 Merge pull request #519 from metamaps/bug/requestinvite 
request invite page was broken
 2016-03-27 12:11:21 -07:00
Connor Turland 8fa856451d request invite page was broken 2016-03-27 12:04:28 -07:00
Connor Turland fbba487b83 Merge pull request #482 from metamaps/develop 
merge develop into master (version 2.8!)
 2016-03-27 00:43:54 -07:00
Devin Howard 8a6e702c12 fix js error 2016-03-27 15:32:18 +08:00
Devin Howard dae3106b34 Merge pull request #509 from metamaps/feature/import.export 
import/export tweaks
 2016-03-27 15:22:17 +08:00
Connor Turland 49f4b2030e gemfile.lock needed to change for travis to be happy 2016-03-27 00:21:32 -07:00
Devin Howard 30d327f07a solution using backbone events instead of setTimeout 2016-03-27 15:20:09 +08:00
Connor Turland a82b0048d8 don't need sequenced 2016-03-27 00:14:22 -07:00
Devin Howard f9e6249615 Fix up import - want more backboney event listening though 2016-03-27 15:09:08 +08:00
Connor Turland e4145ef9fb Merge pull request #506 from metamaps/feature/import.export 
minimal import/export - could go in v2.8 for the keeners
 2016-03-26 23:46:28 -07:00
Devin Howard ae9f4a51a2 fix a few embarassing errors - export is working 2016-03-26 15:53:14 +08:00
Devin Howard 53867caae8 allow JSON or TSV parsing 2016-03-26 15:03:44 +08:00
Devin Howard 92f78aa56a update tsv code to handle new export code at the very least. 
next step will be allowing json input too
 2016-03-26 12:49:26 +08:00
Devin Howard d3649f1d26 DRY map exporting with policy_scoping 2016-03-26 12:46:43 +08:00
Devin Howard 14bdc8546b metacodes#show routes 2016-03-26 10:12:32 +08:00
Devin Howard 579ddcc047 Merge pull request #505 from metamaps/fix/crappy-export 
add missing synapses_csv function (fixes #504)
 2016-03-25 16:55:05 +08:00
Devin Howard 387c863222 fix a bug with synapses and use cid to link new topics with synapses 
Synapses are now created client-side, but still rejected server-side
 2016-03-25 16:48:14 +08:00
Devin Howard c77cc32734 import fixes 
- better abort logic & messaging
 - handle \r line delim
 - better example format at top
 2016-03-25 16:48:14 +08:00
Devin Howard ea677f8a6b DRY up csv/xls rendering, put it into model 2016-03-25 16:48:14 +08:00
Devin Howard 8f532708ce update xls/csv format to better serialize topics and synapses 2016-03-25 16:47:35 +08:00
Devin Howard 61262aaec2 implement csv/xls export 2016-03-25 16:47:35 +08:00
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