From 24bd0a96a8ca382e407895d3a7315b13b303fcb7 Mon Sep 17 00:00:00 2001 From: poietic Date: Fri, 26 Dec 2014 10:04:15 -0800 Subject: [PATCH 01/31] fixed links to CLA/CAA --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bd7fbc0e..f03b2c88 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,7 +49,7 @@ Driessen][git-branching-model]. Here's an overview: changing all the time. It's important that any changes you make are based on the most recent version of metamaps, since it's possible that something may have changed that breaks your pull request or invalidates its need. -4. Make sure you have a [Contributor License Agreement][cla] on file. +4. Make sure you have a [Contributor License Agreement][http://caa.metamaps.cc] on file. 5. Read on ... @@ -59,7 +59,7 @@ Before we can accept any contributions to Metamaps, we first require that all individuals or companies agree to our Contributor License Agreement (CLA). The e-mail address used in the pull request will be used to check if a CLA has already been filed, so be sure to list all email addresses that you might use to submit your -pull requests when filling it out. Our CLA can be found [here][cla]. +pull requests when filling it out. Our CLA can be found [here][http://caa.metamaps.cc]. ### Testing and Linting From b2fce96974ddb2d2d2b4b0a18103e208e5e2fc37 Mon Sep 17 00:00:00 2001 From: poietic Date: Fri, 26 Dec 2014 10:05:36 -0800 Subject: [PATCH 02/31] Update CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f03b2c88..73d2bb58 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,7 +49,7 @@ Driessen][git-branching-model]. Here's an overview: changing all the time. It's important that any changes you make are based on the most recent version of metamaps, since it's possible that something may have changed that breaks your pull request or invalidates its need. -4. Make sure you have a [Contributor License Agreement][http://caa.metamaps.cc] on file. +4. Make sure you have a [Contributor License Agreement](http://caa.metamaps.cc) on file. 5. Read on ... @@ -59,7 +59,7 @@ Before we can accept any contributions to Metamaps, we first require that all individuals or companies agree to our Contributor License Agreement (CLA). The e-mail address used in the pull request will be used to check if a CLA has already been filed, so be sure to list all email addresses that you might use to submit your -pull requests when filling it out. Our CLA can be found [here][http://caa.metamaps.cc]. +pull requests when filling it out. Our CLA can be found [here](http://caa.metamaps.cc). ### Testing and Linting From 263eef52ce1383f275b3dd2f8731b12b7a87d9c5 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sun, 11 Jan 2015 13:30:05 -0500 Subject: [PATCH 03/31] maps were crashing when topics were removed (if those topics included the 'root node'. this was caused by a setTimeout interfering with synchronicity of events --- app/assets/javascripts/src/Metamaps.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 67629530..981cafce 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -2812,10 +2812,6 @@ Metamaps.Control = { hideNode: function (nodeid) { var node = Metamaps.Visualize.mGraph.graph.getNode(nodeid); var graph = Metamaps.Visualize.mGraph; - if (nodeid == Metamaps.Visualize.mGraph.root) { // && Metamaps.Visualize.type === "RGraph" - var newroot = _.find(graph.graph.nodes, function(n){ return n.id !== nodeid; }); - graph.root = newroot ? newroot.id : null; - } Metamaps.Control.deselectNode(node); @@ -2830,6 +2826,10 @@ Metamaps.Control = { duration: 500 }); setTimeout(function () { + if (nodeid == Metamaps.Visualize.mGraph.root) { // && Metamaps.Visualize.type === "RGraph" + var newroot = _.find(graph.graph.nodes, function(n){ return n.id !== nodeid; }); + graph.root = newroot ? newroot.id : null; + } Metamaps.Visualize.mGraph.graph.removeNode(nodeid); }, 500); Metamaps.Filter.checkMetacodes(); From 5592c4710a0b7488edbadda93502bfd578aaed18 Mon Sep 17 00:00:00 2001 From: Gord Tanner Date: Thu, 22 Jan 2015 17:53:18 -0500 Subject: [PATCH 04/31] Created a Vagrantfile Install instructions: - clone repo - (ensure you have VirtualBox and Vagrant) - run configure.sh This will create a VM, install all the software. Once vm is provisioned it will then bundle install and configure your database To start the service you can then run: vagrant ssh -c 'cd /vagrant; rails s' --- .gitignore | 2 ++ Vagrantfile | 38 ++++++++++++++++++++++++++++++++++++++ configure.sh | 16 ++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 Vagrantfile create mode 100755 configure.sh diff --git a/.gitignore b/.gitignore index 88ca74ce..d1889d2c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ log/*.log tmp .DS_Store + +.vagrant diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 00000000..ce0c0c87 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,38 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +$script = <