fix

Merge branch 'dev' into server_delete_users
Chore: Remove docs directory, now moved to joplin/website repository
2026-04-18 19:42:23 +02:00 · 2021-12-22 16:25:43 +01:00 · 2021-12-22 16:02:59 +01:00 · 2021-12-22 12:12:21 +01:00 · 2021-12-22 11:11:18 +00:00 · 2021-12-22 12:03:41 +01:00
1631 changed files with 62514 additions and 355247 deletions
@@ -5,6 +5,7 @@ _releases/
 *.min.js
 **/commands/index.ts
 **/node_modules/
+.yarn/
 Assets/
 docs/
 highlight.pack.js
@@ -12,6 +13,8 @@ Modules/TinyMCE/IconPack/postinstall.js
 Modules/TinyMCE/JoplinLists/
 Modules/TinyMCE/langs/
 node_modules/
+packages/app-desktop/build/
+packages/app-cli/tests/test data/
 packages/app-cli/build
 packages/app-cli/build/
 packages/app-cli/locales
@@ -705,9 +708,6 @@ packages/app-desktop/gui/style/StyledTextInput.js.map
 packages/app-desktop/gui/utils/NoteListUtils.d.ts
 packages/app-desktop/gui/utils/NoteListUtils.js
 packages/app-desktop/gui/utils/NoteListUtils.js.map
-packages/app-desktop/gui/utils/SyncScrollMap.d.ts
-packages/app-desktop/gui/utils/SyncScrollMap.js
-packages/app-desktop/gui/utils/SyncScrollMap.js.map
 packages/app-desktop/gui/utils/convertToScreenCoordinates.d.ts
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js.map
@@ -1512,9 +1512,6 @@ packages/lib/services/plugins/api/types.js.map
 packages/lib/services/plugins/reducer.d.ts
 packages/lib/services/plugins/reducer.js
 packages/lib/services/plugins/reducer.js.map
-packages/lib/services/plugins/sandboxProxy.d.ts
-packages/lib/services/plugins/sandboxProxy.js
-packages/lib/services/plugins/sandboxProxy.js.map
 packages/lib/services/plugins/utils/createViewHandle.d.ts
 packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/createViewHandle.js.map
@@ -1542,6 +1539,12 @@ packages/lib/services/plugins/utils/validatePluginId.js.map
 packages/lib/services/plugins/utils/validatePluginId.test.d.ts
 packages/lib/services/plugins/utils/validatePluginId.test.js
 packages/lib/services/plugins/utils/validatePluginId.test.js.map
+packages/lib/services/plugins/utils/validatePluginVersion.d.ts
+packages/lib/services/plugins/utils/validatePluginVersion.js
+packages/lib/services/plugins/utils/validatePluginVersion.js.map
+packages/lib/services/plugins/utils/validatePluginVersion.test.d.ts
+packages/lib/services/plugins/utils/validatePluginVersion.test.js
+packages/lib/services/plugins/utils/validatePluginVersion.test.js.map
 packages/lib/services/rest/Api.d.ts
 packages/lib/services/rest/Api.js
 packages/lib/services/rest/Api.js.map
@@ -1944,9 +1947,6 @@ packages/tools/generate-images.js.map
 packages/tools/git-changelog.d.ts
 packages/tools/git-changelog.js
 packages/tools/git-changelog.js.map
-packages/tools/lerna-add.d.ts
-packages/tools/lerna-add.js
-packages/tools/lerna-add.js.map
 packages/tools/release-android.d.ts
 packages/tools/release-android.js
 packages/tools/release-android.js.map
@@ -1959,6 +1959,9 @@ packages/tools/release-electron.js.map
 packages/tools/release-ios.d.ts
 packages/tools/release-ios.js
 packages/tools/release-ios.js.map
+packages/tools/release-plugin-repo-cli.d.ts
+packages/tools/release-plugin-repo-cli.js
+packages/tools/release-plugin-repo-cli.js.map
 packages/tools/release-server.d.ts
 packages/tools/release-server.js
 packages/tools/release-server.js.map
@@ -1977,9 +1980,18 @@ packages/tools/update-readme-download.js.map
 packages/tools/update-readme-sponsors.d.ts
 packages/tools/update-readme-sponsors.js
 packages/tools/update-readme-sponsors.js.map
+packages/tools/updateMarkdownDoc.d.ts
+packages/tools/updateMarkdownDoc.js
+packages/tools/updateMarkdownDoc.js.map
 packages/tools/website/build.d.ts
 packages/tools/website/build.js
 packages/tools/website/build.js.map
+packages/tools/website/updateDownloadPage.d.ts
+packages/tools/website/updateDownloadPage.js
+packages/tools/website/updateDownloadPage.js.map
+packages/tools/website/utils/frontMatter.d.ts
+packages/tools/website/utils/frontMatter.js
+packages/tools/website/utils/frontMatter.js.map
 packages/tools/website/utils/pressCarousel.d.ts
 packages/tools/website/utils/pressCarousel.js
 packages/tools/website/utils/pressCarousel.js.map
@@ -28,17 +28,12 @@ else
 	IS_MACOS=1
 fi

