From bab907c8b56ea9203f102c42d25421b5f7c1ddfb Mon Sep 17 00:00:00 2001
From: Adriana <dri.abedala@gmail.com>
Date: Tue, 13 Apr 2021 21:21:39 -0400
Subject: [PATCH 1/2] message

---
 src/App.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/App.js b/src/App.js
index 77ef750db..0f55ccc1b 100644
--- a/src/App.js
+++ b/src/App.js
@@ -15,6 +15,7 @@ import Snackbar from "@material-ui/core/Snackbar";
 import getLogo from "./models/logo";
 import log from "loglevel";
 import Timeline from "./components/Timeline";
+import {parseMapName} from "./utils";
 
 
 const MOBILE_WIDTH = 960;
@@ -478,7 +479,8 @@ function App() {
   React.useEffect(() => {
     log.debug("init timeline");
     //if there are any other filter, like wallet, then close the timeline
-    if(window.location.search.match(/(wallet=|userid=|treeid=|flavor=|token=|map_name=)/)){
+    // or if the SubDomain is freetown.treetracker also hide timeline 
+    if(window.location.search.match(/(wallet=|userid=|treeid=|flavor=|token=|map_name=)/) || parseMapName(window.location.hostname)==='freetown'){
       setTimelineEnabled(false);
       return;
     }

From b31cd9c49df6fca8f59d7661e29b1d9020484004 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Wed, 14 Apr 2021 01:32:07 +0000
Subject: [PATCH 2/2] chore(release): 1.1.0 [skip ci]

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0cefefb6..887cc9c0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+# [1.1.0](https://github.com/adriana-carmo/treetracker-web-map-client/compare/v1.0.1...v1.1.0) (2021-04-14)
+
+
+### Bug Fixes
+
+* do not load tile server ([863aba6](https://github.com/adriana-carmo/treetracker-web-map-client/commit/863aba668370b7174e1506667a63cb92592b4807))
+* extra slash ([6cdc0d0](https://github.com/adriana-carmo/treetracker-web-map-client/commit/6cdc0d0a016af6a37f38421db156298a5e26fbd7))
+* incorrectly displaying icons in some zoomlevel ([377b697](https://github.com/adriana-carmo/treetracker-web-map-client/commit/377b697efc3d3439f7631c79b83289bf1856fef6))
+* missed slash ([1e8d6a4](https://github.com/adriana-carmo/treetracker-web-map-client/commit/1e8d6a47bc8cfecc59df39d58d16c509bd11da92))
+* remove the map bounds url update for now ([87fda83](https://github.com/adriana-carmo/treetracker-web-map-client/commit/87fda83281339ee141fa88d39d937dea3a519c0d))
+* restore https://github.com/Greenstand/treetracker-web-map-api/pull/300/files ([8f8cc8c](https://github.com/adriana-carmo/treetracker-web-map-client/commit/8f8cc8c56f4f084f1fe48b88a0800d0b51628287))
+* restore https://github.com/Greenstand/treetracker-web-map-api/pull/304/files ([6c545c8](https://github.com/adriana-carmo/treetracker-web-map-client/commit/6c545c84bd5b9ebc7fda5f1dace70a420b353c23))
+* treeid=xxx fails ([412f424](https://github.com/adriana-carmo/treetracker-web-map-client/commit/412f4246fa6e8cfa0e8de1fe8bf2c4d8a6ccc737))
+* wrong selected icon position ([32cf20e](https://github.com/adriana-carmo/treetracker-web-map-client/commit/32cf20e697ceec2057bdd449b726d92891966a06))
+
+
+### Features
+
+* can display map with leaflet, (new code) ([d515804](https://github.com/adriana-carmo/treetracker-web-map-client/commit/d515804f6d0f0704b14013f76417115b73e650af))
+* can show selected tree icon ([a55ddf4](https://github.com/adriana-carmo/treetracker-web-map-client/commit/a55ddf423bc86d987bd083daaddd6d390af235de))
+* fix two point problem ([36b840b](https://github.com/adriana-carmo/treetracker-web-map-client/commit/36b840b98e886caeebdb81d0ecc5156631aeee2b))
+* freetown map use special tile ([e25976c](https://github.com/adriana-carmo/treetracker-web-map-client/commit/e25976c0c0e36e2015538d0cbaafcf06d13d33e1))
+* freetown org name use tile server ([44cbbf7](https://github.com/adriana-carmo/treetracker-web-map-client/commit/44cbbf77358e4f311d91238f972395bb69f92f56))
+* restored next/prev tree in tile version ([3f1894e](https://github.com/adriana-carmo/treetracker-web-map-client/commit/3f1894e2968f356106d52d770e3c98c2a2ef19f6))
+* solved the treeid=xxx problem ([2b16855](https://github.com/adriana-carmo/treetracker-web-map-client/commit/2b16855f300afe8091dcfabec0fc2c5821b8e7ab))
+
 ## [1.6.5](https://github.com/Greenstand/treetracker-web-map-client/compare/v1.6.4...v1.6.5) (2021-04-03)
 
 
diff --git a/package.json b/package.json
index fab6954a5..94c198928 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "1.6.5",
+  "version": "1.1.0",
   "private": true,
   "dependencies": {
     "@material-ui/core": "^4.11.0",