v10.0.0v10.0.0

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

5 files changed, 34 insertions, 27 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 674a7e4e..71c3b938 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,24 @@
-# Changelog
+## Changelog
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [10.0.0] - 2021-09-21
+
+### New
+- Add "Add to folders" action for bookmarks
+- API: Implement locking
+
+### Fixed
+- Update browserlist
+- Update dependencies
+- BookmarkService: Don't update bookmark if there have been no changes
+- Disable drag-and-drop when renaming item 
+- SidebarBookmark: Show which folders a bookmark belongs to
+- Fix: Don't hide search behind bookmark details
+- Major version bump to v10 to fix release tags in accordance with semantic versioning
+
 ## [4.4.1] - 2021-08-22
 
 ### Fixed
@@ -600,6 +615,8 @@ Supported are NC 15 and 16, provided you are using PHP v7.1 and have gmp, intl a
 - FIX folder collapse css
 - FIX: Speed up findBookmarks SQL query
 
+
+[10.0.0]: https://github.com/nextcloud/bookmarks/compare/v4.4.1...v10.0.0
 [4.4.1]: https://github.com/nextcloud/bookmarks/compare/v4.4.0...v4.4.1
 [4.4.0]: https://github.com/nextcloud/bookmarks/compare/v4.3.0...v4.4.0
 [4.3.0]: https://github.com/nextcloud/bookmarks/compare/v4.2.2...v4.3.0
diff --git a/Makefile b/Makefile
index bcf1764a..c45b927c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ source_dir=$(build_dir)/source
 sign_dir=$(build_dir)/sign
 package_name=$(app_name)
 cert_dir=$(HOME)/.nextcloud/certificates
-version+=4.4.1
+version+=10.0.0
 
 all: dev-setup build-js-production composer-no-dev
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 7ba29183..442a43a5 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -17,7 +17,7 @@ Requirements:
    - mbstring: *
  - Nextcloud v20+
 ]]></description>
-	<version>4.4.1</version>
+	<version>10.0.0</version>
 	<licence>agpl</licence>
 	<author mail="mklehr@gmx.net">Marcel Klehr</author>
 	<author mail="blizzz@arthur-schiwon.de" homepage="https://www.arthur-schiwon.de">Arthur Schiwon</author>
diff --git a/package-lock.json b/package-lock.json
index d862497d..d5736313 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "bookmarks",
-	"version": "4.4.1",
+	"version": "10.0.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "bookmarks",
-			"version": "4.4.1",
+			"version": "10.0.0",
 			"license": "AGPL-3.0-or-later",
 			"dependencies": {
 				"@nextcloud/auth": "^1.3.0",
@@ -28,6 +28,7 @@
 				"vue-material-design-icons": "^4.13.0",
 				"vue-router": "^3.5.2",
 				"vue-simple-progress": "^1.1.1",
+				"vue-template-compiler": "^2.6.14",
 				"vuex": "^3.6.2",
 				"vuex-router-sync": "^5.0.0"
 			},
@@ -6411,9 +6412,7 @@
 		"node_modules/de-indent": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-			"integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
-			"dev": true,
-			"peer": true
+			"integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0="
 		},
 		"node_modules/debug": {
 			"version": "2.6.9",
@@ -9442,8 +9441,6 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
 			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-			"dev": true,
-			"peer": true,
 			"bin": {
 				"he": "bin/he"
 			}
@@ -17550,11 +17547,9 @@
 			}
 		},
 		"node_modules/vue-template-compiler": {
-			"version": "2.6.12",
-			"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz",
-			"integrity": "sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==",
-			"dev": true,
-			"peer": true,
+			"version": "2.6.14",
+			"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz",
+			"integrity": "sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==",
 			"dependencies": {
 				"de-indent": "^1.0.2",
 				"he": "^1.1.0"
@@ -24350,9 +24345,7 @@
 		"de-indent": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-			"integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
-			"dev": true,
-			"peer": true
+			"integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0="
 		},
 		"debug": {
 			"version": "2.6.9",
@@ -26758,9 +26751,7 @@
 		"he": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-			"dev": true,
-			"peer": true
+			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
 		},
 		"hmac-drbg": {
 			"version": "1.0.1",
@@ -33060,11 +33051,9 @@
 			}
 		},
 		"vue-template-compiler": {
-			"version": "2.6.12",
-			"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz",
-			"integrity": "sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==",
-			"dev": true,
-			"peer": true,
+			"version": "2.6.14",
+			"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz",
+			"integrity": "sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==",
 			"requires": {
 				"de-indent": "^1.0.2",
 				"he": "^1.1.0"
diff --git a/package.json b/package.json
index e2ed3c6e..350f7d2a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "bookmarks",
-	"version": "4.4.1",
+	"version": "10.0.0",
 	"main": "js/index.js",
 	"scripts": {
 		"build": "NODE_ENV=production webpack --progress --config webpack.js",
@@ -40,6 +40,7 @@
 		"vue-material-design-icons": "^4.13.0",
 		"vue-router": "^3.5.2",
 		"vue-simple-progress": "^1.1.1",
+		"vue-template-compiler": "^2.6.14",
 		"vuex": "^3.6.2",
 		"vuex-router-sync": "^5.0.0"
 	},