-if [ "$HAS_DOCKER_LABEL" == "true" ]; then
-	HAS_DOCKER_LABEL=1
-fi
-
 # =============================================================================
 # Print environment
 # =============================================================================

 echo "GITHUB_WORKFLOW=$GITHUB_WORKFLOW"
 echo "GITHUB_EVENT_NAME=$GITHUB_EVENT_NAME"
-echo "HAS_DOCKER_LABEL=$HAS_DOCKER_LABEL"
 echo "GITHUB_REF=$GITHUB_REF"
 echo "RUNNER_OS=$RUNNER_OS"
 echo "GIT_TAG_NAME=$GIT_TAG_NAME"
@@ -51,13 +46,14 @@ echo "IS_MACOS=$IS_MACOS"

 echo "Node $( node -v )"
 echo "Npm $( npm -v )"
+echo "Yarn $( yarn -v )"

 # =============================================================================
 # Install packages
 # =============================================================================

 cd "$ROOT_DIR"
-npm install
+yarn install

 # =============================================================================
 # Run test units. Only do it for pull requests and dev branch because we don't
@@ -67,6 +63,15 @@ npm install
 if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	echo "Step: Running tests..."

+	# On Linux, we run the Joplin Server tests using PostgreSQL
+	if [ "$IS_LINUX" == "1" ]; then
+		echo "Running Joplin Server tests using PostgreSQL..."
+		sudo docker-compose --file docker-compose.db-dev.yml up -d
+		export JOPLIN_TESTS_SERVER_DB=pg
+	else
+		echo "Running Joplin Server tests using SQLite..."
+	fi
+
 	# Need this because we're getting this error:
 	#
 	# @joplin/lib: FATAL ERROR: Ineffective mark-compacts near heap limit
@@ -74,7 +79,7 @@ if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	#
 	# https://stackoverflow.com/questions/38558989
 	export NODE_OPTIONS="--max-old-space-size=4096"
-	npm run test-ci
+	yarn run test-ci
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
@@ -89,7 +94,7 @@ fi
 if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	echo "Step: Running linter..."

-	npm run linter-ci ./
+	yarn run linter-ci ./
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
@@ -160,18 +165,14 @@ fi

 cd "$ROOT_DIR/packages/app-desktop"

-if [[ $HAS_DOCKER_LABEL = 1 ]] && [[ $IS_LINUX = 1 ]] && [[ $IS_PULL_REQUEST = 1 ]]; then
-	echo "Step: Building Docker image for testing only (no publishing)"
-	cd "$ROOT_DIR"
-	npm run buildServerDocker -- --tag-name server-v0.0.0
-elif [[ $GIT_TAG_NAME = v* ]]; then
+if [[ $GIT_TAG_NAME = v* ]]; then
 	echo "Step: Building and publishing desktop application..."
-	USE_HARD_LINKS=false npm run dist
+	USE_HARD_LINKS=false yarn run dist
 elif [[ $GIT_TAG_NAME = server-v* ]] && [[ $IS_LINUX = 1 ]]; then
-	echo "Step: Building and publishing Docker image..."
+	echo "Step: Building Docker Image..."
 	cd "$ROOT_DIR"
-	npm run buildServerDocker -- --tag-name $GIT_TAG_NAME --push-images
+	yarn run buildServerDocker --tag-name $GIT_TAG_NAME --push-images
 else
 	echo "Step: Building but *not* publishing desktop application..."
-	USE_HARD_LINKS=false npm run dist -- --publish=never
+	USE_HARD_LINKS=false yarn run dist --publish=never
 fi
@@ -28,12 +28,9 @@ jobs:
          brew install gettext
          brew install translate-toolkit

-      # If a pull request is tagged with the "docker" label, we build the image
-      # so that it's possible to check that it works. However we don't push the
-      # tags to Docker Hub. We only do that if we're on a tag "server-vX.Y.Z".
-
      - name: Install Docker Engine
-        if: runner.os == 'Linux' && (startsWith(github.ref, 'refs/tags/server-v') || contains(github.event.pull_request.labels.*.name, 'docker'))
+        # if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
+        if: runner.os == 'Linux'
        run: |
          sudo apt-get install -y apt-transport-https
          sudo apt-get install -y ca-certificates
@@ -47,20 +44,16 @@ jobs:
          sudo apt-get update || true
          sudo apt-get install -y docker-ce docker-ce-cli containerd.io

-          # Enables support for ARM64 architecture
-          # https://hub.docker.com/r/tonistiigi/binfmt
-          docker run --privileged --rm tonistiigi/binfmt --install arm64,arm
-
-          # Need to create and switch to a different driver because
-          # multiple platforms feature may not be enabled on the
-          # default driver.
-          docker buildx create --name crossplatformbuild --use
-
      - uses: actions/checkout@v2
      - uses: olegtarasov/get-tag@v2.1
      - uses: actions/setup-node@v2
        with:
          node-version: '16'
+
+      - name: Install Yarn
+        run: |
+          # https://yarnpkg.com/getting-started/install
+          corepack enable
      
      # Login to Docker only if we're on a server release tag. If we run this on
      # a pull request it will fail because the PR doesn't have access to
