Merge branch 'master' into nextgovhackathon-master

Signed-off-by: Arne Hamann <[email protected]>

.eslintignore

@@ -1,13 +1,5 @@
 js/
 l10n/
 src/adminSettings.js
-src/contactsController.js
-src/devicesController.js
-src/favoritesController.js
 src/filetypes.js
-src/nonLocalizedPhotosController.js
-src/photosController.js
-src/script.js
-src/tracksController.js
-src/myMapsController.js
 src/utils.js

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.2.4 - 2023.01.01 Minor Fixes
+### Fixed
+- Shows favorites on NC25
+  [#909](https://github.com/nextcloud/maps/pull/909) @tacruc
+  [#866](https://github.com/nextcloud/maps/issues/866) @meichthys
+- New contacts should again appear on the map
+  [#910](https://github.com/nextcloud/maps/pull/910) @tacruc
+  [#864](https://github.com/nextcloud/maps/issues/864) @sylvainmetayer
+
 ## 0.2.3 - 2022.12.29 NC 25 Redesign
 ### Fixed
 ### Updated

appinfo/info.xml

@@ -14,7 +14,7 @@
 - **📱 Devices:** Lost your phone? Check the map!
 - **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.
     ]]></description>
-    <version>0.2.3</version>
+    <version>0.2.4</version>
     <licence>agpl</licence>
     <author mail="[email protected]">Julien Veyssier</author>
     <author mail="[email protected]">Arne Hamann</author>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "maps",
-  "version": "0.2.1",
+  "version": "0.2.4",
   "description": "Maps app",
   "main": "main.js",
   "directories": {
@@ -36,15 +36,15 @@
     "npm": "^7.0.0 || ^8.0.0"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^6.2.0",
+    "@fortawesome/fontawesome-free": "^6.2.1",
     "@nextcloud/auth": "^2.0.0",
     "@nextcloud/axios": "^2.3.0",
     "@nextcloud/dialogs": "^3.2.0",
     "@nextcloud/event-bus": "^3.0.2",
     "@nextcloud/l10n": "^1.6.0",
     "@nextcloud/moment": "^1.2.1",
     "@nextcloud/paths": "^2.1.0",
-    "@nextcloud/router": "^2.0.0",
+    "@nextcloud/router": "^2.0.1",
     "@nextcloud/vue": "^7.3.0",
     "@nextcloud/sharing": "^0.1.0",
     "@raruto/leaflet-elevation": "^1.7.0",
@@ -57,17 +57,17 @@
     "leaflet-mouse-position": "^1.0.4",
     "leaflet-routing-machine": "^3.2.12",
     "leaflet.featuregroup.subgroup": "^1.0.2",
-    "leaflet.locatecontrol": "^0.76.1",
+    "leaflet.locatecontrol": "^0.79.0",
     "lrm-graphhopper": "^1.3.0",
     "mapbox-gl": "^2.4.1",
     "mapbox-gl-leaflet": "^0.0.15",
     "nouislider": "^14.0.2",
     "opening_hours": "^3.8.0",
-    "ua-parser-js": "^1.0.2",
+    "ua-parser-js": "^1.0.32",
     "vue": "^2.7.14",
     "vue-click-outside": "^1.1.0",
     "vue-clipboard2": "^0.3.1",
-    "vue-types": "^4.2.1",
+    "vue-types": "^5.0.2",
     "vue2-leaflet": "^2.6.0",
     "vue2-leaflet-markercluster": "^3.1.0",
     "vuex": "^3.6.2"