From d86e882dea1b15a75ed3ca7ec656f878076a2a08 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Fri, 13 May 2022 13:40:41 +0200
Subject: [PATCH] v4.14.0

---
 CHANGELOG.md             | 22 ++++++++++++++++++++++
 android/app/build.gradle |  4 ++--
 manifest.json            |  2 +-
 package-lock.json        |  4 ++--
 package.json             |  2 +-
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76bd926b68..4a6e8a4a67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+## v4.14.0
+
+### New
+- New stepwise account setup flow
+- NewAccount: Trigger sync after completion
+- Improve progress bar behavior
+- Allow more than one separator per Folder on Nc Bookmarks
+- [Native] Allow sorting bookmarks
+- [Native] Background sync while on wifi
+
+### Fixed
+- [Native] Fix splash screen aspect ratio
+- [Native] Make app-bar absolute instead of hide on scroll
+- Improve wording around sync strategies
+- BrowserController: Don't get stuck in sync loop
+- GoogleDrive: Add cancel method
+- Fix transifex integration
+- UI: Do not show passwords in new options session
+- Inactivity timeout := 7s
+- [Native] Add allowNetwork to default settings
+- Fix Tab sync order on firefox
+
 ## v4.13.1
 
 ### New
diff --git a/android/app/build.gradle b/android/app/build.gradle
index d9437650b6..143b7b3c6b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "org.handmadeideas.floccus"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 4013001
-        versionName "4.13.1"
+        versionCode 4014000
+        versionName "4.14.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/manifest.json b/manifest.json
index 303ca29794..24de95c150 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "4.13.1",
+  "version": "4.14.0",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",
diff --git a/package-lock.json b/package-lock.json
index 75c8254d67..97417d1213 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "floccus",
-  "version": "4.13.1",
+  "version": "4.14.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "floccus",
-      "version": "4.13.1",
+      "version": "4.14.0",
       "license": "MPL-2.0",
       "dependencies": {
         "@byteowls/capacitor-oauth2": "^3.0.1",
diff --git a/package.json b/package.json
index 7ea97c5599..6ee0a70eed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "floccus",
-  "version": "4.13.1",
+  "version": "4.14.0",
   "description": "Sync your bookmarks privately across browsers and devices",
   "scripts": {
     "build": "gulp",