@@ -81,7 +74,6 @@ jobs:
          CSC_LINK: ${{ secrets.APPLE_CSC_LINK }}
          GH_TOKEN: ${{ secrets.GH_TOKEN }}
          IS_CONTINUOUS_INTEGRATION: 1
-          HAS_DOCKER_LABEL: ${{ contains(github.event.pull_request.labels.*.name, 'docker') }}
        run: |
          "${GITHUB_WORKSPACE}/.github/scripts/run_ci.sh"

@@ -93,6 +85,44 @@ jobs:
          GH_TOKEN: ${{ secrets.GH_TOKEN }}
          IS_CONTINUOUS_INTEGRATION: 1
        run: |
-          npm install
+          yarn install
          cd packages/app-desktop
-          npm run dist
+          yarn run dist
+
+  ServerDockerImage:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    steps:
+
+      - name: Install Docker Engine
+        run: |
+          sudo apt-get install -y apt-transport-https
+          sudo apt-get install -y ca-certificates
+          sudo apt-get install -y curl
+          sudo apt-get install -y gnupg
+          sudo apt-get install -y lsb-release
+          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+          echo \
+              "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
+              $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+          sudo apt-get update || true
+          sudo apt-get install -y docker-ce docker-ce-cli containerd.io
+
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+
+      - name: Install Yarn
+        run: |
+          # https://yarnpkg.com/getting-started/install
+          corepack enable
+
+      - name: Build Docker Image
+        run: |
+          yarn install
+          yarn run buildServerDocker --tag-name server-v0.0.0
+          
@@ -51,6 +51,17 @@ lerna-debug.log
 .env
 docs/**/*.mustache

+# Yarn stuff
+# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 packages/app-cli/app/LinkSelector.d.ts
 packages/app-cli/app/LinkSelector.js
@@ -688,9 +699,6 @@ packages/app-desktop/gui/style/StyledTextInput.js.map
 packages/app-desktop/gui/utils/NoteListUtils.d.ts
 packages/app-desktop/gui/utils/NoteListUtils.js
 packages/app-desktop/gui/utils/NoteListUtils.js.map
-packages/app-desktop/gui/utils/SyncScrollMap.d.ts
-packages/app-desktop/gui/utils/SyncScrollMap.js
-packages/app-desktop/gui/utils/SyncScrollMap.js.map
 packages/app-desktop/gui/utils/convertToScreenCoordinates.d.ts
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js.map
@@ -1495,9 +1503,6 @@ packages/lib/services/plugins/api/types.js.map
 packages/lib/services/plugins/reducer.d.ts
 packages/lib/services/plugins/reducer.js
 packages/lib/services/plugins/reducer.js.map
-packages/lib/services/plugins/sandboxProxy.d.ts
-packages/lib/services/plugins/sandboxProxy.js
-packages/lib/services/plugins/sandboxProxy.js.map
 packages/lib/services/plugins/utils/createViewHandle.d.ts
 packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/createViewHandle.js.map
@@ -1525,6 +1530,12 @@ packages/lib/services/plugins/utils/validatePluginId.js.map
 packages/lib/services/plugins/utils/validatePluginId.test.d.ts
 packages/lib/services/plugins/utils/validatePluginId.test.js
 packages/lib/services/plugins/utils/validatePluginId.test.js.map
+packages/lib/services/plugins/utils/validatePluginVersion.d.ts
+packages/lib/services/plugins/utils/validatePluginVersion.js
+packages/lib/services/plugins/utils/validatePluginVersion.js.map
+packages/lib/services/plugins/utils/validatePluginVersion.test.d.ts
+packages/lib/services/plugins/utils/validatePluginVersion.test.js
+packages/lib/services/plugins/utils/validatePluginVersion.test.js.map
 packages/lib/services/rest/Api.d.ts
 packages/lib/services/rest/Api.js
 packages/lib/services/rest/Api.js.map
@@ -1927,9 +1938,6 @@ packages/tools/generate-images.js.map
 packages/tools/git-changelog.d.ts
 packages/tools/git-changelog.js
 packages/tools/git-changelog.js.map
-packages/tools/lerna-add.d.ts
-packages/tools/lerna-add.js
-packages/tools/lerna-add.js.map
 packages/tools/release-android.d.ts
 packages/tools/release-android.js
 packages/tools/release-android.js.map
@@ -1942,6 +1950,9 @@ packages/tools/release-electron.js.map
 packages/tools/release-ios.d.ts
 packages/tools/release-ios.js
 packages/tools/release-ios.js.map
+packages/tools/release-plugin-repo-cli.d.ts
+packages/tools/release-plugin-repo-cli.js
+packages/tools/release-plugin-repo-cli.js.map
 packages/tools/release-server.d.ts
 packages/tools/release-server.js
 packages/tools/release-server.js.map
@@ -1960,9 +1971,18 @@ packages/tools/update-readme-download.js.map
 packages/tools/update-readme-sponsors.d.ts
 packages/tools/update-readme-sponsors.js
 packages/tools/update-readme-sponsors.js.map
