Release Mapif V1.1.0

LoicTouzard · LoicTouzard · commit e5686e9326cf · 2016-05-31T23:18:47.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## V1.1.0
+* la version en ligne passe en HTTPS
+* #11 ajout du clustering  sur les positions
+* Amélioration de l'UX de navigation (menu et carte)
+* Refactoring du code en back et front
+* fix #6
+
 ## V1.0.1
 * fix #3
 * fix #4
diff --git a/src/static/settings.json b/src/static/settings.json
@@ -1,7 +1,7 @@
 {
 	"MAPBOXTOKEN":"pk.eyJ1IjoibHRvdXphcmQiLCJhIjoiY2lvMGV5OTJhMDB2Y3dka2xrZHpycGlrZiJ9.70MUkG_bCx7MPyIOhwfcKA",
 	"SERVER_ADDR":"localhost:5000",
-	"VERSION" : "1.0.1",
+	"VERSION" : "1.1.0",
 	"DEBUG":true,
 	"PROTOCOL": "http"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"MAPBOXTOKEN":"pk.eyJ1IjoibHRvdXphcmQiLCJhIjoiY2lvMGV5OTJhMDB2Y3dka2xrZHpycGlrZiJ9.70MUkG_bCx7MPyIOhwfcKA",`
`3`	`3`	`"SERVER_ADDR":"localhost:5000",`
`4`		`- "VERSION" : "1.0.1",`
	`4`	`+ "VERSION" : "1.1.0",`
`5`	`5`	`"DEBUG":true,`
`6`	`6`	`"PROTOCOL": "http"`
`7`	`7`	`}`