From 6ca8b20106b861181af974a707a29a7916f63bb2 Mon Sep 17 00:00:00 2001 From: Aaron Parecki Date: Tue, 23 Feb 2016 16:07:47 +0000 Subject: [PATCH 01/10] update dependencies --- compass/composer.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/compass/composer.lock b/compass/composer.lock index edeb9d6..5193819 100644 --- a/compass/composer.lock +++ b/compass/composer.lock @@ -1964,16 +1964,16 @@ }, { "name": "p3k/quartz-db", - "version": "0.1.0", + "version": "0.1.1", "source": { "type": "git", "url": "https://github.com/aaronpk/QuartzDB.git", - "reference": "d060c23716fc5d0a4bdb77f32e8c813e29c923ed" + "reference": "d0273a08181cffd91343ba788ff234fbd9daffa6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aaronpk/QuartzDB/zipball/d060c23716fc5d0a4bdb77f32e8c813e29c923ed", - "reference": "d060c23716fc5d0a4bdb77f32e8c813e29c923ed", + "url": "https://api.github.com/repos/aaronpk/QuartzDB/zipball/d0273a08181cffd91343ba788ff234fbd9daffa6", + "reference": "d0273a08181cffd91343ba788ff234fbd9daffa6", "shasum": "" }, "type": "library", @@ -1992,20 +1992,20 @@ } ], "description": "A flat-file database optimized to hold time-series data.", - "time": "2015-09-21 17:56:12" + "time": "2016-01-29 00:39:52" }, { "name": "paragonie/random_compat", - "version": "1.1.5", + "version": "1.1.6", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7" + "reference": "e6f80ab77885151908d0ec743689ca700886e8b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/dd8998b7c846f6909f4e7a5f67fabebfc412a4f7", - "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/e6f80ab77885151908d0ec743689ca700886e8b0", + "reference": "e6f80ab77885151908d0ec743689ca700886e8b0", "shasum": "" }, "require": { @@ -2040,7 +2040,7 @@ "pseudorandom", "random" ], - "time": "2016-01-06 13:31:20" + "time": "2016-01-29 16:19:52" }, { "name": "predis/predis", From 17f270a08be6a0003a73b355f307855203ae598c Mon Sep 17 00:00:00 2001 From: Aaron Parecki Date: Tue, 23 Feb 2016 16:08:03 +0000 Subject: [PATCH 02/10] hide trip create button until a range is selected --- compass/public/assets/map.js | 1 + compass/resources/views/map.blade.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compass/public/assets/map.js b/compass/public/assets/map.js index f7a9ec4..469e17d 100644 --- a/compass/public/assets/map.js +++ b/compass/public/assets/map.js @@ -137,6 +137,7 @@ jQuery(function($){ var db_token = $("#database").data("token"); $.get("/api/query?format=linestring&start="+$('#range-from').val()+"&end="+$('#range-to').val()+"&tz="+$("#timezone").val()+"&token="+db_token, function(data){ $("#range-go").removeClass("loading"); + $("#trip-create-form").removeClass("hidden"); displayLineOnMap(data, {pins: true}); }); return false; diff --git a/compass/resources/views/map.blade.php b/compass/resources/views/map.blade.php index 6fc0d5b..1af75ea 100644 --- a/compass/resources/views/map.blade.php +++ b/compass/resources/views/map.blade.php @@ -14,7 +14,7 @@ @if($database->micropub_endpoint) -
+