+packages/tools/updateMarkdownDoc.d.ts
+packages/tools/updateMarkdownDoc.js
+packages/tools/updateMarkdownDoc.js.map
 packages/tools/website/build.d.ts
 packages/tools/website/build.js
 packages/tools/website/build.js.map
+packages/tools/website/updateDownloadPage.d.ts
+packages/tools/website/updateDownloadPage.js
+packages/tools/website/updateDownloadPage.js.map
+packages/tools/website/utils/frontMatter.d.ts
+packages/tools/website/utils/frontMatter.js
+packages/tools/website/utils/frontMatter.js.map
 packages/tools/website/utils/pressCarousel.d.ts
 packages/tools/website/utils/pressCarousel.js
 packages/tools/website/utils/pressCarousel.js.map
@@ -0,0 +1,9 @@
+nmHoistingLimits: workspaces
+
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
+
+yarnPath: .yarn/releases/yarn-3.1.1.cjs
@@ -523,12 +523,17 @@ div.navbar-mobile-content a.sponsor-button {

 .bottom-links {
 	display: flex;
+	flex-direction: row;
 	justify-content: center;
 	border-top: 1px solid #d4d4d4;
 	margin-top: 30px;
 	padding-top: 25px;
 }

+.bottom-links .bottom-link {
+	margin-right: 20px;
+}
+
 /* TOC */

 #toc ul {
@@ -652,6 +657,24 @@ footer .bottom-links-row p {
 	font-size: 1.1em;
 }

+/*****************************************************************
+ WHAT'S NEW PAGE
+*****************************************************************/
+
+.news-page      .container > .content-wrapper,
+.news-item-page .container > .content-wrapper {
+	/* Set the line width so that there's no more than 75 characters per line */
+	/* https://baymard.com/blog/line-length-readability */
+	max-width: 650px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.news-page     img,
+.news-item-page img {
+	max-width: 650px;
+}
+
 /*****************************************************************
 IN THE PRESS
 The "In the press" section height needs to be adjusted as the
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Laurent Cozic	389a9680b8	fix	2021-12-22 16:25:43 +01:00
Laurent Cozic	f0e9a49478	Merge branch 'dev' into server_delete_users	2021-12-22 16:02:59 +01:00
Laurent Cozic	cb3828150e	Chore: Remove docs directory, now moved to joplin/website repository	2021-12-22 12:12:21 +01:00
Laurent	cf05daffd4	Delete CNAME	2021-12-22 11:11:18 +00:00
Laurent Cozic	ec2870e3d5	Plugin Repo CLI v2.6.9	2021-12-22 12:03:41 +01:00
Laurent Cozic	af344601ec	Plugin repo: Fixing fetch tool	2021-12-22 12:01:51 +01:00
Laurent Cozic	bc9dac2feb	Plugin Repo: Add support for source maps	2021-12-22 11:32:56 +01:00
Laurent	780f2ea12b	Update CNAME	2021-12-21 19:09:19 +00:00
Laurent Cozic	58d0dc4b0b	Tools: Fixed website builder	2021-12-21 19:53:36 +01:00
Laurent Cozic	d458bd115e	Fixed share service on CLI	2021-12-21 18:52:27 +01:00
Laurent Cozic	6b6574e7c9	Desktop: Resolves #5893 : Expand search field when clicking on search button	2021-12-21 18:29:47 +01:00
Laurent Cozic	1ad5638ade	Update translations	2021-12-21 18:16:25 +01:00
Laurent Cozic	32ffbe7d70	Tools: Ignore certain files for translation	2021-12-21 18:10:59 +01:00
Laurent Cozic	e08359f7e0	Tools: Removed no longer needed double-dash and fixed CI	2021-12-21 17:55:30 +01:00
Laurent Cozic	106ce4b09d	Tools: Do not clear output of tsc watch	2021-12-21 12:43:12 +01:00
Laurent Cozic	7ca75718c3	Plugin Repo: Simplify publishing script	2021-12-21 12:38:05 +01:00
Laurent Cozic	721d00874f	All: Do no duplicate resources when duplicating a note	2021-12-21 11:03:55 +01:00
Laurent Cozic	ab5d799f3d	Tools: Maybe more stable with only up to 2 jobs	2021-12-21 11:00:32 +01:00
Laurent Cozic	bbe4d09260	Plugin Repo: Disallow invalid plugin version numbers	2021-12-21 10:51:37 +01:00
Joplin Bot	cf661b454b	Doc: Updated Markdown files Auto-updated using release-website.sh	2021-12-21 00:29:37 +00:00
Laurent Cozic	8f17fb7f71	Tools: Fixed tests	2021-12-20 17:24:45 +01:00
Laurent Cozic	a7a2dfbbd0	Tools: Allow the server clean command to run on Windows	2021-12-20 16:48:40 +01:00
Laurent	7f64fbfd9b	Tools: Use Yarn 3 to manage monorepo (#5833 )	2021-12-20 15:08:43 +00:00
Laurent Cozic	dea79fa3b7	Merge branch 'release-2.6' into dev	2021-12-20 16:03:14 +01:00
Laurent Cozic	51cc458e55	Android 2.6.9	2021-12-20 15:59:32 +01:00
Laurent Cozic	667d6420f2	All: Fixed issue where synchroniser would try to update a shared folder that is not longer accessible	2021-12-20 15:47:50 +01:00
Laurent Cozic	3316b9f880	Doc: Do not shuffle sponsors	2021-12-19 22:13:54 +01:00
Kenichi Kobayashi	8685bfaa18	Doc: Synchronous Scroll documentation/spec (#5883 )	2021-12-19 14:35:51 -05:00
Laurent Cozic	ebaf565117	Tools: Automatically update stats every 30 days	2021-12-19 18:26:30 +01:00
Joplin Bot	45f2faa641	Doc: Updated Markdown files Auto-updated using release-website.sh	2021-12-19 11:33:45 +00:00
Laurent Cozic	98fba37cd3	Desktop release v2.6.10	2021-12-19 11:58:42 +01:00
Laurent Cozic	5f1c78c0c1	Merge branch 'dev' into release-2.6	2021-12-19 11:58:15 +01:00
Laurent Cozic	2db2a1ccac	Desktop: Fixes #5879 (Regression): Fixed exporting notes that contain Mermaid diagrams as PDF or HTML	2021-12-19 11:55:18 +01:00
Laurent Cozic	78d2190767	Tools: Update release-website.sh	2021-12-19 10:49:00 +01:00
Laurent Cozic	2788521607	Tools: Update release-website.sh	2021-12-19 10:39:40 +01:00
Joplin Bot	2de344eeca	Doc: Updated Markdown files Auto-updated using release-website.sh	2021-12-19 09:34:43 +00:00
Laurent Cozic	19dba16099	Tools: Update release-website.sh	2021-12-19 10:25:34 +01:00
Laurent Cozic	d1c77bdcfa	Tools: Update release-website.sh	2021-12-19 10:23:49 +01:00
Laurent Cozic	b14956afbd	Tools: Build website to separate repository	2021-12-19 08:53:19 +01:00
Elaborendum	250e97247f	All: Translation: Update es_ES.po (#5880 )	2021-12-19 02:43:56 -05:00
NiceYoyo	41cb47b6c8	All: Translation: Update de_DE.po (#5877 ) Added new translations and edited one or two.	2021-12-18 18:40:24 -05:00
Laurent Cozic	2171132555	Doc: Add "discuss" link to news posts	2021-12-18 16:45:59 +01:00
Laurent Cozic	3e1b1ae749	Doc: Fixed width of news items	2021-12-18 16:31:08 +01:00
Laurent Cozic	8297d5a5c7	Tools: Fixed CLI tcp-port-used dependency	2021-12-18 16:25:59 +01:00
Daniel Landau	79a930597d	Doc: Add instructions for Docker on Linux (#5864 )	2021-12-18 15:16:57 +00:00
Kenichi Kobayashi	3a6380fa92	Doc: Fix sync-scroll comment to refer a correct URL (#5868 )	2021-12-18 15:16:00 +00:00
Kenichi Kobayashi	fe2eb25acb	Desktop: Fixes #5872 : Markdown search no longer scrolls to result (#5876 )	2021-12-18 15:14:57 +00:00
Laurent Cozic	5462ee635c	Desktop: Fixes #5873 (Regression): Fixed export of HTML files on Linux	2021-12-18 13:50:24 +01:00
Laurent Cozic	80ae845741	Update website	2021-12-17 18:59:44 +01:00
Laurent Cozic	5f4192e180	Doc: Fixed news page layout	2021-12-17 18:58:49 +01:00
Laurent Cozic	e1db70d45e	Update website	2021-12-17 18:39:16 +01:00
Laurent Cozic	a41994bfe9	Doc: Added "What's new" section to website	2021-12-17 18:37:01 +01:00
Laurent Cozic	2f1047e3eb	Doc: Import Patreon posts	2021-12-17 15:35:26 +01:00
Laurent Cozic	90363ec233	Tools: Set error code when building website fails	2021-12-17 15:08:52 +01:00
Laurent Cozic	14bef3a149	Update website	2021-12-17 13:35:57 +01:00
Laurent Cozic	db44b14aa4	title	2021-12-17 13:35:20 +01:00
Laurent Cozic	c3f5fad15c	Update website	2021-12-17 13:03:17 +01:00
Laurent Cozic	0e9dc0f272	CLI v2.6.2	2021-12-17 13:02:10 +01:00
Laurent Cozic	c0fd2274ee	Releasing sub-packages	2021-12-17 13:02:09 +01:00
Laurent Cozic	5cfdb8d39b	Desktop release v2.6.9	2021-12-17 13:02:09 +01:00
Laurent Cozic	64bd7bf994	timesteamp	2021-12-17 13:02:08 +01:00
Laurent Cozic	bca25c2d4c	fix iOS build	2021-12-17 13:02:05 +01:00
Laurent Cozic	b08fee3919	lock file	2021-12-17 13:01:39 +01:00
Laurent Cozic	7c3cf8ce84	Merge branch 'dev' into release-2.6	2021-12-17 12:59:03 +01:00
Laurent Cozic	c8f4c3f4ee	CLI v2.6.2	2021-12-17 12:20:13 +01:00
Laurent Cozic	95e79d5dc0	Releasing sub-packages	2021-12-17 12:17:21 +01:00
Laurent Cozic	58654d35a2	Desktop release v2.6.9	2021-12-17 12:11:59 +01:00
Laurent Cozic	14bef046f9	timesteamp	2021-12-17 12:11:45 +01:00
Laurent Cozic	7f169807ca	Android 2.6.8	2021-12-17 11:15:33 +01:00
Laurent Cozic	514c3437b3	iOS 12.6.2	2021-12-17 11:04:24 +01:00
Laurent Cozic	552e78c4cd	Set iOS min supported version to 11.0	2021-12-17 11:04:23 +01:00
Laurent Cozic	c7031f29d0	Desktop release v2.6.8	2021-12-17 11:04:23 +01:00
Laurent Cozic	db3fc3a827	fix iOS build	2021-12-17 11:04:23 +01:00
Laurent Cozic	6e133b0725	lock file	2021-12-17 11:04:22 +01:00
Laurent Cozic	9e0bbdf912	iOS 12.6.2	2021-12-17 10:59:27 +01:00
Laurent Cozic	9eacb6eb1b	Set iOS min supported version to 11.0	2021-12-17 10:59:07 +01:00
Laurent Cozic	97c5493bc1	Desktop release v2.6.8	2021-12-17 01:21:04 +01:00
Laurent Cozic	eb960a516c	Merge branch 'dev' into release-2.6	2021-12-17 01:19:45 +01:00
Laurent Cozic	3200224b6f	fix iOS build	2021-12-17 01:18:28 +01:00
Laurent Cozic	98b55cbe73	lock file	2021-12-17 01:18:28 +01:00
Laurent Cozic	87e44e9381	ios-v12.6.1	2021-12-17 01:18:27 +01:00
Laurent Cozic	fb5ffa562f	fix iOS build	2021-12-17 01:18:08 +01:00
Laurent Cozic	1cb62d8357	Update translations	2021-12-17 01:16:46 +01:00
Laurent Cozic	4faba40b1e	translations	2021-12-17 01:12:30 +01:00
Laurent Cozic	d1508ce8f2	Update translations	2021-12-17 00:47:01 +01:00
Laurent Cozic	c26ce462e8	Fix AWS string names	2021-12-17 00:45:00 +01:00
Laurent Cozic	f761e9021b	Tools: Auto-create iOS changelog	2021-12-16 17:10:17 +01:00
Laurent Cozic	586542e15e	Tools: Throw an error if IPHONEOS_DEPLOYMENT_TARGET versions do not match in pbxproj file	2021-12-16 17:04:52 +01:00
Laurent Cozic	864b3c710c	lock file	2021-12-16 14:02:19 +01:00
Laurent Cozic	198287f86a	ios-v12.6.1	2021-12-16 13:55:54 +01:00
Laurent Cozic	b903542aed	Merge branch 'dev' into release-2.6	2021-12-16 13:54:32 +01:00
Laurent Cozic	10c6af8aa7	Fixed tests	2021-12-16 11:42:33 +01:00
Laurent Cozic	e9ce3d194c	Server: Changed ID length from 32 to 22 characters Should still prevent collisions for 60 times the age of the Universe	2021-12-16 11:27:22 +01:00
Laurent Cozic	83a46e563d	Server: Disable logs and items pages for end-user These pages don't provide very useful information, even possibly confusing and could probably be used to DoS the server since the associated requests are not optimised.	2021-12-16 11:18:35 +01:00
Laurent Cozic	aa42cebbca	Server: Setup localisation	2021-12-16 11:08:43 +01:00
Laurent Cozic	9c0982dcab	Android 2.6.7	2021-12-16 11:08:32 +01:00
Laurent Cozic	23de363548	Desktop release v2.6.7	2021-12-16 11:08:32 +01:00
Laurent Cozic	bda4c3a667	Android 2.6.7	2021-12-16 11:08:08 +01:00
Laurent Cozic	4a1bc075ac	Server: Display NTP server domain and port when there is an error, and display message when NTP check is skipped	2021-12-16 10:53:28 +01:00
Laurent Cozic	23617c9409	Desktop release v2.6.7	2021-12-16 10:34:49 +01:00
Laurent Cozic	39196fa582	lock file	2021-12-16 10:34:26 +01:00
Gen Neko	28c6f91ac3	All: Translation: Update ja_JP.po (#5862 )	2021-12-16 02:55:37 -05:00
Kenichi Kobayashi	5c82e439a7	Desktop: Fixes #5708 : Scroll positions are preserved (#5826 ) Features: - Scroll position is preserved when the editor layout changes. - Scroll position is remembered when a note selection changes. Modifications: - The current Sync Scroll feature (in v2.6.2) is modified to use line-percent-based scroll positions. - Scroll position translation functions, Viewer-to-Editor and Editor-to-Viewer, are separated into V2L / L2E and E2L / L2V respectively. - The scrollmap is moved from gui/utils/SyncScrollMap.ts to note-viewer/scrollmap.js. - IPC Protocol about the scrollmap becomes not necessary and is removed. - Ignores non-user scroll events to avoid sync with incorrect scroll positions. - When CodeMirror is not ready, setEditorPercentScroll() is waited. - Fixes the bug: An incorrect scroll position is sometimes recorded. - Since scroll positions become line-percent-based, the following incompatibilities of scroll positions are fixed: - Between Editor and Viewer. - Between Viewer Layout and Split Layout of Viewer - Between Editor Layout and Split Layout of Editor	2021-12-15 18:03:20 +00:00
Laurent Cozic	92c84519ed	fix pr	2021-12-15 17:46:09 +01:00
Laurent Cozic	8b99023941	Merge branch 'dev' into server_delete_users	2021-12-15 17:44:37 +01:00
Laurent Cozic	2eb32485bc	fixed tests	2021-12-15 17:42:04 +01:00
Laurent Cozic	efc357300c	share tests	2021-12-15 17:24:15 +01:00
Laurent Cozic	b0b1890926	ui	2021-12-15 17:12:26 +01:00
Laurent Cozic	58132ba43c	ui	2021-12-15 12:39:23 +01:00
Helmut K. C. Tessarek	a4aa40dde8	Update translations	2021-12-14 17:44:19 -05:00
Laurent Cozic	ae8feb7446	tests	2021-12-14 18:37:18 +01:00
Laurent Cozic	fd9e30bca9	tests	2021-12-14 17:28:00 +01:00
Laurent Cozic	bbd6490790	tests	2021-12-14 17:18:34 +01:00
Laurent Cozic	8dc2e6abcf	tests	2021-12-14 16:29:37 +01:00
Laurent	b40d9bd8a1	Doc: Removed sponsor	2021-12-14 12:27:01 +00:00
Laurent Cozic	731ada9d1c	Merge branch 'dev' into server_delete_users	2021-12-14 11:11:41 +01:00
Laurent Cozic	4ad4fdee49	Doc: Update Discord link	2021-12-13 16:53:26 +01:00
Kenichi Kobayashi	7ce9ae11c7	Desktop: Added detailed tooltip for 'Toggle Sort Order Field' button (#5854 )	2021-12-13 15:29:23 +00:00
Laurent Cozic	deb300326b	Android 2.6.6	2021-12-13 13:32:34 +01:00
Laurent Cozic	227c9dcfee	Desktop release v2.6.6	2021-12-13 11:52:48 +01:00
Laurent Cozic	28c7b717f3	lock file	2021-12-13 11:52:35 +01:00
Helmut K. C. Tessarek	c499473467	All: fixes #5801 : Links in flowchart Mermaid diagrams (#5830 )	2021-12-13 10:38:12 +00:00
xaa	7fa278f875	Update fr_FR.po (#5750 )	2021-12-13 10:36:07 +00:00
Helmut K. C. Tessarek	06e427fc5a	All: Update Mermaid: 8.12.1 -> 8.13.5 (#5831 )	2021-12-13 10:35:21 +00:00
Daeraxa	51f7dc9ab8	Desktop: Changed note sort buttons to 3px radius (#5771 )	2021-12-13 10:34:54 +00:00
Laurent Cozic	eca964b03b	Android 2.6.5	2021-12-13 10:41:32 +01:00
Laurent Cozic	bfcc02a769	Desktop release v2.6.5	2021-12-13 10:34:21 +01:00
Laurent Cozic	7c42688072	Merge branch 'dev' into release-2.6	2021-12-13 10:34:01 +01:00
Laurent Cozic	e0e93c436b	All: Fixed "Invalid lock client type" error when migrating sync target	2021-12-13 10:32:22 +01:00
Daeraxa	78c5877c65	Docs: Added richtext editor improvement ideas (#5848 )	2021-12-10 18:34:55 +00:00
Laurent Cozic	9767b659c2	Desktop release v2.6.4	2021-12-09 20:18:39 +01:00
Laurent Cozic	4b6210802b	Tools: Trying to go back to windows-2016 to fix CI build	2021-12-09 20:18:38 +01:00
Laurent Cozic	9f0def64f3	Desktop release v2.6.3	2021-12-09 20:18:38 +01:00
Laurent Cozic	16c94d95cb	Desktop release v2.6.4	2021-12-09 20:18:17 +01:00
Laurent Cozic	03c8942a74	Tools: Trying to go back to windows-2016 to fix CI build	2021-12-09 20:18:04 +01:00
Laurent Cozic	1626170ea6	Desktop release v2.6.3	2021-12-09 10:22:32 +01:00
Laurent Cozic	fd03ab4f47	Merge branch 'dev' into release-2.6	2021-12-09 10:22:09 +01:00
Laurent Cozic	684857752f	Server v2.6.14	2021-12-09 10:20:47 +01:00
NiceYoyo	95f88d0f2c	All: Translation: Update de_DE.po (#5829 ) Added some translations and edited flagged ones. I also changed some translations from formal "Sie" to informal "Du", as it is used more often through the translation.	2021-12-05 22:28:16 -05:00
Laurent Cozic	27b80d94f9	Doc: Added GSoC idea: Convert the monorepo to use npm or yarn workspaces	2021-12-05 19:55:43 +00:00
Laurent Cozic	77d4766518	delete	2021-12-05 13:48:39 +00:00
Laurent Cozic	3ddfa0b774	Doc: Added GSoC idea: Implement a toolbar for the mobile beta code editor	2021-12-03 19:15:16 +00:00
Laurent Cozic	bc368ee331	delete users	2021-12-03 17:31:03 +00:00
Laurent Cozic	35f684a1ee	Server: Increase default MAX_TIME_DRIFT to 2000	2021-12-03 12:24:29 +00:00
Caleb John	aac044fc9c	Desktop: Fixes #5311 : Rich text editor flashing white when switching notes/editor (#5793 )	2021-12-03 12:23:31 +00:00
Laurent Cozic	9cbc3b3096	Server v2.6.14	2021-12-02 16:30:06 +00:00
Laurent Cozic	122afd6d46	Server: Improved storage command	2021-12-02 11:27:22 +00:00
Laurent Cozic	75c67b7d78	Tools: Fixed getting the latest release from GitHub	2021-12-01 16:17:04 +00:00
Amin Vakil	33822295ef	Tools: Use latest minor release of Postgres 13 in sample docker-compose files (#5797 )	2021-12-01 13:52:38 +00:00
Stephanos Komnenos	a5b1255f45	Desktop: Allow flags for native wayland (#5804 )	2021-12-01 13:51:42 +00:00
Laurent	62f4396ffe	Tools: Use windows-latest to build desktop app on CI (#5809 )	2021-12-01 13:51:11 +00:00
Laurent Cozic	7384ad0001	Android 2.6.4	2021-12-01 11:45:46 +00:00
Laurent Cozic	6361ae3736	Tools: Fixed Android build	2021-12-01 11:09:16 +00:00
Laurent	6bbf053a4f	Tools: Run Joplin Server Postgres tests on CI (#5807 )	2021-11-30 15:37:07 +00:00
Laurent Cozic	6eec0dd58e	Server v2.6.13	2021-11-29 18:41:53 +00:00
Laurent Cozic	dc67eace24	Server: Allow disabling NTP time drift check	2021-11-29 18:39:07 +00:00
Laurent Cozic	4fecb083a7	Server: Optimise reading from external storage when fallback driver is not present	2021-11-29 18:28:39 +00:00
Laurent Cozic	ef23d99b47	Added tests	2021-11-29 17:51:41 +00:00
Laurent Cozic	01048f5971	Server: Added command to delete database item content	2021-11-29 17:27:40 +00:00
Laurent Cozic	06ce4adc20	iOS: Resolves #5705 (partially): Ping joplinapp.org domain instead of Google when doing the WiFi connection check	2021-11-29 12:51:11 +00:00
Laurent Cozic	2fd8f39293	Update clipper button text	2021-11-29 11:24:34 +00:00
Laurent Cozic	3627fa14e1	Clipper: Fixes #5675 : Notebook selection list could be too wide	2021-11-29 11:14:41 +00:00
Laurent Cozic	6950c40b12	Android: Fixed opening attachments	2021-11-29 10:37:06 +00:00
Laurent Cozic	a6884a2ee4	Server: Remove unique constraint errors from the log when they are already handled by the application	2021-11-29 10:17:13 +00:00
Laurent Cozic	7eb1d89d66	Server: Retry NTP request up to three times when it fails	2021-11-29 10:17:12 +00:00
MovingEarth	920847245f	Server: Do not set the SMTP auth option when user or password are not set (#5791 )	2021-11-28 19:45:07 +00:00
Laurent Cozic	605f12552e	All: Fixes #5796 : Handle duplicate attachments when the parent notebook is shared	2021-11-28 16:46:44 +00:00
Laurent	0689db48de	Doc: Added GSoC idea: Implement default plugins on desktop application	2021-11-28 15:16:36 +00:00
Roman Musin	f224282a27	Android: Fixes #5216 : Alarms were not being triggered in some cases (#5798 )	2021-11-27 16:22:30 +00:00
Laurent Cozic	c0a8c330a9	All: Also duplicate resources when duplicating a note Ref: https://github.com/laurent22/joplin/issues/5796	2021-11-27 16:05:28 +00:00
Laurent Cozic	4ce58fa486	Mobile: Fixes #5777 : Alarm setting buttons were no longer visible	2021-11-27 15:22:14 +00:00
Rishabhraghwendra18	171b4b126d	Doc: Update build doc (#5795 )	2021-11-27 10:30:45 +00:00
Laurent Cozic	e4742f8b6a	Update website	2021-11-26 18:15:05 +00:00
Laurent Cozic	a3703cc895	lock files	2021-11-26 18:13:23 +00:00
Laurent Cozic	ab6aeb7455	Doc: Fixed Android download links	2021-11-26 12:17:25 +00:00
Aryan	d96f8ee228	Doc: Updated dependencies for Linux (#5743 )	2021-11-24 23:07:26 +00:00
Lee Matos	5981227c06	All: Improved S3 sync error handling and reliability, and upgraded S3 SDK (#5312 )	2021-11-24 23:03:03 +00:00