Merge remote-tracking branch 'origin/dev-2.1.10' into develop

changelog.txt

@@ -1,3 +1,14 @@
+NixNote (2.1.10) stable; urgency=low
+  * Authentication (Evernote login) now uses system browser which fixes login problems and also enables to use all
+    login options supported by Evernote (multifactor authentication, login by Google etc.)
+  * AppImage is now built on Ubuntu 20.04 (focal) - i.e. will not run on older distribution that Ubuntu 20.04,
+    should of course run on all newer systems
+  * AppImage is now created by linuxdeploy tool (instead of linuxdeployqt)
+  * Removed the usage of custom built tidy-html5 in favour of the package provided by distribution
+  * Updated Evernote client - QEverCloud version 4.1.0 to 6.2.0
+  * All changes thanks to https://github.com/d1vanov
+ -- Robert Spiegel <nightingale7@gmail.com>  Wed, 19 Apr 2023 19:11:10 +0200
+
 NixNote (2.1.9) stable; urgency=low
   * Added a new dark theme.
   * Optimised the sql statements of note creating and updating.
@@ -12,6 +23,7 @@ NixNote (2.1.9) stable; urgency=low
   * RAM usage optimizations.
   * Fixed file downloading under Windows.
   * Made the editor not render the note content when Key_Up or Key_Down keeps being pressed.
+  * All changes thanks to https://github.com/boo-yee
  -- Robert Spiegel <nightingale7@gmail.com>  Sat, 15 Apr 2023 12:15:22 +0200
 
 NixNote (2.1.8) stable; urgency=low
@@ -24,6 +36,7 @@ NixNote (2.1.8) stable; urgency=low
   * Fixed: Nixnote2 exits when network gets disconnected - issue #189
   * Fixed: Import all notes, tag issue - issue #153
   * Fixed: Local images cannot be pasted, images in notes cannot be saved.
+  * All changes thanks to https://github.com/boo-yee
  -- Robert Spiegel <nightingale7@gmail.com>  Sat, 10 Sep 2022 10:00:00 +0200
 
 NixNote (2.1.7) stable; urgency=low

debian/changelog

@@ -1,3 +1,14 @@
+NixNote (2.1.10) stable; urgency=low
+  * Authentication (Evernote login) now uses system browser which fixes login problems and also enables to use all
+    login options supported by Evernote (multifactor authentication, login by Google etc.)
+  * AppImage is now built on Ubuntu 20.04 (focal) - i.e. will not run on older distribution that Ubuntu 20.04,
+    should of course run on all newer systems
+  * AppImage is now created by linuxdeploy tool (instead of linuxdeployqt)
+  * Removed the usage of custom built tidy-html5 in favour of the package provided by distribution
+  * Updated Evernote client - QEverCloud version 4.1.0 to 6.2.0
+  * All changes thanks to https://github.com/d1vanov
+ -- Robert Spiegel <nightingale7@gmail.com>  Wed, 19 Apr 2023 19:11:10 +0200
+
 NixNote (2.1.9) stable; urgency=low
   * Added a new dark theme.
   * Optimised the sql statements of note creating and updating.
@@ -12,6 +23,7 @@ NixNote (2.1.9) stable; urgency=low
   * RAM usage optimizations.
   * Fixed file downloading under Windows.
   * Made the editor not render the note content when Key_Up or Key_Down keeps being pressed.
+  * All changes thanks to https://github.com/boo-yee
  -- Robert Spiegel <nightingale7@gmail.com>  Sat, 15 Apr 2023 12:15:22 +0200
 
 NixNote (2.1.8) stable; urgency=low
@@ -24,6 +36,7 @@ NixNote (2.1.8) stable; urgency=low
   * Fixed: Nixnote2 exits when network gets disconnected - issue #189
   * Fixed: Import all notes, tag issue - issue #153
   * Fixed: Local images cannot be pasted, images in notes cannot be saved.
+  * All changes thanks to https://github.com/boo-yee
  -- Robert Spiegel <nightingale7@gmail.com>  Sat, 10 Sep 2022 10:00:00 +0200
 
 NixNote (2.1.7) stable; urgency=low
@@ -449,3 +462,4 @@ NixNote (2.0-beta-3) stable; urgency=low
 NixNote (2.0-beta-2) stable; urgency=low
   * Beta 2.  Lots of bug fixes and removal of Thrift.
 -- Randy Baumgarte <randy@fbn.cx> Sat, 26 Apr 2014 14:00:00 -0400
+

development/build-dependencies-ubuntu-2004.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+## 2023.04: this file is not updated see docker/Dockerfile.ubuntu_focal
+
+
 # preparation
 # sudo apt update
 # sudo apt upgrade

development/build-with-docker.sh

@@ -49,7 +49,7 @@ time docker run \
    -v $PROJECTDIR/docker-build-${BUILD_TYPE}:/opt/nixnote2/qmake-build-${BUILD_TYPE} \
    -v $PROJECTDIR/docker-build-${BUILD_TYPE}-t:/opt/nixnote2/qmake-build-${BUILD_TYPE}-t \
    -it ${DOCKERTAG} \
-      /bin/bash -c "cd nixnote2 && git fetch && git checkout --track origin/$PROJECTBRANCH && git reset --hard origin/$PROJECTBRANCH && ./development/build-with-qmake.sh ${BUILD_TYPE} noclean /usr/lib/nixnote2/tidy browser && ./development/run-tests.sh ${BUILD_TYPE} noclean /usr/lib/nixnote2/tidy && ./development/create-AppImage-linuxdeploy.sh && mv *.AppImage appdir && chmod -R a+rwx appdir/*.AppImage"
+      /bin/bash -c "cd nixnote2 && git fetch && git checkout --track origin/$PROJECTBRANCH && git reset --hard origin/$PROJECTBRANCH && ./development/build-with-qmake.sh ${BUILD_TYPE} noclean /usr/lib browser && ./development/run-tests.sh ${BUILD_TYPE} noclean /usr/lib && ./development/create-AppImage-linuxdeploy.sh && mv *.AppImage appdir && chmod -R a+rwx appdir/*.AppImage"
 
 ls appdir/*.AppImage
 echo "If all got well then AppImage file in appdir is your binary"

development/docker/Dockerfile.ubuntu_focal

@@ -8,12 +8,12 @@ ENV PATH="${wdir}/linuxdeploy:${wdir}/linuxdeploy-plugin-qt:${wdir}/appimagetool
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y software-properties-common
-RUN add-apt-repository ppa:nixnote/nixnote2-stable -y && apt-get update -qq
+#RUN add-apt-repository ppa:nixnote/nixnote2-stable -y && apt-get update -qq
 RUN apt-get update && apt-get install -y git-core qt5-default build-essential ccache p7zip-full libssl1.1 libcrypt1 libnss3 \
                               wget curl make pkg-config \
                               qtwebengine5-dev qtwebengine5-dev-tools \
                               libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev libcurl4-openssl-dev \
-                              libpoppler-qt5-dev libqt5webkit5-dev qt5-qmake qttools5-dev-tools libhunspell-dev nixnote2-tidy
+                              libpoppler-qt5-dev libqt5webkit5-dev qt5-qmake qttools5-dev-tools libhunspell-dev libtidy-dev libqt5positioning5-plugins
 
 # install linuxdeploy
 RUN wget -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" && \