trying

improve terms and some typo in zh_TW.po

.eslintignore

@@ -97,6 +97,9 @@ packages/app-cli/tests/Synchronizer.resources.js.map
 packages/app-cli/tests/Synchronizer.revisions.d.ts
 packages/app-cli/tests/Synchronizer.revisions.js
 packages/app-cli/tests/Synchronizer.revisions.js.map
+packages/app-cli/tests/Synchronizer.sharing.d.ts
+packages/app-cli/tests/Synchronizer.sharing.js
+packages/app-cli/tests/Synchronizer.sharing.js.map
 packages/app-cli/tests/Synchronizer.tags.d.ts
 packages/app-cli/tests/Synchronizer.tags.js
 packages/app-cli/tests/Synchronizer.tags.js.map
@@ -787,15 +790,18 @@ packages/lib/BaseApplication.js.map
 packages/lib/BaseModel.d.ts
 packages/lib/BaseModel.js
 packages/lib/BaseModel.js.map
+packages/lib/BaseSyncTarget.d.ts
+packages/lib/BaseSyncTarget.js
+packages/lib/BaseSyncTarget.js.map
 packages/lib/InMemoryCache.d.ts
 packages/lib/InMemoryCache.js
 packages/lib/InMemoryCache.js.map
+packages/lib/JoplinDatabase.d.ts
+packages/lib/JoplinDatabase.js
+packages/lib/JoplinDatabase.js.map
 packages/lib/JoplinServerApi.d.ts
 packages/lib/JoplinServerApi.js
 packages/lib/JoplinServerApi.js.map
-packages/lib/JoplinServerApi2.d.ts
-packages/lib/JoplinServerApi2.js
-packages/lib/JoplinServerApi2.js.map
 packages/lib/Logger.d.ts
 packages/lib/Logger.js
 packages/lib/Logger.js.map
@@ -820,6 +826,9 @@ packages/lib/commands/historyForward.js.map
 packages/lib/commands/synchronize.d.ts
 packages/lib/commands/synchronize.js
 packages/lib/commands/synchronize.js.map
+packages/lib/database.d.ts
+packages/lib/database.js
+packages/lib/database.js.map
 packages/lib/dummy.test.d.ts
 packages/lib/dummy.test.js
 packages/lib/dummy.test.js.map
@@ -832,6 +841,9 @@ packages/lib/eventManager.js.map
 packages/lib/file-api-driver-joplinServer.d.ts
 packages/lib/file-api-driver-joplinServer.js
 packages/lib/file-api-driver-joplinServer.js.map
+packages/lib/file-api.d.ts
+packages/lib/file-api.js
+packages/lib/file-api.js.map
 packages/lib/fs-driver-base.d.ts
 packages/lib/fs-driver-base.js
 packages/lib/fs-driver-base.js.map
@@ -922,6 +934,9 @@ packages/lib/path-utils.js.map
 packages/lib/reducer.d.ts
 packages/lib/reducer.js
 packages/lib/reducer.js.map
+packages/lib/registry.d.ts
+packages/lib/registry.js
+packages/lib/registry.js.map
 packages/lib/services/AlarmService.d.ts
 packages/lib/services/AlarmService.js
 packages/lib/services/AlarmService.js.map
@@ -1438,219 +1453,9 @@ packages/renderer/pathUtils.js.map
 packages/renderer/utils.d.ts
 packages/renderer/utils.js
 packages/renderer/utils.js.map
-packages/server/src/app.d.ts
-packages/server/src/app.js
-packages/server/src/app.js.map
-packages/server/src/config.d.ts
-packages/server/src/config.js
-packages/server/src/config.js.map
-packages/server/src/db.d.ts
-packages/server/src/db.js
-packages/server/src/db.js.map
-packages/server/src/middleware/notificationHandler.d.ts
-packages/server/src/middleware/notificationHandler.js
-packages/server/src/middleware/notificationHandler.js.map
-packages/server/src/middleware/notificationHandler.test.d.ts
-packages/server/src/middleware/notificationHandler.test.js
-packages/server/src/middleware/notificationHandler.test.js.map
-packages/server/src/middleware/ownerHandler.d.ts
-packages/server/src/middleware/ownerHandler.js
-packages/server/src/middleware/ownerHandler.js.map
-packages/server/src/middleware/ownerHandler.test.d.ts
-packages/server/src/middleware/ownerHandler.test.js
-packages/server/src/middleware/ownerHandler.test.js.map
-packages/server/src/middleware/routeHandler.d.ts
-packages/server/src/middleware/routeHandler.js
-packages/server/src/middleware/routeHandler.js.map
-packages/server/src/migrations/20190913171451_create.d.ts
-packages/server/src/migrations/20190913171451_create.js
-packages/server/src/migrations/20190913171451_create.js.map
-packages/server/src/migrations/20203012152842_notifications.d.ts
-packages/server/src/migrations/20203012152842_notifications.js
-packages/server/src/migrations/20203012152842_notifications.js.map
-packages/server/src/models/ApiClientModel.d.ts
-packages/server/src/models/ApiClientModel.js
-packages/server/src/models/ApiClientModel.js.map
-packages/server/src/models/BaseModel.d.ts
-packages/server/src/models/BaseModel.js
-packages/server/src/models/BaseModel.js.map
-packages/server/src/models/ChangeModel.d.ts
-packages/server/src/models/ChangeModel.js
-packages/server/src/models/ChangeModel.js.map
-packages/server/src/models/ChangeModel.test.d.ts
-packages/server/src/models/ChangeModel.test.js
-packages/server/src/models/ChangeModel.test.js.map
-packages/server/src/models/FileModel.d.ts
-packages/server/src/models/FileModel.js
-packages/server/src/models/FileModel.js.map
-packages/server/src/models/FileModel.test.d.ts
-packages/server/src/models/FileModel.test.js
-packages/server/src/models/FileModel.test.js.map
-packages/server/src/models/NotificationModel.d.ts
-packages/server/src/models/NotificationModel.js
-packages/server/src/models/NotificationModel.js.map
-packages/server/src/models/NotificationModel.test.d.ts
-packages/server/src/models/NotificationModel.test.js
-packages/server/src/models/NotificationModel.test.js.map
-packages/server/src/models/PermissionModel.d.ts
-packages/server/src/models/PermissionModel.js
-packages/server/src/models/PermissionModel.js.map
-packages/server/src/models/SessionModel.d.ts
-packages/server/src/models/SessionModel.js
-packages/server/src/models/SessionModel.js.map
-packages/server/src/models/UserModel.d.ts
-packages/server/src/models/UserModel.js
-packages/server/src/models/UserModel.js.map
-packages/server/src/models/UserModel.test.d.ts
-packages/server/src/models/UserModel.test.js
-packages/server/src/models/UserModel.test.js.map
-packages/server/src/models/factory.d.ts
-packages/server/src/models/factory.js
-packages/server/src/models/factory.js.map
-packages/server/src/models/utils/pagination.d.ts
-packages/server/src/models/utils/pagination.js
-packages/server/src/models/utils/pagination.js.map
-packages/server/src/models/utils/pagination.test.d.ts
-packages/server/src/models/utils/pagination.test.js
-packages/server/src/models/utils/pagination.test.js.map
-packages/server/src/routes/api/files.d.ts
-packages/server/src/routes/api/files.js
-packages/server/src/routes/api/files.js.map
-packages/server/src/routes/api/files.test.d.ts
-packages/server/src/routes/api/files.test.js
-packages/server/src/routes/api/files.test.js.map
-packages/server/src/routes/api/ping.d.ts
-packages/server/src/routes/api/ping.js
-packages/server/src/routes/api/ping.js.map
-packages/server/src/routes/api/ping.test.d.ts
-packages/server/src/routes/api/ping.test.js
-packages/server/src/routes/api/ping.test.js.map
-packages/server/src/routes/api/sessions.d.ts
-packages/server/src/routes/api/sessions.js
-packages/server/src/routes/api/sessions.js.map
-packages/server/src/routes/api/sessions.test.d.ts
-packages/server/src/routes/api/sessions.test.js
-packages/server/src/routes/api/sessions.test.js.map
-packages/server/src/routes/default.d.ts
-packages/server/src/routes/default.js
-packages/server/src/routes/default.js.map
-packages/server/src/routes/index/files.d.ts
-packages/server/src/routes/index/files.js
-packages/server/src/routes/index/files.js.map
-packages/server/src/routes/index/home.d.ts
-packages/server/src/routes/index/home.js
-packages/server/src/routes/index/home.js.map
-packages/server/src/routes/index/home.test.d.ts
-packages/server/src/routes/index/home.test.js
-packages/server/src/routes/index/home.test.js.map
-packages/server/src/routes/index/login.d.ts
-packages/server/src/routes/index/login.js
-packages/server/src/routes/index/login.js.map
-packages/server/src/routes/index/login.test.d.ts
-packages/server/src/routes/index/login.test.js
-packages/server/src/routes/index/login.test.js.map
-packages/server/src/routes/index/logout.d.ts
-packages/server/src/routes/index/logout.js
-packages/server/src/routes/index/logout.js.map
-packages/server/src/routes/index/logout.test.d.ts
-packages/server/src/routes/index/logout.test.js
-packages/server/src/routes/index/logout.test.js.map
-packages/server/src/routes/index/notifications.d.ts
-packages/server/src/routes/index/notifications.js
-packages/server/src/routes/index/notifications.js.map
-packages/server/src/routes/index/notifications.test.d.ts
-packages/server/src/routes/index/notifications.test.js
-packages/server/src/routes/index/notifications.test.js.map
-packages/server/src/routes/index/users.d.ts
-packages/server/src/routes/index/users.js
-packages/server/src/routes/index/users.js.map
-packages/server/src/routes/index/users.test.d.ts
-packages/server/src/routes/index/users.test.js
-packages/server/src/routes/index/users.test.js.map
-packages/server/src/routes/oauth2/authorize.d.ts
-packages/server/src/routes/oauth2/authorize.js
-packages/server/src/routes/oauth2/authorize.js.map
-packages/server/src/routes/routes.d.ts
-packages/server/src/routes/routes.js
-packages/server/src/routes/routes.js.map
-packages/server/src/services/MustacheService.d.ts
-packages/server/src/services/MustacheService.js
-packages/server/src/services/MustacheService.js.map
-packages/server/src/tools/db-migrate.d.ts
-packages/server/src/tools/db-migrate.js
-packages/server/src/tools/db-migrate.js.map
-packages/server/src/tools/dbTools.d.ts
-packages/server/src/tools/dbTools.js
-packages/server/src/tools/dbTools.js.map
-packages/server/src/tools/generate-types.d.ts
-packages/server/src/tools/generate-types.js
-packages/server/src/tools/generate-types.js.map
-packages/server/src/utils/Router.d.ts
-packages/server/src/utils/Router.js
-packages/server/src/utils/Router.js.map
-packages/server/src/utils/TransactionHandler.d.ts
-packages/server/src/utils/TransactionHandler.js
-packages/server/src/utils/TransactionHandler.js.map
-packages/server/src/utils/auth.d.ts
-packages/server/src/utils/auth.js
-packages/server/src/utils/auth.js.map
-packages/server/src/utils/base64.d.ts
-packages/server/src/utils/base64.js
-packages/server/src/utils/base64.js.map
-packages/server/src/utils/cache.d.ts
-packages/server/src/utils/cache.js
-packages/server/src/utils/cache.js.map
-packages/server/src/utils/defaultView.d.ts
-packages/server/src/utils/defaultView.js
-packages/server/src/utils/defaultView.js.map
-packages/server/src/utils/errors.d.ts
-packages/server/src/utils/errors.js
-packages/server/src/utils/errors.js.map
-packages/server/src/utils/htmlUtils.d.ts
-packages/server/src/utils/htmlUtils.js
-packages/server/src/utils/htmlUtils.js.map
-packages/server/src/utils/koaIf.d.ts
-packages/server/src/utils/koaIf.js
-packages/server/src/utils/koaIf.js.map
-packages/server/src/utils/requestUtils.d.ts
-packages/server/src/utils/requestUtils.js
-packages/server/src/utils/requestUtils.js.map
-packages/server/src/utils/routeUtils.d.ts
-packages/server/src/utils/routeUtils.js
-packages/server/src/utils/routeUtils.js.map
-packages/server/src/utils/routeUtils.test.d.ts
-packages/server/src/utils/routeUtils.test.js
-packages/server/src/utils/routeUtils.test.js.map
-packages/server/src/utils/testing/apiUtils.d.ts
-packages/server/src/utils/testing/apiUtils.js
-packages/server/src/utils/testing/apiUtils.js.map
-packages/server/src/utils/testing/koa/FakeCookies.d.ts
-packages/server/src/utils/testing/koa/FakeCookies.js
-packages/server/src/utils/testing/koa/FakeCookies.js.map
-packages/server/src/utils/testing/koa/FakeRequest.d.ts
-packages/server/src/utils/testing/koa/FakeRequest.js
-packages/server/src/utils/testing/koa/FakeRequest.js.map
-packages/server/src/utils/testing/koa/FakeResponse.d.ts
-packages/server/src/utils/testing/koa/FakeResponse.js
-packages/server/src/utils/testing/koa/FakeResponse.js.map
-packages/server/src/utils/testing/testRouters.d.ts
-packages/server/src/utils/testing/testRouters.js
-packages/server/src/utils/testing/testRouters.js.map
-packages/server/src/utils/testing/testUtils.d.ts
-packages/server/src/utils/testing/testUtils.js
-packages/server/src/utils/testing/testUtils.js.map
-packages/server/src/utils/time.d.ts
-packages/server/src/utils/time.js
-packages/server/src/utils/time.js.map
-packages/server/src/utils/types.d.ts
-packages/server/src/utils/types.js
-packages/server/src/utils/types.js.map
-packages/server/src/utils/urlUtils.d.ts
-packages/server/src/utils/urlUtils.js
-packages/server/src/utils/urlUtils.js.map
-packages/server/src/utils/uuidgen.d.ts
-packages/server/src/utils/uuidgen.js
-packages/server/src/utils/uuidgen.js.map
+packages/tools/generate-database-types.d.ts
+packages/tools/generate-database-types.js
+packages/tools/generate-database-types.js.map
 packages/tools/lerna-add.d.ts
 packages/tools/lerna-add.js
 packages/tools/lerna-add.js.map

.gitignore

@@ -84,6 +84,9 @@ packages/app-cli/tests/Synchronizer.resources.js.map
 packages/app-cli/tests/Synchronizer.revisions.d.ts
 packages/app-cli/tests/Synchronizer.revisions.js
 packages/app-cli/tests/Synchronizer.revisions.js.map
+packages/app-cli/tests/Synchronizer.sharing.d.ts
+packages/app-cli/tests/Synchronizer.sharing.js
+packages/app-cli/tests/Synchronizer.sharing.js.map
 packages/app-cli/tests/Synchronizer.tags.d.ts
 packages/app-cli/tests/Synchronizer.tags.js
 packages/app-cli/tests/Synchronizer.tags.js.map
@@ -774,15 +777,18 @@ packages/lib/BaseApplication.js.map
 packages/lib/BaseModel.d.ts
 packages/lib/BaseModel.js
 packages/lib/BaseModel.js.map
+packages/lib/BaseSyncTarget.d.ts
+packages/lib/BaseSyncTarget.js
+packages/lib/BaseSyncTarget.js.map
 packages/lib/InMemoryCache.d.ts
 packages/lib/InMemoryCache.js
 packages/lib/InMemoryCache.js.map
+packages/lib/JoplinDatabase.d.ts
+packages/lib/JoplinDatabase.js
+packages/lib/JoplinDatabase.js.map
 packages/lib/JoplinServerApi.d.ts
 packages/lib/JoplinServerApi.js
 packages/lib/JoplinServerApi.js.map
-packages/lib/JoplinServerApi2.d.ts
-packages/lib/JoplinServerApi2.js
-packages/lib/JoplinServerApi2.js.map
 packages/lib/Logger.d.ts
 packages/lib/Logger.js
 packages/lib/Logger.js.map
@@ -807,6 +813,9 @@ packages/lib/commands/historyForward.js.map
 packages/lib/commands/synchronize.d.ts
 packages/lib/commands/synchronize.js
 packages/lib/commands/synchronize.js.map
+packages/lib/database.d.ts
+packages/lib/database.js
+packages/lib/database.js.map
 packages/lib/dummy.test.d.ts
 packages/lib/dummy.test.js
 packages/lib/dummy.test.js.map
@@ -819,6 +828,9 @@ packages/lib/eventManager.js.map
 packages/lib/file-api-driver-joplinServer.d.ts
 packages/lib/file-api-driver-joplinServer.js
 packages/lib/file-api-driver-joplinServer.js.map
+packages/lib/file-api.d.ts
+packages/lib/file-api.js
+packages/lib/file-api.js.map
 packages/lib/fs-driver-base.d.ts
 packages/lib/fs-driver-base.js
 packages/lib/fs-driver-base.js.map
@@ -909,6 +921,9 @@ packages/lib/path-utils.js.map
 packages/lib/reducer.d.ts
 packages/lib/reducer.js
 packages/lib/reducer.js.map
+packages/lib/registry.d.ts
+packages/lib/registry.js
+packages/lib/registry.js.map
 packages/lib/services/AlarmService.d.ts
 packages/lib/services/AlarmService.js
 packages/lib/services/AlarmService.js.map
@@ -1425,219 +1440,9 @@ packages/renderer/pathUtils.js.map
 packages/renderer/utils.d.ts
 packages/renderer/utils.js
 packages/renderer/utils.js.map
-packages/server/src/app.d.ts
-packages/server/src/app.js
-packages/server/src/app.js.map
-packages/server/src/config.d.ts
-packages/server/src/config.js
-packages/server/src/config.js.map
-packages/server/src/db.d.ts
-packages/server/src/db.js
-packages/server/src/db.js.map
-packages/server/src/middleware/notificationHandler.d.ts
-packages/server/src/middleware/notificationHandler.js
-packages/server/src/middleware/notificationHandler.js.map
-packages/server/src/middleware/notificationHandler.test.d.ts
-packages/server/src/middleware/notificationHandler.test.js
-packages/server/src/middleware/notificationHandler.test.js.map
-packages/server/src/middleware/ownerHandler.d.ts
-packages/server/src/middleware/ownerHandler.js
-packages/server/src/middleware/ownerHandler.js.map
-packages/server/src/middleware/ownerHandler.test.d.ts
-packages/server/src/middleware/ownerHandler.test.js
-packages/server/src/middleware/ownerHandler.test.js.map
-packages/server/src/middleware/routeHandler.d.ts
-packages/server/src/middleware/routeHandler.js
-packages/server/src/middleware/routeHandler.js.map
-packages/server/src/migrations/20190913171451_create.d.ts
-packages/server/src/migrations/20190913171451_create.js
-packages/server/src/migrations/20190913171451_create.js.map
-packages/server/src/migrations/20203012152842_notifications.d.ts
-packages/server/src/migrations/20203012152842_notifications.js
-packages/server/src/migrations/20203012152842_notifications.js.map
-packages/server/src/models/ApiClientModel.d.ts
-packages/server/src/models/ApiClientModel.js
-packages/server/src/models/ApiClientModel.js.map
-packages/server/src/models/BaseModel.d.ts
-packages/server/src/models/BaseModel.js
-packages/server/src/models/BaseModel.js.map
-packages/server/src/models/ChangeModel.d.ts
-packages/server/src/models/ChangeModel.js
-packages/server/src/models/ChangeModel.js.map
-packages/server/src/models/ChangeModel.test.d.ts
-packages/server/src/models/ChangeModel.test.js
-packages/server/src/models/ChangeModel.test.js.map
-packages/server/src/models/FileModel.d.ts
-packages/server/src/models/FileModel.js
-packages/server/src/models/FileModel.js.map
-packages/server/src/models/FileModel.test.d.ts
-packages/server/src/models/FileModel.test.js
-packages/server/src/models/FileModel.test.js.map
-packages/server/src/models/NotificationModel.d.ts
-packages/server/src/models/NotificationModel.js
-packages/server/src/models/NotificationModel.js.map
-packages/server/src/models/NotificationModel.test.d.ts
-packages/server/src/models/NotificationModel.test.js
-packages/server/src/models/NotificationModel.test.js.map
-packages/server/src/models/PermissionModel.d.ts
-packages/server/src/models/PermissionModel.js
-packages/server/src/models/PermissionModel.js.map
-packages/server/src/models/SessionModel.d.ts
-packages/server/src/models/SessionModel.js
-packages/server/src/models/SessionModel.js.map
-packages/server/src/models/UserModel.d.ts
-packages/server/src/models/UserModel.js
-packages/server/src/models/UserModel.js.map
-packages/server/src/models/UserModel.test.d.ts
-packages/server/src/models/UserModel.test.js
-packages/server/src/models/UserModel.test.js.map
-packages/server/src/models/factory.d.ts
-packages/server/src/models/factory.js
-packages/server/src/models/factory.js.map
-packages/server/src/models/utils/pagination.d.ts
-packages/server/src/models/utils/pagination.js
-packages/server/src/models/utils/pagination.js.map
-packages/server/src/models/utils/pagination.test.d.ts
-packages/server/src/models/utils/pagination.test.js
-packages/server/src/models/utils/pagination.test.js.map
-packages/server/src/routes/api/files.d.ts
-packages/server/src/routes/api/files.js
-packages/server/src/routes/api/files.js.map
-packages/server/src/routes/api/files.test.d.ts
-packages/server/src/routes/api/files.test.js
-packages/server/src/routes/api/files.test.js.map
-packages/server/src/routes/api/ping.d.ts
-packages/server/src/routes/api/ping.js
-packages/server/src/routes/api/ping.js.map
-packages/server/src/routes/api/ping.test.d.ts
-packages/server/src/routes/api/ping.test.js
-packages/server/src/routes/api/ping.test.js.map
-packages/server/src/routes/api/sessions.d.ts
-packages/server/src/routes/api/sessions.js
-packages/server/src/routes/api/sessions.js.map
-packages/server/src/routes/api/sessions.test.d.ts
-packages/server/src/routes/api/sessions.test.js
-packages/server/src/routes/api/sessions.test.js.map
-packages/server/src/routes/default.d.ts
-packages/server/src/routes/default.js
-packages/server/src/routes/default.js.map
-packages/server/src/routes/index/files.d.ts
-packages/server/src/routes/index/files.js
-packages/server/src/routes/index/files.js.map
-packages/server/src/routes/index/home.d.ts
-packages/server/src/routes/index/home.js
-packages/server/src/routes/index/home.js.map
-packages/server/src/routes/index/home.test.d.ts
-packages/server/src/routes/index/home.test.js
-packages/server/src/routes/index/home.test.js.map
-packages/server/src/routes/index/login.d.ts
-packages/server/src/routes/index/login.js
-packages/server/src/routes/index/login.js.map
-packages/server/src/routes/index/login.test.d.ts
-packages/server/src/routes/index/login.test.js
-packages/server/src/routes/index/login.test.js.map
-packages/server/src/routes/index/logout.d.ts
-packages/server/src/routes/index/logout.js
-packages/server/src/routes/index/logout.js.map
-packages/server/src/routes/index/logout.test.d.ts
-packages/server/src/routes/index/logout.test.js
-packages/server/src/routes/index/logout.test.js.map
-packages/server/src/routes/index/notifications.d.ts
-packages/server/src/routes/index/notifications.js
-packages/server/src/routes/index/notifications.js.map
-packages/server/src/routes/index/notifications.test.d.ts
-packages/server/src/routes/index/notifications.test.js
-packages/server/src/routes/index/notifications.test.js.map
-packages/server/src/routes/index/users.d.ts
-packages/server/src/routes/index/users.js
-packages/server/src/routes/index/users.js.map
-packages/server/src/routes/index/users.test.d.ts
-packages/server/src/routes/index/users.test.js
-packages/server/src/routes/index/users.test.js.map
-packages/server/src/routes/oauth2/authorize.d.ts
-packages/server/src/routes/oauth2/authorize.js
-packages/server/src/routes/oauth2/authorize.js.map
-packages/server/src/routes/routes.d.ts
-packages/server/src/routes/routes.js
-packages/server/src/routes/routes.js.map
-packages/server/src/services/MustacheService.d.ts
-packages/server/src/services/MustacheService.js
-packages/server/src/services/MustacheService.js.map
-packages/server/src/tools/db-migrate.d.ts
-packages/server/src/tools/db-migrate.js
-packages/server/src/tools/db-migrate.js.map
-packages/server/src/tools/dbTools.d.ts
-packages/server/src/tools/dbTools.js
-packages/server/src/tools/dbTools.js.map
-packages/server/src/tools/generate-types.d.ts
-packages/server/src/tools/generate-types.js
-packages/server/src/tools/generate-types.js.map
-packages/server/src/utils/Router.d.ts
-packages/server/src/utils/Router.js
-packages/server/src/utils/Router.js.map
-packages/server/src/utils/TransactionHandler.d.ts
-packages/server/src/utils/TransactionHandler.js
-packages/server/src/utils/TransactionHandler.js.map
-packages/server/src/utils/auth.d.ts
-packages/server/src/utils/auth.js
-packages/server/src/utils/auth.js.map
-packages/server/src/utils/base64.d.ts
-packages/server/src/utils/base64.js
-packages/server/src/utils/base64.js.map
-packages/server/src/utils/cache.d.ts
-packages/server/src/utils/cache.js
-packages/server/src/utils/cache.js.map
-packages/server/src/utils/defaultView.d.ts
-packages/server/src/utils/defaultView.js
-packages/server/src/utils/defaultView.js.map
-packages/server/src/utils/errors.d.ts
-packages/server/src/utils/errors.js
-packages/server/src/utils/errors.js.map
-packages/server/src/utils/htmlUtils.d.ts
-packages/server/src/utils/htmlUtils.js
-packages/server/src/utils/htmlUtils.js.map
-packages/server/src/utils/koaIf.d.ts
-packages/server/src/utils/koaIf.js
-packages/server/src/utils/koaIf.js.map
-packages/server/src/utils/requestUtils.d.ts
-packages/server/src/utils/requestUtils.js
-packages/server/src/utils/requestUtils.js.map
-packages/server/src/utils/routeUtils.d.ts
-packages/server/src/utils/routeUtils.js
-packages/server/src/utils/routeUtils.js.map
-packages/server/src/utils/routeUtils.test.d.ts
-packages/server/src/utils/routeUtils.test.js
-packages/server/src/utils/routeUtils.test.js.map
-packages/server/src/utils/testing/apiUtils.d.ts
-packages/server/src/utils/testing/apiUtils.js
-packages/server/src/utils/testing/apiUtils.js.map
-packages/server/src/utils/testing/koa/FakeCookies.d.ts
-packages/server/src/utils/testing/koa/FakeCookies.js
-packages/server/src/utils/testing/koa/FakeCookies.js.map
-packages/server/src/utils/testing/koa/FakeRequest.d.ts
-packages/server/src/utils/testing/koa/FakeRequest.js
-packages/server/src/utils/testing/koa/FakeRequest.js.map
-packages/server/src/utils/testing/koa/FakeResponse.d.ts
-packages/server/src/utils/testing/koa/FakeResponse.js
-packages/server/src/utils/testing/koa/FakeResponse.js.map
-packages/server/src/utils/testing/testRouters.d.ts
-packages/server/src/utils/testing/testRouters.js
-packages/server/src/utils/testing/testRouters.js.map
-packages/server/src/utils/testing/testUtils.d.ts
-packages/server/src/utils/testing/testUtils.js
-packages/server/src/utils/testing/testUtils.js.map
-packages/server/src/utils/time.d.ts
-packages/server/src/utils/time.js
-packages/server/src/utils/time.js.map
-packages/server/src/utils/types.d.ts
-packages/server/src/utils/types.js
-packages/server/src/utils/types.js.map
-packages/server/src/utils/urlUtils.d.ts
-packages/server/src/utils/urlUtils.js
-packages/server/src/utils/urlUtils.js.map
-packages/server/src/utils/uuidgen.d.ts
-packages/server/src/utils/uuidgen.js
-packages/server/src/utils/uuidgen.js.map
+packages/tools/generate-database-types.d.ts
+packages/tools/generate-database-types.js
+packages/tools/generate-database-types.js.map
 packages/tools/lerna-add.d.ts
 packages/tools/lerna-add.js
 packages/tools/lerna-add.js.map

BUILD.md

@@ -24,7 +24,7 @@ There are also a few forks of existing packages under the "fork-*" name.
 - macOS, Linux: Install rsync - https://nodejs.org/en/
 - macOS: Install Cocoapods - `brew install cocoapods`
 - Windows: Install Windows Build Tools - `npm install -g windows-build-tools`
-- Linux: Install dependencies - `sudo apt install libnss3 libsecret-1-dev`
+- Linux: Install dependencies - `sudo apt install libnss3 libsecret-1-dev python`
 
 ## Building
 
@@ -110,4 +110,4 @@ It still requires you to quit the application each time you want it to rebuild,
 
 # Troubleshooting
 
-Please read for the [Build Troubleshooting Document](https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md) for various tips on how to get the build working.
+Please read for the [Build Troubleshooting Document](https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md) for various tips on how to get the build working.

Joplin_install_and_update.sh

@@ -162,7 +162,15 @@ DESKTOP=${DESKTOP,,}  # convert to lower case
 
 #-----------------------------------------------------
 echo 'Create Desktop icon...'
-if [[ $DESKTOP =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*x-cinnamon.*|.*deepin.*|.*pantheon.*|.*lxde.*|.*i3.*|.*sway.* ]]
+# Initially only desktop environments that were confirmed to use desktop files stored in
+# `.local/share/desktop` had a desktop file created.
+# However some environments don't return a desktop BUT still support these desktop files
+# the command check was added to support all Desktops that have support for the
+# freedesktop standard 
+# The old checks are left in place for historical reasons, but
+# NO MORE DESKTOP ENVIRONMENTS SHOULD BE ADDED
+# If a new environment needs to be supported, then the command check section should be re-thought
+if [[ $DESKTOP =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*x-cinnamon.*|.*deepin.*|.*pantheon.*|.*lxde.*|.*i3.*|.*sway.* ]] || [[ `command -v update-desktop-database` ]]
 then
     # Only delete the desktop file if it will be replaced
     rm -f ~/.local/share/applications/appimagekit-joplin.desktop

README.md

@@ -20,11 +20,11 @@ Three types of applications are available: for the **desktop** (Windows, macOS a
 
 Operating System | Download
 ---|---
-Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v1.6.8/Joplin-Setup-1.6.8.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a>
-macOS | <a href='https://github.com/laurent22/joplin/releases/download/v1.6.8/Joplin-1.6.8.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a>
-Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.6.8/Joplin-1.6.8.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a>
+Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v1.7.10/Joplin-Setup-1.7.10.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a>
+macOS | <a href='https://github.com/laurent22/joplin/releases/download/v1.7.10/Joplin-1.7.10.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a>
+Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.7.10/Joplin-1.7.10.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a>
 
-**On Windows**, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v1.6.8/JoplinPortable.exe'>Portable version</a>. The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
+**On Windows**, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v1.7.10/JoplinPortable.exe'>Portable version</a>. The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
 
 **On Linux**, the recommended way is to use the following installation script as it will handle the desktop icon too:
 
@@ -71,7 +71,8 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 | <img width="50" src="https://avatars0.githubusercontent.com/u/6979755?s=96&v=4"/></br>[Devon Zuegel](https://github.com/devonzuegel) | <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[小西　孝宗](https://github.com/konishi-t) | <img width="50" src="https://avatars2.githubusercontent.com/u/215668?s=96&v=4"/></br>[Alexander van der Berg](https://github.com/avanderberg)
 | <img width="50" src="https://avatars0.githubusercontent.com/u/1168659?s=96&v=4"/></br>[Nicholas Head](https://github.com/nicholashead) | <img width="50" src="https://avatars2.githubusercontent.com/u/1439535?s=96&v=4"/></br>[Frank Bloise](https://github.com/fbloise) | <img width="50" src="https://avatars2.githubusercontent.com/u/15859362?s=96&v=4"/></br>[Thomas Broussard](https://github.com/thomasbroussard)
 | <img width="50" src="https://avatars2.githubusercontent.com/u/1307332?s=96&v=4"/></br>[Brandon Johnson](https://github.com/dbrandonjohnson) | <img width="50" src="https://avatars1.githubusercontent.com/u/3061769?s=96&v=4"/></br>[@cnagy](https://github.com/c-nagy) | <img width="50" src="https://avatars3.githubusercontent.com/u/53228972?s=96&v=4"/></br>[clmntsl](https://github.com/clmntsl)
-| <img width="50" src="https://avatars1.githubusercontent.com/u/29300939?s=96&v=4"/></br>[mcejp](https://github.com/mcejp)
+| <img width="50" src="https://avatars1.githubusercontent.com/u/29300939?s=96&v=4"/></br>[mcejp](https://github.com/mcejp) | <img width="50" src="https://avatars.githubusercontent.com/u/1248504?s=96&v=4"/></br>[joesfer](https://github.com/joesfer) | <img width="50" src="https://avatars.githubusercontent.com/u/67130?s=96&v=4"/></br>[chr15m](https://github.com/chr15m)
+| <img width="50" src="https://avatars.githubusercontent.com/u/5782817?s=96&v=4"/></br>[piccobit](https://github.com/piccobit)
 
 <!-- TOC -->
 # Table of contents
@@ -117,6 +118,7 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 	- [Search Sorting spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/search_sorting.md)
 	- [Server: File URL Format](https://github.com/laurent22/joplin/blob/dev/readme/spec/server_file_url_format.md)
 	- [Server: Delta Sync](https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sync.md)
+	- [Server: Sharing](https://github.com/laurent22/joplin/blob/dev/readme/spec/server_sharing.md)
 
 - Google Summer of Code 2020
 
@@ -466,45 +468,45 @@ Current translations:
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 &nbsp;  |  Language  |  Po File  |  Last translator  |  Percent done
 ---|---|---|---|---
-![](https://joplinapp.org/images/flags/country-4x3/arableague.png)  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [أحمد باشا إبراهيم](mailto:fi_ahmed_bacha@esi.dz)  |  75%
-![](https://joplinapp.org/images/flags/es/basque_country.png)  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po)  |  juan.abasolo@ehu.eus  |  32%
-![](https://joplinapp.org/images/flags/country-4x3/ba.png)  |  Bosnian (Bosna i Hercegovina)  |  [bs_BA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po)  |  [Derviš T.](mailto:dervis.t@pm.me)  |  77%
-![](https://joplinapp.org/images/flags/country-4x3/bg.png)  |  Bulgarian (България)  |  [bg_BG](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po)  |    |  62%
-![](https://joplinapp.org/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  jmontane, 2019  |  89%
-![](https://joplinapp.org/images/flags/country-4x3/hr.png)  |  Croatian (Hrvatska)  |  [hr_HR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po)  |  [Hrvoje Mandić](mailto:trbuhom@net.hr)  |  26%
-![](https://joplinapp.org/images/flags/country-4x3/cz.png)  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Lukas Helebrandt](mailto:lukas@aiya.cz)  |  93%
-![](https://joplinapp.org/images/flags/country-4x3/dk.png)  |  Dansk (Danmark)  |  [da_DK](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po)  |  Mustafa Al-Dailemi (dailemi@hotmail.com)Language-Team:  |  77%
-![](https://joplinapp.org/images/flags/country-4x3/de.png)  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [Ettore Atalan](mailto:atalanttore@users.noreply.github.com)  |  95%
-![](https://joplinapp.org/images/flags/country-4x3/ee.png)  |  Eesti Keel (Eesti)  |  [et_EE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po)  |    |  61%
+![](https://joplinapp.org/images/flags/country-4x3/arableague.png)  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [أحمد باشا إبراهيم](mailto:fi_ahmed_bacha@esi.dz)  |  73%
+![](https://joplinapp.org/images/flags/es/basque_country.png)  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po)  |  juan.abasolo@ehu.eus  |  31%
+![](https://joplinapp.org/images/flags/country-4x3/ba.png)  |  Bosnian (Bosna i Hercegovina)  |  [bs_BA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po)  |  [Derviš T.](mailto:dervis.t@pm.me)  |  75%
+![](https://joplinapp.org/images/flags/country-4x3/bg.png)  |  Bulgarian (България)  |  [bg_BG](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po)  |    |  60%
+![](https://joplinapp.org/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  jmontane, 2019  |  87%
+![](https://joplinapp.org/images/flags/country-4x3/hr.png)  |  Croatian (Hrvatska)  |  [hr_HR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po)  |  [Hrvoje Mandić](mailto:trbuhom@net.hr)  |  25%
+![](https://joplinapp.org/images/flags/country-4x3/cz.png)  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Lukas Helebrandt](mailto:lukas@aiya.cz)  |  91%
+![](https://joplinapp.org/images/flags/country-4x3/dk.png)  |  Dansk (Danmark)  |  [da_DK](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po)  |  Mustafa Al-Dailemi (dailemi@hotmail.com)Language-Team:  |  75%
+![](https://joplinapp.org/images/flags/country-4x3/de.png)  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [Ettore Atalan](mailto:atalanttore@users.noreply.github.com)  |  93%
+![](https://joplinapp.org/images/flags/country-4x3/ee.png)  |  Eesti Keel (Eesti)  |  [et_EE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po)  |    |  60%
 ![](https://joplinapp.org/images/flags/country-4x3/gb.png)  |  English (United Kingdom)  |  [en_GB](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_GB.po)  |    |  100%
 ![](https://joplinapp.org/images/flags/country-4x3/us.png)  |  English (United States of America)  |  [en_US](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_US.po)  |    |  100%
-![](https://joplinapp.org/images/flags/country-4x3/es.png)  |  Español (España)  |  [es_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po)  |  [Mario Campo](mailto:mario.campo@gmail.com)  |  99%
-![](https://joplinapp.org/images/flags/esperanto.png)  |  Esperanto  |  [eo](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po)  |  Marton Paulo  |  35%
-![](https://joplinapp.org/images/flags/country-4x3/fi.png)  |  Finnish (Suomi)  |  [fi_FI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po)  |    |  94%
-![](https://joplinapp.org/images/flags/country-4x3/fr.png)  |  Français (France)  |  [fr_FR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po)  |  Laurent Cozic  |  99%
-![](https://joplinapp.org/images/flags/es/galicia.png)  |  Galician (España)  |  [gl_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po)  |  [Marcos Lans](mailto:marcoslansgarza@gmail.com)  |  40%
-![](https://joplinapp.org/images/flags/country-4x3/id.png)  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [Fathy AR](mailto:16875937+fathyar@users.noreply.github.com)  |  85%
-![](https://joplinapp.org/images/flags/country-4x3/it.png)  |  Italiano (Italia)  |  [it_IT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po)  |  [Alessandro Bernardello](mailto:mailfilledwithspam@gmail.com)  |  96%
-![](https://joplinapp.org/images/flags/country-4x3/be.png)  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  32%
-![](https://joplinapp.org/images/flags/country-4x3/nl.png)  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MetBril](mailto:metbril@users.noreply.github.com)  |  93%
-![](https://joplinapp.org/images/flags/country-4x3/no.png)  |  Norwegian (Norge, Noreg)  |  [nb_NO](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po)  |  [Mats Estensen](mailto:code@mxe.no)  |  82%
-![](https://joplinapp.org/images/flags/country-4x3/ir.png)  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  77%
-![](https://joplinapp.org/images/flags/country-4x3/pl.png)  |  Polski (Polska)  |  [pl_PL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po)  |    |  92%
-![](https://joplinapp.org/images/flags/country-4x3/br.png)  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Renato Nunes Bastos](mailto:rnbastos@gmail.com)  |  91%
-![](https://joplinapp.org/images/flags/country-4x3/pt.png)  |  Português (Portugal)  |  [pt_PT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po)  |  [João Duarte](mailto:jduar@protonmail.com)  |  92%
-![](https://joplinapp.org/images/flags/country-4x3/ro.png)  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  72%
-![](https://joplinapp.org/images/flags/country-4x3/si.png)  |  Slovenian (Slovenija)  |  [sl_SI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po)  |    |  40%
-![](https://joplinapp.org/images/flags/country-4x3/se.png)  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  66%
-![](https://joplinapp.org/images/flags/country-4x3/th.png)  |  Thai (ประเทศไทย)  |  [th_TH](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po)  |    |  49%
-![](https://joplinapp.org/images/flags/country-4x3/vi.png)  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  79%
-![](https://joplinapp.org/images/flags/country-4x3/tr.png)  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  99%
-![](https://joplinapp.org/images/flags/country-4x3/gr.png)  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  89%
-![](https://joplinapp.org/images/flags/country-4x3/ru.png)  |  Русский (Россия)  |  [ru_RU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po)  |  [Sergey Segeda](mailto:thesermanarm@gmail.com)  |  96%
+![](https://joplinapp.org/images/flags/country-4x3/es.png)  |  Español (España)  |  [es_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po)  |  [Mario Campo](mailto:mario.campo@gmail.com)  |  96%
+![](https://joplinapp.org/images/flags/esperanto.png)  |  Esperanto  |  [eo](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po)  |  Marton Paulo  |  34%
+![](https://joplinapp.org/images/flags/country-4x3/fi.png)  |  Finnish (Suomi)  |  [fi_FI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po)  |    |  91%
+![](https://joplinapp.org/images/flags/country-4x3/fr.png)  |  Français (France)  |  [fr_FR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po)  |  Laurent Cozic  |  97%
+![](https://joplinapp.org/images/flags/es/galicia.png)  |  Galician (España)  |  [gl_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po)  |  [Marcos Lans](mailto:marcoslansgarza@gmail.com)  |  39%
+![](https://joplinapp.org/images/flags/country-4x3/id.png)  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [Fathy AR](mailto:16875937+fathyar@users.noreply.github.com)  |  95%
+![](https://joplinapp.org/images/flags/country-4x3/it.png)  |  Italiano (Italia)  |  [it_IT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po)  |  [Alessandro Bernardello](mailto:mailfilledwithspam@gmail.com)  |  94%
+![](https://joplinapp.org/images/flags/country-4x3/be.png)  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  31%
+![](https://joplinapp.org/images/flags/country-4x3/nl.png)  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MetBril](mailto:metbril@users.noreply.github.com)  |  91%
+![](https://joplinapp.org/images/flags/country-4x3/no.png)  |  Norwegian (Norge, Noreg)  |  [nb_NO](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po)  |  [Mats Estensen](mailto:code@mxe.no)  |  80%
+![](https://joplinapp.org/images/flags/country-4x3/ir.png)  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  75%
+![](https://joplinapp.org/images/flags/country-4x3/pl.png)  |  Polski (Polska)  |  [pl_PL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po)  |    |  90%
+![](https://joplinapp.org/images/flags/country-4x3/br.png)  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Renato Nunes Bastos](mailto:rnbastos@gmail.com)  |  97%
+![](https://joplinapp.org/images/flags/country-4x3/pt.png)  |  Português (Portugal)  |  [pt_PT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po)  |  [João Duarte](mailto:jduar@protonmail.com)  |  90%
+![](https://joplinapp.org/images/flags/country-4x3/ro.png)  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  70%
+![](https://joplinapp.org/images/flags/country-4x3/si.png)  |  Slovenian (Slovenija)  |  [sl_SI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po)  |    |  39%
+![](https://joplinapp.org/images/flags/country-4x3/se.png)  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  64%
+![](https://joplinapp.org/images/flags/country-4x3/th.png)  |  Thai (ประเทศไทย)  |  [th_TH](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po)  |    |  48%
+![](https://joplinapp.org/images/flags/country-4x3/vi.png)  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  77%
+![](https://joplinapp.org/images/flags/country-4x3/tr.png)  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  97%
+![](https://joplinapp.org/images/flags/country-4x3/gr.png)  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  87%
+![](https://joplinapp.org/images/flags/country-4x3/ru.png)  |  Русский (Россия)  |  [ru_RU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po)  |  [Sergey Segeda](mailto:thesermanarm@gmail.com)  |  94%
 ![](https://joplinapp.org/images/flags/country-4x3/rs.png)  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  67%
-![](https://joplinapp.org/images/flags/country-4x3/cn.png)  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po)  |  [WhiredPlanck](mailto:fungdaat31@outlook.com)  |  99%
-![](https://joplinapp.org/images/flags/country-4x3/tw.png)  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po)  |  [Yaoze Ye](mailto:yaozeye@yahoo.co.jp)  |  95%
-![](https://joplinapp.org/images/flags/country-4x3/jp.png)  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  96%
-![](https://joplinapp.org/images/flags/country-4x3/kr.png)  |  한국어  |  [ko](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po)  |  [Ji-Hyeon Gim](mailto:potatogim@potatogim.net)  |  96%
+![](https://joplinapp.org/images/flags/country-4x3/cn.png)  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po)  |  [WhiredPlanck](mailto:fungdaat31@outlook.com)  |  97%
+![](https://joplinapp.org/images/flags/country-4x3/tw.png)  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po)  |  [Yaoze Ye](mailto:yaozeye@yahoo.co.jp)  |  92%
+![](https://joplinapp.org/images/flags/country-4x3/jp.png)  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  97%
+![](https://joplinapp.org/images/flags/country-4x3/kr.png)  |  한국어  |  [ko](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po)  |  [Ji-Hyeon Gim](mailto:potatogim@potatogim.net)  |  97%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 
 # Contributors

docs/api/get_started/plugins/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/api/overview/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/api/references/development_mode/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/api/references/plugin_api/classes/joplin.html

@@ -111,6 +111,12 @@
 								<li class="tsd-kind-get-signature tsd-parent-kind-class"><a href="joplin.html#workspace" class="tsd-kind-icon">workspace</a></li>
 							</ul>
 						</section>
+						<section class="tsd-index-section ">
+							<h3>Methods</h3>
+							<ul class="tsd-index-list">
+								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplin.html#require" class="tsd-kind-icon">require</a></li>
+							</ul>
+						</section>
 					</div>
 				</section>
 			</section>
@@ -258,6 +264,46 @@
     <h4 class="tsd-returns-title">Returns <a href="joplinworkspace.html" class="tsd-signature-type">joplin.workspace</a></h4>
 
 
+-->
+						</li>
+					</ul>
+				</section>
+			</section>
+			<section class="tsd-panel-group tsd-member-group ">
+				<h2>Methods</h2>
+				<section class="tsd-panel tsd-member tsd-kind-method tsd-parent-kind-class">
+					<a name="require" class="tsd-anchor"></a>
+					<h3>require</h3>
+					<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
+						<li class="tsd-signature tsd-kind-icon">require<span class="tsd-signature-symbol">(</span>_path<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">any</span></li>
+					</ul>
+					<ul class="tsd-descriptions">
+						<li class="tsd-description">
+							<aside class="tsd-sources">
+							</aside>
+							<div class="tsd-comment tsd-typography">
+								<div class="lead">
+									<p>It is not possible to bundle native packages with a plugin, because they
+										need to work cross-platforms. Instead access to certain useful native
+									packages is provided using this function.</p>
+								</div>
+								<p>Currently these packages are available:</p>
+								<ul>
+									<li><a href="https://www.npmjs.com/package/sqlite3">sqlite3</a></li>
+									<li><a href="https://www.npmjs.com/package/fs-extra">fs-extra</a></li>
+								</ul>
+								<p><a href="https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/nativeModule">View the demo plugin</a></p>
+							</div>
+							<h4 class="tsd-parameters-title">Parameters</h4>
+							<ul class="tsd-parameters">
+								<li>
+									<h5>_path: <span class="tsd-signature-type">string</span></h5>
+								</li>
+							</ul>
+							<!-- JOPLINCHANGE
+    <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">any</span></h4>
+
+
 -->
 						</li>
 					</ul>
@@ -308,6 +354,9 @@
 							<li class=" tsd-kind-get-signature tsd-parent-kind-class">
 								<a href="joplin.html#workspace" class="tsd-kind-icon">workspace</a>
 							</li>
+							<li class=" tsd-kind-method tsd-parent-kind-class">
+								<a href="joplin.html#require" class="tsd-kind-icon">require</a>
+							</li>
 						</ul>
 					</li>
 				</ul>

docs/api/references/plugin_api/classes/joplinplugins.html

@@ -92,8 +92,11 @@
 						<section class="tsd-index-section ">
 							<h3>Methods</h3>
 							<ul class="tsd-index-list">
+								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinplugins.html#datadir" class="tsd-kind-icon">data<wbr>Dir</a></li>
+								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinplugins.html#installationdir" class="tsd-kind-icon">installation<wbr>Dir</a></li>
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinplugins.html#register" class="tsd-kind-icon">register</a></li>
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinplugins.html#registercontentscript" class="tsd-kind-icon">register<wbr>Content<wbr>Script</a></li>
+								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinplugins.html#require" class="tsd-kind-icon">require</a></li>
 							</ul>
 						</section>
 					</div>
@@ -103,6 +106,57 @@
 			</section>
 			<section class="tsd-panel-group tsd-member-group ">
 				<h2>Methods</h2>
+				<section class="tsd-panel tsd-member tsd-kind-method tsd-parent-kind-class">
+					<a name="datadir" class="tsd-anchor"></a>
+					<h3>data<wbr>Dir</h3>
+					<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
+						<li class="tsd-signature tsd-kind-icon">data<wbr>Dir<span class="tsd-signature-symbol">(</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">&gt;</span></li>
+					</ul>
+					<ul class="tsd-descriptions">
+						<li class="tsd-description">
+							<aside class="tsd-sources">
+							</aside>
+							<div class="tsd-comment tsd-typography">
+								<div class="lead">
+									<p>Gets the plugin own data directory path. Use this to store any
+										plugin-related data. Unlike <a href="joplinplugins.html#installationdir">installationDir</a>, any data stored here
+									will be persisted.</p>
+								</div>
+							</div>
+							<!-- JOPLINCHANGE
+    <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">&gt;</span></h4>
+
+
+-->
+						</li>
+					</ul>
+				</section>
+				<section class="tsd-panel tsd-member tsd-kind-method tsd-parent-kind-class">
+					<a name="installationdir" class="tsd-anchor"></a>
+					<h3>installation<wbr>Dir</h3>
+					<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
+						<li class="tsd-signature tsd-kind-icon">installation<wbr>Dir<span class="tsd-signature-symbol">(</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">&gt;</span></li>
+					</ul>
+					<ul class="tsd-descriptions">
+						<li class="tsd-description">
+							<aside class="tsd-sources">
+							</aside>
+							<div class="tsd-comment tsd-typography">
+								<div class="lead">
+									<p>Gets the plugin installation directory. This can be used to access any
+										asset that was packaged with the plugin. This directory should be
+										considered read-only because any data you store here might be deleted or
+									re-created at any time. To store new persistent data, use <a href="joplinplugins.html#datadir">dataDir</a>.</p>
+								</div>
+							</div>
+							<!-- JOPLINCHANGE
+    <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">&gt;</span></h4>
+
+
+-->
+						</li>
+					</ul>
+				</section>
 				<section class="tsd-panel tsd-member tsd-kind-method tsd-parent-kind-class">
 					<a name="register" class="tsd-anchor"></a>
 					<h3>register</h3>
@@ -171,6 +225,37 @@
     <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></h4>
 
 
+-->
+						</li>
+					</ul>
+				</section>
+				<section class="tsd-panel tsd-member tsd-kind-method tsd-parent-kind-class">
+					<a name="require" class="tsd-anchor"></a>
+					<h3>require</h3>
+					<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
+						<li class="tsd-signature tsd-kind-icon">require<span class="tsd-signature-symbol">(</span>_path<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">any</span></li>
+					</ul>
+					<ul class="tsd-descriptions">
+						<li class="tsd-description">
+							<aside class="tsd-sources">
+							</aside>
+							<div class="tsd-comment tsd-typography">
+								<dl class="tsd-comment-tags">
+									<dt>deprecated</dt>
+									<dd><p>Use joplin.require()</p>
+									</dd>
+								</dl>
+							</div>
+							<h4 class="tsd-parameters-title">Parameters</h4>
+							<ul class="tsd-parameters">
+								<li>
+									<h5>_path: <span class="tsd-signature-type">string</span></h5>
+								</li>
+							</ul>
+							<!-- JOPLINCHANGE
+    <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">any</span></h4>
+
+
 -->
 						</li>
 					</ul>
@@ -197,12 +282,21 @@
 							<li class=" tsd-kind-constructor tsd-parent-kind-class">
 								<a href="joplinplugins.html#constructor" class="tsd-kind-icon">constructor</a>
 							</li>
+							<li class=" tsd-kind-method tsd-parent-kind-class">
+								<a href="joplinplugins.html#datadir" class="tsd-kind-icon">data<wbr>Dir</a>
+							</li>
+							<li class=" tsd-kind-method tsd-parent-kind-class">
+								<a href="joplinplugins.html#installationdir" class="tsd-kind-icon">installation<wbr>Dir</a>
+							</li>
 							<li class=" tsd-kind-method tsd-parent-kind-class">
 								<a href="joplinplugins.html#register" class="tsd-kind-icon">register</a>
 							</li>
 							<li class=" tsd-kind-method tsd-parent-kind-class">
 								<a href="joplinplugins.html#registercontentscript" class="tsd-kind-icon">register<wbr>Content<wbr>Script</a>
 							</li>
+							<li class=" tsd-kind-method tsd-parent-kind-class">
+								<a href="joplinplugins.html#require" class="tsd-kind-icon">require</a>
+							</li>
 						</ul>
 					</li>
 				</ul>

docs/api/references/plugin_api/interfaces/settingitem.html

@@ -110,6 +110,12 @@
 					<div class="tsd-signature tsd-kind-icon">advanced<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">boolean</span></div>
 					<aside class="tsd-sources">
 					</aside>
+					<div class="tsd-comment tsd-typography">
+						<div class="lead">
+							<p>An advanced setting will be moved under the &quot;Advanced&quot; button in the
+							config screen.</p>
+						</div>
+					</div>
 				</section>
 				<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-interface">
 					<a name="apptypes" class="tsd-anchor"></a>
@@ -117,6 +123,11 @@
 					<div class="tsd-signature tsd-kind-icon">app<wbr>Types<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">[]</span></div>
 					<aside class="tsd-sources">
 					</aside>
+					<div class="tsd-comment tsd-typography">
+						<div class="lead">
+							<p>Reserved property. Not used at the moment.</p>
+						</div>
+					</div>
 				</section>
 				<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-interface">
 					<a name="description" class="tsd-anchor"></a>
@@ -131,6 +142,12 @@
 					<div class="tsd-signature tsd-kind-icon">is<wbr>Enum<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">boolean</span></div>
 					<aside class="tsd-sources">
 					</aside>
+					<div class="tsd-comment tsd-typography">
+						<div class="lead">
+							<p>To create a setting with multiple options, set this property to <code>true</code>.
+							That setting will render as a dropdown list in the configuration screen.</p>
+						</div>
+					</div>
 				</section>
 				<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-interface">
 					<a name="label" class="tsd-anchor"></a>
@@ -152,13 +169,25 @@
 					<div class="tsd-signature tsd-kind-icon">minimum<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">number</span></div>
 					<aside class="tsd-sources">
 					</aside>
+					<div class="tsd-comment tsd-typography">
+						<div class="lead">
+							<p>Set the min, max and step values if you want to restrict an int setting
+							to a particular range.</p>
+						</div>
+					</div>
 				</section>
 				<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-interface">
 					<a name="options" class="tsd-anchor"></a>
 					<h3><span class="tsd-flag ts-flagOptional">Optional</span> options</h3>
-					<div class="tsd-signature tsd-kind-icon">options<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">any</span></div>
+					<div class="tsd-signature tsd-kind-icon">options<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">Record</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">any</span><span class="tsd-signature-symbol">, </span><span class="tsd-signature-type">any</span><span class="tsd-signature-symbol">&gt;</span></div>
 					<aside class="tsd-sources">
 					</aside>
+					<div class="tsd-comment tsd-typography">
+						<div class="lead">
+							<p>This property is required when <code>isEnum</code> is <code>true</code>. In which case, it
+							should contain a map of value =&gt; label.</p>
+						</div>
+					</div>
 				</section>
 				<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-interface">
 					<a name="public" class="tsd-anchor"></a>
@@ -166,6 +195,14 @@
 					<div class="tsd-signature tsd-kind-icon">public<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">boolean</span></div>
 					<aside class="tsd-sources">
 					</aside>
+					<div class="tsd-comment tsd-typography">
+						<div class="lead">
+							<p>A public setting will appear in the Configuration screen and will be
+								modifiable by the user. A private setting however will not appear there,
+								and can only be changed programmatically. You may use this to store some
+							values that you do not want to directly expose.</p>
+						</div>
+					</div>
 				</section>
 				<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-interface">
 					<a name="section" class="tsd-anchor"></a>
@@ -173,6 +210,12 @@
 					<div class="tsd-signature tsd-kind-icon">section<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span></div>
 					<aside class="tsd-sources">
 					</aside>
+					<div class="tsd-comment tsd-typography">
+						<div class="lead">
+							<p>You would usually set this to a section you would have created
+							specifically for the plugin.</p>
+						</div>
+					</div>
 				</section>
 				<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-interface">
 					<a name="secure" class="tsd-anchor"></a>
@@ -180,6 +223,12 @@
 					<div class="tsd-signature tsd-kind-icon">secure<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">boolean</span></div>
 					<aside class="tsd-sources">
 					</aside>
+					<div class="tsd-comment tsd-typography">
+						<div class="lead">
+							<p>Set this to <code>true</code> to store secure data, such as passwords. Any such
+							setting will be stored in the system keychain if one is available.</p>
+						</div>
+					</div>
 				</section>
 				<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-interface">
 					<a name="step" class="tsd-anchor"></a>

docs/api/references/plugin_loading_rules/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/api/references/plugin_manifest/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/api/references/rest_api/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>
@@ -950,6 +952,18 @@ async function fetchAllNotes() {
 <pre><code>curl -F 'data=@/path/to/file.jpg' -F 'props={&quot;title&quot;:&quot;my resource title&quot;}' http://localhost:41184/resources
 </code></pre>
 <p>The &quot;data&quot; field is required, while the &quot;props&quot; one is not. If not specified, default values will be used.</p>
+<p><strong>From a plugin</strong> the syntax to create a resource is also a bit special:</p>
+<pre><code class="language-javascript">	await joplin.data.post(
+		[&quot;resources&quot;],
+		null,
+		{ title: &quot;test.jpg&quot; }, // Resource metadata
+		[
+			{
+				path: &quot;/path/to/test.jpg&quot;, // Actual file
+			},
+		]
+	);
+</code></pre>
 <h2>PUT /resources/:id<a name="put-resources-id" href="#put-resources-id" class="heading-anchor">🔗</a></h2>
 <p>Sets the properties of the resource with ID :id</p>
 <h2>DELETE /resources/:id<a name="delete-resources-id" href="#delete-resources-id" class="heading-anchor">🔗</a></h2>

docs/api/tutorials/toc_plugin/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20180621-182112/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20180906-111039/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20180916-210431/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20180929-121053/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20181004-091123/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20181101-174335/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20181213-173459/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20190130-230218/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20190404-074157/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20190424-112410/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20190523-231026/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20190611-000711/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20190613-202613/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20190814-225957/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20190925-000254/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20190929-152834/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20191012-233121/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20191014-165136/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20191101-131852/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20191117-183855/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20191118-072700/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20200220-190804/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20200301-125055/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20200314-001555/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/blog/20200406-224254/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/build_troubleshooting/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>
@@ -412,6 +414,13 @@ set &quot;PATH=C:\Program Files\nodejs;%PATH%&quot;
 <h2>On Linux and macOS<a name="on-linux-and-macos" href="#on-linux-and-macos" class="heading-anchor">🔗</a></h2>
 <p>If there's an error <code>while loading shared libraries: libgconf-2.so.4: cannot open shared object file: No such file or directory</code>, run <code>sudo apt-get install libgconf-2-4</code></p>
 <p>If you get a node-gyp related error, you might need to manually install it: <code>npm install -g node-gyp</code>.</p>
+<p>If you get unexpected <code>npm</code> dependency errors on a fresh git pull, try <code>npm run clean</code></p>
+<p>If <code>npm i</code> gives you a fatal error like the following:</p>
+<pre><code>node-pre-gyp WARN Tried to download(403): https://mapbox-node-binary.s3.amazonaws.com/sqlite3/v5.0.1/napi-v6-linux-x64.tar.gz 
+node-pre-gyp WARN Pre-built binaries not found for sqlite3@5.0.1 and node@14.15.4 (node-v83 ABI, glibc) (falling back to source compile with node-gyp)
+/bin/sh: 1: python: not found
+</code></pre>
+<p>Try <code>sudo apt install python</code> (or the <code>apt</code> equivalent for your operating system) and then run <code>npm i</code> again.</p>
 <p>If you get the error <code>libtool: unrecognized option '-static'</code>, follow the instructions <a href="https://stackoverflow.com/a/38552393/561309">in this post</a> to use the correct libtool version.</p>
 <h2>Other issues<a name="other-issues" href="#other-issues" class="heading-anchor">🔗</a></h2>
 <blockquote>

docs/changelog/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>
@@ -402,6 +404,28 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 
 	<div class="main">
 <h1>Joplin changelog<a name="joplin-changelog" href="#joplin-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.7.10">v1.7.10</a> - 2021-01-30T13:25:29Z<a name="v1-7-10-https-github-com-laurent22-joplin-releases-tag-v1-7-10-2021-01-30t13-25-29z" href="#v1-7-10-https-github-com-laurent22-joplin-releases-tag-v1-7-10-2021-01-30t13-25-29z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Added button to browse plugins</li>
+<li>New: Allow updating a plugin</li>
+<li>New: Plugins: Add support for &quot;keywords&quot; manifest field</li>
+<li>New: Plugins: Add support for <code>joplin.plugins.installationDir</code> to allow accessing external files packaged with the plugin</li>
+<li>New: Plugins: Add support for <code>joplin.plugins.require</code> API to allow using sqlite3 or fs-extra from a plugin</li>
+<li>New: Plugins: Add support for <code>plugins.dataDir</code> function, to provide a path for plugin to store its own data</li>
+<li>New: Plugins: Added support for bi-directional messages in content scripts and webview scripts using postMessage</li>
+<li>Fixed: Added missing translations (<a href="https://github.com/laurent22/joplin/issues/4363">#4363</a>)</li>
+<li>Fixed: Fixed copying text from Rich Text editor (<a href="https://github.com/laurent22/joplin/issues/4441">#4441</a>)</li>
+<li>Fixed: Fixed plugin panel issue that could crash app in rare case</li>
+<li>Fixed: Make sure note is automatically saved when format is set via keyboard shortcut in Rich Text editor (<a href="https://github.com/laurent22/joplin/issues/4337">#4337</a>)</li>
+<li>Fixed: Plugins: Fixed dropdown settings</li>
+<li>Fixed: Some commands were no longer working (<a href="https://github.com/laurent22/joplin/issues/4343">#4343</a>) (<a href="https://github.com/laurent22/joplin/issues/4338">#4338</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>Improved: Do not allow installing plugins incompatible with current app version</li>
+<li>Improved: Enable TLS options for Joplin Server</li>
+<li>Improved: Improved error handling when importing ENEX</li>
+<li>Improved: In config screen, click on a plugin name to open its home page</li>
+<li>Improved: Move plugin settings under separate section in config menu</li>
+<li>Improved: Some imported ENEX files incorrectly had invisible sections</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.6.8">v1.6.8</a> - 2021-01-20T18:11:34Z<a name="v1-6-8-https-github-com-laurent22-joplin-releases-tag-v1-6-8-2021-01-20t18-11-34z" href="#v1-6-8-https-github-com-laurent22-joplin-releases-tag-v1-6-8-2021-01-20t18-11-34z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Fixed: Fixed infinite sync issue with OneDrive (<a href="https://github.com/laurent22/joplin/issues/4305">#4305</a>)</li>

docs/changelog_cli/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/changelog_server/index.html

@@ -0,0 +1,454 @@
+<!doctype html>
+<html>
+
+<!--
+
+!!! WARNING !!!
+
+This file was auto-generated from readme/changelog_server.md and any manual change
+made to it will be overwritten. To make a change to this file please modify
+the source Markdown file:
+
+https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
+
+-->
+
+<head>
+	<title>Joplin Server Changelog | Joplin</title>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
+	<link rel="shortcut icon" type="image/x-icon" href="https://joplinapp.org/favicon.ico">
+	<!-- <link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css">  -->
+	<link rel="stylesheet" href="https://joplinapp.org/css/fork-awesome.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
+	<style>
+	body {
+		background-color: #F1F1F1;
+		color: #333333;
+	}
+
+	.root {
+		overflow: hidden;
+	}
+
+	a[href^="mailto:"] {
+		word-break: break-all;
+	}
+
+	table {
+		margin-bottom: 1em;
+	}
+	td, th {
+		padding: .8em;
+		border: 1px solid #ccc;
+	}
+
+	.page-markdown table pre,
+	.page-markdown table blockquote {
+		margin-bottom: 0;
+	}
+
+	.page-markdown table pre,
+	.page-markdown table blockquote {
+		margin-bottom: 0;
+	}
+
+	.page-markdown table pre {
+		background-color: rgba(0,0,0,0);
+		border: none;
+		margin: 0;
+		padding: 0;
+	}
+
+	h1, h2 {
+		border-bottom: 1px solid #eaecef;
+		padding-bottom: 0.3em;
+		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+		font-weight: 600;
+		font-size: 2em;
+		margin-bottom: 16px;
+	}
+	h2 {
+		font-size: 1.6em;
+	}
+	h3 {
+		font-size: 1.3em;
+	}
+	code {
+		color: black;
+		background-color: #eee;
+		border: 1px solid #ccc;
+		font-size: .85em;
+	/*	word-break: break-all; */
+	}
+	pre code {
+		border: none;
+	}
+	pre {
+		font-size: .85em;
+	}
+	blockquote {
+		font-size: 1em;
+		color: #555;
+	};
+	#toc ul {
+		margin-bottom: 10px;
+	}
+	#toc > ul > li {
+		margin-bottom: 10px;
+	}
+	#toc {
+		padding-bottom: 1em;
+	}
+	.title {
+		display: flex;
+		align-items: center;
+	}
+	.title-icon {
+		display: flex;
+		height: 1em;
+	}
+	.title-text {
+		display: flex;
+		font-weight: normal;
+		margin-bottom: .2em;
+		margin-left: .5em;
+	}
+	.sub-title {
+		font-weight: normal;
+	}
+	.container {
+		background-color: white;
+		padding: 0;
+		box-shadow: 0 10px 20px #888888;
+	}
+	table.screenshots {
+		margin-top: 2em;
+		margin-bottom: 2em;
+	}
+	table.screenshots th {
+		height: 3em;
+		text-align: center;
+	}
+	table.screenshots th, 
+	table.screenshots td {
+		border: 1px solid #C2C2C2;
+	}
+	img[align="left"] {
+		margin-right: 10px;
+		margin-bottom: 10px;
+	}
+	.mobile-screenshot {
+		height: 40em;
+		padding: 1em;
+	}
+	.cli-screenshot-wrapper {
+		background-color: black;
+		vertical-align: top;
+		padding: 1em 2em 1em 1em;
+	}
+	.cli-screenshot {
+		font-family: "Monaco", "Inconsolata", "CONSOLAS", "Deja Vu Sans Mono", "Droid Sans Mono", "Andale Mono", monospace;
+		background-color: black;
+		color: white;
+		border: none;
+	}
+	.cli-screenshot .prompt {
+		color: #48C2F0;
+	}
+	.top-screenshot {
+		margin-top: 2em;
+		text-align: center;
+	}
+	.header {
+		position: relative;
+		padding-left: 2em;
+		padding-right: 2em;
+		padding-top: 1em;
+		padding-bottom: 1em;
+		color: white;
+		background-color: #2B2B3D;
+	}
+	.header a h1 {
+		color: white;
+	}
+	.header a:hover {
+		text-decoration: none;
+	}
+	.content {
+		padding-left: 2em;
+		padding-right: 2em;
+		padding-bottom: 2em;
+		padding-top: 2em;
+	}
+	.forkme {
+		position: absolute;
+		right: 0;
+		top:0;
+	}
+	.nav-wrapper {
+		position: relative;
+		width: inherit;
+	}
+	.nav {
+		background-color: black;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.nav.sticky {
+		position:fixed;
+		top: 0;
+		width: inherit;
+		box-shadow: 0 0 10px #000000;
+	}
+	.nav a {
+		color: white;
+		display: inline-block;
+		padding: .6em .9em .6em .9em;
+	}
+	.nav ul {
+		padding-left: 2em;
+		margin-bottom: 0;
+		display: table-cell;
+		display: flex;
+		width: 100%;
+	}
+	.nav ul li {
+		display: inline-block;
+		padding: 0;
+	}
+	.nav li.selected {
+		background-color: #222;
+		font-weight: bold;
+	}
+	.nav-right {
+		display: flex;
+		text-align: right;
+		vertical-align: middle;
+		line-height: 0;
+		margin-right: 10px;
+	}
+	.nav-right .share-btn {
+		display: none;
+	}
+	.nav-right .small-share-btn {
+		display: none;
+	}
+	.footer {
+		padding: 2em;
+		border-top: 1px solid #d4d4d4;
+		margin-top: 2em;
+		color: gray;
+		font-size: .9em;
+	}
+	a.heading-anchor {
+		display: inline-block;
+		opacity: 0;
+		width: 1.3em;
+		font-size: 0.7em;
+		margin-left: 0.4em;
+		line-height: 1em;
+		text-decoration: none;
+		transition: opacity 0.3s;
+	}
+	a.heading-anchor:hover,
+	h1:hover a.heading-anchor,
+	h2:hover a.heading-anchor,
+	h3:hover a.heading-anchor,
+	h4:hover a.heading-anchor,
+	h5:hover a.heading-anchor,
+	h6:hover a.heading-anchor {
+		opacity: 1;
+	}
+
+	@media (min-width: 992px) {
+		.content{
+			display: flex;
+		}
+
+		#toc{
+			display: block!important;
+			align-self: flex-start;
+			width: 300px;
+			position: sticky; top: 20px; left: 0;            
+		}
+
+		.main{
+			width: calc(100% - 300px);
+		}
+	}
+
+	.bottom-links {
+		display: flex;
+		justify-content: center;
+		border-top: 1px solid #d4d4d4;
+		margin-top: 30px;
+		padding-top: 25px;
+	}
+
+	@media all and (min-width: 400px) {
+		.nav-right .share-btn {
+			display: inline-block;
+		}
+		.nav-right .small-share-btn {
+			display: none;
+		}
+	}
+</style>
+</head>
+
+<body>
+
+<div class="container root page-changelog_server">
+
+<div class="header">
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 class="title"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png"><span class="title-text">Joplin</span></h1></a>
+	<p class="sub-title">An open source note taking and to-do application with synchronisation capabilities</p>
+</div>
+
+<div class="nav-wrapper">
+	<div class="nav">
+		<ul>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li><a href="https://discourse.joplinapp.org" title="Forum">Forum</a></li>
+			<li><a class="help" href="#" title="Menu">Menu</a></li>
+			<!-- <li><a class="gsod" href="https://joplinapp.org/gsod2020/" title="Google Season of Docs 2020">GSoD 2020</a></li> -->
+		</ul>
+		<div class="nav-right">
+			<!--
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+			-->
+			<iframe class="share-btn share-btn-github" src="https://ghbtns.com/github-btn.html?user=laurent22&repo=joplin&type=star&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+		</div>
+	</div>
+</div>
+
+<div class="content">
+	<div id="toc"><ul>
+<li>
+<p>Applications</p>
+<ul>
+<li><a href="https://joplinapp.org/desktop/">Desktop application</a></li>
+<li><a href="https://joplinapp.org/mobile/">Mobile applications</a></li>
+<li><a href="https://joplinapp.org/terminal/">Terminal application</a></li>
+<li><a href="https://joplinapp.org/clipper/">Web Clipper</a></li>
+</ul>
+</li>
+<li>
+<p>Support</p>
+<ul>
+<li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
+<li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
+<li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
+<li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="https://joplinapp.org/faq/">FAQ</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - Get Started</p>
+<ul>
+<li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
+<li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
+<li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
+<li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+</ul>
+</li>
+<li>
+<p>Development</p>
+<ul>
+<li><a href="https://github.com/laurent22/joplin/blob/dev/BUILD.md">How to build the apps</a></li>
+<li><a href="https://joplinapp.org/spec/e2ee/">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/spec/history/">Note History spec</a></li>
+<li><a href="https://joplinapp.org/spec/sync_lock/">Sync Lock spec</a></li>
+<li><a href="https://joplinapp.org/spec/plugins/">Plugin Architecture spec</a></li>
+<li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
+<li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
+<li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
+</ul>
+</li>
+<li>
+<p>Google Summer of Code 2020</p>
+<ul>
+<li><a href="https://joplinapp.org/gsoc2020/index/">Google Summer of Code 2020</a></li>
+<li><a href="https://joplinapp.org/gsoc2020/ideas/">Project Ideas</a></li>
+</ul>
+</li>
+<li>
+<p>About</p>
+<ul>
+<li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
+<li><a href="https://joplinapp.org/stats/">Stats</a></li>
+<li><a href="https://joplinapp.org/donate/">Donate</a></li>
+</ul>
+</li>
+</ul>
+</div>
+
+	<div class="main">
+<h1>Joplin Server Changelog<a name="joplin-server-changelog" href="#joplin-server-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v1.7.4">server-v1.7.2</a> - 2021-01-24T19:11:10Z<a name="server-v1-7-2-https-github-com-laurent22-joplin-releases-tag-server-v1-7-4-2021-01-24t19-11-10z" href="#server-v1-7-2-https-github-com-laurent22-joplin-releases-tag-server-v1-7-4-2021-01-24t19-11-10z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Fixed: Fixed password hashing when changing password</li>
+<li>Improved: Many other internal changes for increased reliability</li>
+</ul>
+
+		<div class="bottom-links">
+			<a href="https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md">
+				<i class="fa fa-github"></i> Improve this doc
+			</a>
+		</div>
+<script>
+	function stickyHeader() { 
+		return; // Disabled
+
+		if ($(window).scrollTop() > 179) {
+			$('.nav').addClass('sticky'); 
+		} else {
+			$('.nav').removeClass('sticky');
+		}
+	}
+
+	$('#toc').hide();
+
+	$('.help').click(function(event) {
+		event.preventDefault();
+		$('#toc').show();
+	});
+
+	$(window).scroll(function() {
+		stickyHeader();
+	});
+
+	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+	ga('create', 'UA-103586105-1', 'auto');
+	ga('send', 'pageview');
+</script>
+
+</div></div>
+
+<div class="footer">
+Copyright (C) 2016-2021 Laurent Cozic
+</div>
+</body>
+</html>

docs/clipper/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/conflict/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/debugging/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/desktop/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/donate/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/e2ee/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/faq/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/gsoc2020/ideas/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/gsoc2020/index/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/gsod2020/ideas/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/gsod2020/index/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>
@@ -421,19 +423,19 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <tbody>
 <tr>
 <td>Windows (32 and 64-bit)</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.6.8/Joplin-Setup-1.6.8.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.7.10/Joplin-Setup-1.7.10.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a></td>
 </tr>
 <tr>
 <td>macOS</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.6.8/Joplin-1.6.8.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.7.10/Joplin-1.7.10.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a></td>
 </tr>
 <tr>
 <td>Linux</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.6.8/Joplin-1.6.8.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.7.10/Joplin-1.7.10.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a></td>
 </tr>
 </tbody>
 </table>
-<p><strong>On Windows</strong>, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v1.6.8/JoplinPortable.exe'>Portable version</a>. The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called &quot;JoplinProfile&quot; next to the executable file.</p>
+<p><strong>On Windows</strong>, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v1.7.10/JoplinPortable.exe'>Portable version</a>. The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called &quot;JoplinProfile&quot; next to the executable file.</p>
 <p><strong>On Linux</strong>, the recommended way is to use the following installation script as it will handle the desktop icon too:</p>
 <pre><code style="word-break: break-all">wget -O - https://raw.githubusercontent.com/laurent22/joplin/dev/Joplin_install_and_update.sh | bash</code></pre>
 <h2>Mobile applications<a name="mobile-applications" href="#mobile-applications" class="heading-anchor">🔗</a></h2>
@@ -449,7 +451,7 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <tr>
 <td>Android</td>
 <td><a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplinapp.org/images/BadgeAndroid.png'/></a></td>
-<td>or download the APK file: <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.6.7/joplin-v1.6.7.apk">64-bit</a> <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.6.7/joplin-v1.6.7-32bit.apk">32-bit</a></td>
+<td>or download the APK file: <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.7.2/joplin-v1.7.2.apk">64-bit</a> <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.7.2/joplin-v1.7.2-32bit.apk">32-bit</a></td>
 </tr>
 <tr>
 <td>iOS</td>
@@ -526,6 +528,11 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 </tr>
 <tr>
 <td style="text-align:center"><img width="50" src="https://avatars1.githubusercontent.com/u/29300939?s=96&v=4"/></br><a href="https://github.com/mcejp">mcejp</a></td>
+<td style="text-align:center"><img width="50" src="https://avatars.githubusercontent.com/u/1248504?s=96&v=4"/></br><a href="https://github.com/joesfer">joesfer</a></td>
+<td style="text-align:center"><img width="50" src="https://avatars.githubusercontent.com/u/67130?s=96&v=4"/></br><a href="https://github.com/chr15m">chr15m</a></td>
+</tr>
+<tr>
+<td style="text-align:center"><img width="50" src="https://avatars.githubusercontent.com/u/5782817?s=96&v=4"/></br><a href="https://github.com/piccobit">piccobit</a></td>
 <td style="text-align:center"></td>
 <td style="text-align:center"></td>
 </tr>
@@ -945,70 +952,70 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Arabic</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po">ar</a></td>
 <td><a href="mailto:fi_ahmed_bacha@esi.dz">أحمد باشا إبراهيم</a></td>
-<td>75%</td>
+<td>73%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/basque_country.png" alt=""></td>
 <td>Basque</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po">eu</a></td>
 <td>juan.abasolo@ehu.eus</td>
-<td>32%</td>
+<td>31%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ba.png" alt=""></td>
 <td>Bosnian (Bosna i Hercegovina)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po">bs_BA</a></td>
 <td><a href="mailto:dervis.t@pm.me">Derviš T.</a></td>
-<td>77%</td>
+<td>75%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/bg.png" alt=""></td>
 <td>Bulgarian (България)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po">bg_BG</a></td>
 <td></td>
-<td>62%</td>
+<td>60%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/catalonia.png" alt=""></td>
 <td>Catalan</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po">ca</a></td>
 <td>jmontane, 2019</td>
-<td>89%</td>
+<td>87%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/hr.png" alt=""></td>
 <td>Croatian (Hrvatska)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po">hr_HR</a></td>
 <td><a href="mailto:trbuhom@net.hr">Hrvoje Mandić</a></td>
-<td>26%</td>
+<td>25%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/cz.png" alt=""></td>
 <td>Czech (Česká republika)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po">cs_CZ</a></td>
 <td><a href="mailto:lukas@aiya.cz">Lukas Helebrandt</a></td>
-<td>93%</td>
+<td>91%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/dk.png" alt=""></td>
 <td>Dansk (Danmark)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po">da_DK</a></td>
 <td>Mustafa Al-Dailemi (<a href="mailto:dailemi@hotmail.com">dailemi@hotmail.com</a>)Language-Team:</td>
-<td>77%</td>
+<td>75%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/de.png" alt=""></td>
 <td>Deutsch (Deutschland)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po">de_DE</a></td>
 <td><a href="mailto:atalanttore@users.noreply.github.com">Ettore Atalan</a></td>
-<td>95%</td>
+<td>93%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ee.png" alt=""></td>
 <td>Eesti Keel (Eesti)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po">et_EE</a></td>
 <td></td>
-<td>61%</td>
+<td>60%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/gb.png" alt=""></td>
@@ -1029,154 +1036,154 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Español (España)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po">es_ES</a></td>
 <td><a href="mailto:mario.campo@gmail.com">Mario Campo</a></td>
-<td>99%</td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/esperanto.png" alt=""></td>
 <td>Esperanto</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po">eo</a></td>
 <td>Marton Paulo</td>
-<td>35%</td>
+<td>34%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/fi.png" alt=""></td>
 <td>Finnish (Suomi)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po">fi_FI</a></td>
 <td></td>
-<td>94%</td>
+<td>91%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/fr.png" alt=""></td>
 <td>Français (France)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po">fr_FR</a></td>
 <td>Laurent Cozic</td>
-<td>99%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/galicia.png" alt=""></td>
 <td>Galician (España)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po">gl_ES</a></td>
 <td><a href="mailto:marcoslansgarza@gmail.com">Marcos Lans</a></td>
-<td>40%</td>
+<td>39%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/id.png" alt=""></td>
 <td>Indonesian (Indonesia)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po">id_ID</a></td>
 <td><a href="mailto:16875937+fathyar@users.noreply.github.com">Fathy AR</a></td>
-<td>85%</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/it.png" alt=""></td>
 <td>Italiano (Italia)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po">it_IT</a></td>
 <td><a href="mailto:mailfilledwithspam@gmail.com">Alessandro Bernardello</a></td>
-<td>96%</td>
+<td>94%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/be.png" alt=""></td>
 <td>Nederlands (België, Belgique, Belgien)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po">nl_BE</a></td>
 <td></td>
-<td>32%</td>
+<td>31%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/nl.png" alt=""></td>
 <td>Nederlands (Nederland)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po">nl_NL</a></td>
 <td><a href="mailto:metbril@users.noreply.github.com">MetBril</a></td>
-<td>93%</td>
+<td>91%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/no.png" alt=""></td>
 <td>Norwegian (Norge, Noreg)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po">nb_NO</a></td>
 <td><a href="mailto:code@mxe.no">Mats Estensen</a></td>
-<td>82%</td>
+<td>80%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ir.png" alt=""></td>
 <td>Persian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po">fa</a></td>
 <td><a href="mailto:kourox@protonmail.com">Kourosh Firoozbakht</a></td>
-<td>77%</td>
+<td>75%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/pl.png" alt=""></td>
 <td>Polski (Polska)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po">pl_PL</a></td>
 <td></td>
-<td>92%</td>
+<td>90%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/br.png" alt=""></td>
 <td>Português (Brasil)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po">pt_BR</a></td>
 <td><a href="mailto:rnbastos@gmail.com">Renato Nunes Bastos</a></td>
-<td>91%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/pt.png" alt=""></td>
 <td>Português (Portugal)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po">pt_PT</a></td>
 <td><a href="mailto:jduar@protonmail.com">João Duarte</a></td>
-<td>92%</td>
+<td>90%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ro.png" alt=""></td>
 <td>Română</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po">ro</a></td>
 <td><a href="mailto:cristi.duluta@gmail.com">Cristi Duluta</a></td>
-<td>72%</td>
+<td>70%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/si.png" alt=""></td>
 <td>Slovenian (Slovenija)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po">sl_SI</a></td>
 <td></td>
-<td>40%</td>
+<td>39%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/se.png" alt=""></td>
 <td>Svenska</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po">sv</a></td>
 <td><a href="mailto:jonatan@autistici.org">Jonatan Nyberg</a></td>
-<td>66%</td>
+<td>64%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/th.png" alt=""></td>
 <td>Thai (ประเทศไทย)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po">th_TH</a></td>
 <td></td>
-<td>49%</td>
+<td>48%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/vi.png" alt=""></td>
 <td>Tiếng Việt</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po">vi</a></td>
 <td></td>
-<td>79%</td>
+<td>77%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/tr.png" alt=""></td>
 <td>Türkçe (Türkiye)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po">tr_TR</a></td>
 <td><a href="mailto:arda@kilicdagi.com">Arda Kılıçdağı</a></td>
-<td>99%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/gr.png" alt=""></td>
 <td>Ελληνικά (Ελλάδα)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po">el_GR</a></td>
 <td><a href="mailto:xaris@tuta.io">Harris Arvanitis</a></td>
-<td>89%</td>
+<td>87%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ru.png" alt=""></td>
 <td>Русский (Россия)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po">ru_RU</a></td>
 <td><a href="mailto:thesermanarm@gmail.com">Sergey Segeda</a></td>
-<td>96%</td>
+<td>94%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/rs.png" alt=""></td>
@@ -1190,28 +1197,28 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>中文 (简体)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po">zh_CN</a></td>
 <td><a href="mailto:fungdaat31@outlook.com">WhiredPlanck</a></td>
-<td>99%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/tw.png" alt=""></td>
 <td>中文 (繁體)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po">zh_TW</a></td>
 <td><a href="mailto:yaozeye@yahoo.co.jp">Yaoze Ye</a></td>
-<td>95%</td>
+<td>92%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/jp.png" alt=""></td>
 <td>日本語 (日本)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po">ja_JP</a></td>
 <td><a href="mailto:genneko217@gmail.com">genneko</a></td>
-<td>96%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/kr.png" alt=""></td>
 <td>한국어</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po">ko</a></td>
 <td><a href="mailto:potatogim@potatogim.net">Ji-Hyeon Gim</a></td>
-<td>96%</td>
+<td>97%</td>
 </tr>
 </tbody>
 </table>

docs/markdown/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>
@@ -652,7 +654,7 @@ graph TD;
 <td><a href="https://mermaid-js.github.io/mermaid/">Mermaid</a></td>
 <td><code>```mermaid</code><br/>mermaid syntax...<br/><code>```</code></td>
 <td>See <a href="https://mermaid-js.github.io/mermaid/#/examples">plugin page</a> for full description</td>
-<td>no</td>
+<td>yes</td>
 <td><a href="https://joplinapp.org/images/md_plugins/mermaid.jpg">View</a></td>
 </tr>
 <tr>
@@ -673,7 +675,7 @@ graph TD;
 <td><a href="https://github.com/nagaozen/markdown-it-toc-done-right">TOC</a></td>
 <td>Any of <code>${toc}, [[toc]], [toc], [[_toc_]]</code></td>
 <td>Adds a table of contents to the location of the toc page. Based on headings and sub-headings</td>
-<td>no</td>
+<td>yes</td>
 <td><a href="https://joplinapp.org/images/md_plugins/toc_plugin.jpg">View</a></td>
 </tr>
 <tr>

docs/mobile/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/nextcloud_app/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/note_history/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/plugins/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/prereleases/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/privacy/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/rich_text_editor/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/spec/e2ee/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/e2ee.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/e2ee.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/spec/history/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/history.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/history.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/spec/plugins/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/plugins.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/plugins.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/spec/search_sorting/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/search_sorting.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/search_sorting.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/spec/server_delta_sharing/index.html

@@ -0,0 +1,472 @@
+<!doctype html>
+<html>
+
+<!--
+
+!!! WARNING !!!
+
+This file was auto-generated from readme/spec/server_delta_sharing.md and any manual change
+made to it will be overwritten. To make a change to this file please modify
+the source Markdown file:
+
+https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sharing.md
+
+-->
+
+<head>
+	<title>Joplin Server sharing feature | Joplin</title>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
+	<link rel="shortcut icon" type="image/x-icon" href="https://joplinapp.org/favicon.ico">
+	<!-- <link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css">  -->
+	<link rel="stylesheet" href="https://joplinapp.org/css/fork-awesome.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
+	<style>
+	body {
+		background-color: #F1F1F1;
+		color: #333333;
+	}
+
+	.root {
+		overflow: hidden;
+	}
+
+	a[href^="mailto:"] {
+		word-break: break-all;
+	}
+
+	table {
+		margin-bottom: 1em;
+	}
+	td, th {
+		padding: .8em;
+		border: 1px solid #ccc;
+	}
+
+	.page-markdown table pre,
+	.page-markdown table blockquote {
+		margin-bottom: 0;
+	}
+
+	.page-markdown table pre,
+	.page-markdown table blockquote {
+		margin-bottom: 0;
+	}
+
+	.page-markdown table pre {
+		background-color: rgba(0,0,0,0);
+		border: none;
+		margin: 0;
+		padding: 0;
+	}
+
+	h1, h2 {
+		border-bottom: 1px solid #eaecef;
+		padding-bottom: 0.3em;
+		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+		font-weight: 600;
+		font-size: 2em;
+		margin-bottom: 16px;
+	}
+	h2 {
+		font-size: 1.6em;
+	}
+	h3 {
+		font-size: 1.3em;
+	}
+	code {
+		color: black;
+		background-color: #eee;
+		border: 1px solid #ccc;
+		font-size: .85em;
+	/*	word-break: break-all; */
+	}
+	pre code {
+		border: none;
+	}
+	pre {
+		font-size: .85em;
+	}
+	blockquote {
+		font-size: 1em;
+		color: #555;
+	};
+	#toc ul {
+		margin-bottom: 10px;
+	}
+	#toc > ul > li {
+		margin-bottom: 10px;
+	}
+	#toc {
+		padding-bottom: 1em;
+	}
+	.title {
+		display: flex;
+		align-items: center;
+	}
+	.title-icon {
+		display: flex;
+		height: 1em;
+	}
+	.title-text {
+		display: flex;
+		font-weight: normal;
+		margin-bottom: .2em;
+		margin-left: .5em;
+	}
+	.sub-title {
+		font-weight: normal;
+	}
+	.container {
+		background-color: white;
+		padding: 0;
+		box-shadow: 0 10px 20px #888888;
+	}
+	table.screenshots {
+		margin-top: 2em;
+		margin-bottom: 2em;
+	}
+	table.screenshots th {
+		height: 3em;
+		text-align: center;
+	}
+	table.screenshots th, 
+	table.screenshots td {
+		border: 1px solid #C2C2C2;
+	}
+	img[align="left"] {
+		margin-right: 10px;
+		margin-bottom: 10px;
+	}
+	.mobile-screenshot {
+		height: 40em;
+		padding: 1em;
+	}
+	.cli-screenshot-wrapper {
+		background-color: black;
+		vertical-align: top;
+		padding: 1em 2em 1em 1em;
+	}
+	.cli-screenshot {
+		font-family: "Monaco", "Inconsolata", "CONSOLAS", "Deja Vu Sans Mono", "Droid Sans Mono", "Andale Mono", monospace;
+		background-color: black;
+		color: white;
+		border: none;
+	}
+	.cli-screenshot .prompt {
+		color: #48C2F0;
+	}
+	.top-screenshot {
+		margin-top: 2em;
+		text-align: center;
+	}
+	.header {
+		position: relative;
+		padding-left: 2em;
+		padding-right: 2em;
+		padding-top: 1em;
+		padding-bottom: 1em;
+		color: white;
+		background-color: #2B2B3D;
+	}
+	.header a h1 {
+		color: white;
+	}
+	.header a:hover {
+		text-decoration: none;
+	}
+	.content {
+		padding-left: 2em;
+		padding-right: 2em;
+		padding-bottom: 2em;
+		padding-top: 2em;
+	}
+	.forkme {
+		position: absolute;
+		right: 0;
+		top:0;
+	}
+	.nav-wrapper {
+		position: relative;
+		width: inherit;
+	}
+	.nav {
+		background-color: black;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.nav.sticky {
+		position:fixed;
+		top: 0;
+		width: inherit;
+		box-shadow: 0 0 10px #000000;
+	}
+	.nav a {
+		color: white;
+		display: inline-block;
+		padding: .6em .9em .6em .9em;
+	}
+	.nav ul {
+		padding-left: 2em;
+		margin-bottom: 0;
+		display: table-cell;
+		display: flex;
+		width: 100%;
+	}
+	.nav ul li {
+		display: inline-block;
+		padding: 0;
+	}
+	.nav li.selected {
+		background-color: #222;
+		font-weight: bold;
+	}
+	.nav-right {
+		display: flex;
+		text-align: right;
+		vertical-align: middle;
+		line-height: 0;
+		margin-right: 10px;
+	}
+	.nav-right .share-btn {
+		display: none;
+	}
+	.nav-right .small-share-btn {
+		display: none;
+	}
+	.footer {
+		padding: 2em;
+		border-top: 1px solid #d4d4d4;
+		margin-top: 2em;
+		color: gray;
+		font-size: .9em;
+	}
+	a.heading-anchor {
+		display: inline-block;
+		opacity: 0;
+		width: 1.3em;
+		font-size: 0.7em;
+		margin-left: 0.4em;
+		line-height: 1em;
+		text-decoration: none;
+		transition: opacity 0.3s;
+	}
+	a.heading-anchor:hover,
+	h1:hover a.heading-anchor,
+	h2:hover a.heading-anchor,
+	h3:hover a.heading-anchor,
+	h4:hover a.heading-anchor,
+	h5:hover a.heading-anchor,
+	h6:hover a.heading-anchor {
+		opacity: 1;
+	}
+
+	@media (min-width: 992px) {
+		.content{
+			display: flex;
+		}
+
+		#toc{
+			display: block!important;
+			align-self: flex-start;
+			width: 300px;
+			position: sticky; top: 20px; left: 0;            
+		}
+
+		.main{
+			width: calc(100% - 300px);
+		}
+	}
+
+	.bottom-links {
+		display: flex;
+		justify-content: center;
+		border-top: 1px solid #d4d4d4;
+		margin-top: 30px;
+		padding-top: 25px;
+	}
+
+	@media all and (min-width: 400px) {
+		.nav-right .share-btn {
+			display: inline-block;
+		}
+		.nav-right .small-share-btn {
+			display: none;
+		}
+	}
+</style>
+</head>
+
+<body>
+
+<div class="container root page-server_delta_sharing">
+
+<div class="header">
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 class="title"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png"><span class="title-text">Joplin</span></h1></a>
+	<p class="sub-title">An open source note taking and to-do application with synchronisation capabilities</p>
+</div>
+
+<div class="nav-wrapper">
+	<div class="nav">
+		<ul>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li><a href="https://discourse.joplinapp.org" title="Forum">Forum</a></li>
+			<li><a class="help" href="#" title="Menu">Menu</a></li>
+			<!-- <li><a class="gsod" href="https://joplinapp.org/gsod2020/" title="Google Season of Docs 2020">GSoD 2020</a></li> -->
+		</ul>
+		<div class="nav-right">
+			<!--
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+			-->
+			<iframe class="share-btn share-btn-github" src="https://ghbtns.com/github-btn.html?user=laurent22&repo=joplin&type=star&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+		</div>
+	</div>
+</div>
+
+<div class="content">
+	<div id="toc"><ul>
+<li>
+<p>Applications</p>
+<ul>
+<li><a href="https://joplinapp.org/desktop/">Desktop application</a></li>
+<li><a href="https://joplinapp.org/mobile/">Mobile applications</a></li>
+<li><a href="https://joplinapp.org/terminal/">Terminal application</a></li>
+<li><a href="https://joplinapp.org/clipper/">Web Clipper</a></li>
+</ul>
+</li>
+<li>
+<p>Support</p>
+<ul>
+<li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
+<li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
+<li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
+<li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="https://joplinapp.org/faq/">FAQ</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - Get Started</p>
+<ul>
+<li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
+<li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
+<li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
+<li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+</ul>
+</li>
+<li>
+<p>Development</p>
+<ul>
+<li><a href="https://github.com/laurent22/joplin/blob/dev/BUILD.md">How to build the apps</a></li>
+<li><a href="https://joplinapp.org/spec/e2ee/">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/spec/history/">Note History spec</a></li>
+<li><a href="https://joplinapp.org/spec/sync_lock/">Sync Lock spec</a></li>
+<li><a href="https://joplinapp.org/spec/plugins/">Plugin Architecture spec</a></li>
+<li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
+<li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
+<li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
+</ul>
+</li>
+<li>
+<p>Google Summer of Code 2020</p>
+<ul>
+<li><a href="https://joplinapp.org/gsoc2020/index/">Google Summer of Code 2020</a></li>
+<li><a href="https://joplinapp.org/gsoc2020/ideas/">Project Ideas</a></li>
+</ul>
+</li>
+<li>
+<p>About</p>
+<ul>
+<li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
+<li><a href="https://joplinapp.org/stats/">Stats</a></li>
+<li><a href="https://joplinapp.org/donate/">Donate</a></li>
+</ul>
+</li>
+</ul>
+</div>
+
+	<div class="main">
+<h1>Joplin Server sharing feature<a name="joplin-server-sharing-feature" href="#joplin-server-sharing-feature" class="heading-anchor">🔗</a></h1>
+<h2>Sharing a file via a public URL<a name="sharing-a-file-via-a-public-url" href="#sharing-a-file-via-a-public-url" class="heading-anchor">🔗</a></h2>
+<p>Joplin Server is essentially a file hosting service and it allows sharing files via public URLs. To do so, an API call is made to <code>/api/shares</code> with the ID or path of the file that needs to be shared. This call returns a SHAREID that is then used to access the file via URL. When viewing the file, it will display it according to its mime type. Thus by default a Markdown file will be displayed as plain text.</p>
+<h2>Sharing a note via a public URL<a name="sharing-a-note-via-a-public-url" href="#sharing-a-note-via-a-public-url" class="heading-anchor">🔗</a></h2>
+<p>It is built on top of the file sharing feature. The file corresponding to the note is shared via the above API. Then a separate application, specific to Joplin, read and parse the Markdown file, and display it as note.</p>
+<p>That application works as a viewer - instead of displaying the Markdown file as plain text (by default), it renders it and displays it as HTML.</p>
+<p>The rendering engine is the same as the main applications, which allows us to use the same plugins and settings.</p>
+<h3>Attached resources<a name="attached-resources" href="#attached-resources" class="heading-anchor">🔗</a></h3>
+<p>Any resource attached to the note is also shared - so for example images will be displayed, and it will be possible to open any attached PDF. This</p>
+<h3>Linked note<a name="linked-note" href="#linked-note" class="heading-anchor">🔗</a></h3>
+<p>Any linked note will <strong>not</strong> be shared, due to the following reasons:</p>
+<ul>
+<li>
+<p>Privacy issue - you don't want to accidentally share a note just because it was linked to another note.</p>
+</li>
+<li>
+<p>Even if the linked note has been shared separately, we still don't give access to it. We don't know who that link has been shared with - it could be a different recipient.</p>
+</li>
+</ul>
+<h3>Multiple share links for a given note<a name="multiple-share-links-for-a-given-note" href="#multiple-share-links-for-a-given-note" class="heading-anchor">🔗</a></h3>
+<p>It should be possible to have multiple share links for a given note. For example: I share a note with one person, then the same note with a different person. I revoke the share for one person, but I sill want the other person to access the note.</p>
+<p>So when a share link is created for a note, the API always return a new link.</p>
+<h2>Sharing a note with a user<a name="sharing-a-note-with-a-user" href="#sharing-a-note-with-a-user" class="heading-anchor">🔗</a></h2>
+<p>TBD</p>
+
+		<div class="bottom-links">
+			<a href="https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sharing.md">
+				<i class="fa fa-github"></i> Improve this doc
+			</a>
+		</div>
+<script>
+	function stickyHeader() { 
+		return; // Disabled
+
+		if ($(window).scrollTop() > 179) {
+			$('.nav').addClass('sticky'); 
+		} else {
+			$('.nav').removeClass('sticky');
+		}
+	}
+
+	$('#toc').hide();
+
+	$('.help').click(function(event) {
+		event.preventDefault();
+		$('#toc').show();
+	});
+
+	$(window).scroll(function() {
+		stickyHeader();
+	});
+
+	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+	ga('create', 'UA-103586105-1', 'auto');
+	ga('send', 'pageview');
+</script>
+
+</div></div>
+
+<div class="footer">
+Copyright (C) 2016-2021 Laurent Cozic
+</div>
+</body>
+</html>

docs/spec/server_delta_sync/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sync.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sync.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/spec/server_file_url_format/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_file_url_format.
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_file_url_format.
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/spec/sync_lock/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/stats/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>
@@ -412,15 +414,15 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tbody>
 <tr>
 <td>Total Windows downloads</td>
-<td>1,208,821</td>
+<td>1,225,000</td>
 </tr>
 <tr>
 <td>Total macOs downloads</td>
-<td>470,973</td>
+<td>478,027</td>
 </tr>
 <tr>
 <td>Total Linux downloads</td>
-<td>353,265</td>
+<td>360,638</td>
 </tr>
 <tr>
 <td>Windows %</td>
@@ -449,284 +451,292 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 </thead>
 <tbody>
 <tr>
+<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.7.10">v1.7.10</a></td>
+<td>2021-01-30T13:25:29Z</td>
+<td>517</td>
+<td>169</td>
+<td>409</td>
+<td>1,095</td>
+</tr>
+<tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.6.8">v1.6.8</a></td>
 <td>2021-01-20T18:11:34Z</td>
-<td>2,207</td>
-<td>1,288</td>
-<td>633</td>
-<td>4,128</td>
+<td>17,213</td>
+<td>7,501</td>
+<td>7,505</td>
+<td>32,219</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.6.7">v1.6.7</a></td>
 <td>2021-01-11T23:20:33Z</td>
-<td>9,970</td>
-<td>4,544</td>
-<td>4,502</td>
-<td>19,016</td>
+<td>10,018</td>
+<td>4,575</td>
+<td>4,512</td>
+<td>19,105</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.6.6">v1.6.6</a></td>
 <td>2021-01-09T16:15:31Z</td>
-<td>12,255</td>
-<td>3,392</td>
-<td>4,752</td>
-<td>20,399</td>
+<td>12,317</td>
+<td>3,398</td>
+<td>4,762</td>
+<td>20,477</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.5.14">v1.5.14</a></td>
 <td>2020-12-30T01:48:46Z</td>
-<td>10,482</td>
-<td>5,133</td>
-<td>5,490</td>
-<td>21,105</td>
+<td>10,514</td>
+<td>5,142</td>
+<td>5,496</td>
+<td>21,152</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.5.13">v1.5.13</a></td>
 <td>2020-12-29T18:29:15Z</td>
-<td>587</td>
+<td>589</td>
 <td>209</td>
-<td>186</td>
-<td>982</td>
+<td>187</td>
+<td>985</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.5.12">v1.5.12</a></td>
 <td>2020-12-28T15:14:08Z</td>
-<td>2,317</td>
-<td>1,743</td>
-<td>906</td>
-<td>4,966</td>
+<td>2,321</td>
+<td>1,748</td>
+<td>907</td>
+<td>4,976</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.5.11">v1.5.11</a></td>
 <td>2020-12-27T19:54:07Z</td>
-<td>13,829</td>
-<td>4,588</td>
-<td>4,225</td>
-<td>22,642</td>
+<td>13,849</td>
+<td>4,592</td>
+<td>4,235</td>
+<td>22,676</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.4.19">v1.4.19</a></td>
 <td>2020-12-01T11:11:16Z</td>
-<td>25,176</td>
-<td>12,202</td>
-<td>11,564</td>
-<td>48,942</td>
+<td>25,203</td>
+<td>12,740</td>
+<td>11,568</td>
+<td>49,511</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.4.18">v1.4.18</a></td>
 <td>2020-11-28T12:21:41Z</td>
-<td>11,048</td>
-<td>3,863</td>
-<td>3,035</td>
-<td>17,946</td>
+<td>11,053</td>
+<td>3,865</td>
+<td>3,037</td>
+<td>17,955</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.4.16">v1.4.16</a></td>
 <td>2020-11-27T19:40:16Z</td>
-<td>1,402</td>
-<td>818</td>
+<td>1,408</td>
+<td>819</td>
 <td>582</td>
-<td>2,802</td>
+<td>2,809</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.4.15">v1.4.15</a></td>
 <td>2020-11-27T13:25:43Z</td>
-<td>867</td>
-<td>478</td>
-<td>258</td>
-<td>1,603</td>
+<td>869</td>
+<td>480</td>
+<td>259</td>
+<td>1,608</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.4.12">v1.4.12</a></td>
 <td>2020-11-23T18:58:07Z</td>
-<td>2,889</td>
-<td>1,308</td>
-<td>1,279</td>
-<td>5,476</td>
+<td>2,903</td>
+<td>1,310</td>
+<td>1,281</td>
+<td>5,494</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.3.18">v1.3.18</a></td>
 <td>2020-11-06T12:07:02Z</td>
-<td>30,201</td>
-<td>11,297</td>
-<td>10,483</td>
-<td>51,981</td>
+<td>30,238</td>
+<td>11,299</td>
+<td>10,485</td>
+<td>52,022</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.3.15">v1.3.15</a></td>
 <td>2020-11-04T12:22:50Z</td>
-<td>2,183</td>
-<td>1,286</td>
+<td>2,185</td>
+<td>1,288</td>
 <td>835</td>
-<td>4,304</td>
+<td>4,308</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.2.6">v1.2.6</a></td>
 <td>2020-10-09T13:56:59Z</td>
-<td>43,792</td>
-<td>17,703</td>
-<td>14,016</td>
-<td>75,511</td>
+<td>43,818</td>
+<td>17,705</td>
+<td>14,017</td>
+<td>75,540</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.1.4">v1.1.4</a></td>
 <td>2020-09-21T11:20:09Z</td>
-<td>27,466</td>
-<td>13,482</td>
+<td>27,472</td>
+<td>13,484</td>
 <td>7,704</td>
-<td>48,652</td>
+<td>48,660</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.245">v1.0.245</a></td>
 <td>2020-09-09T12:56:10Z</td>
-<td>20,892</td>
-<td>9,991</td>
-<td>5,629</td>
-<td>36,512</td>
+<td>20,907</td>
+<td>9,992</td>
+<td>5,631</td>
+<td>36,530</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.242">v1.0.242</a></td>
 <td>2020-09-04T22:00:34Z</td>
-<td>12,356</td>
-<td>6,414</td>
+<td>12,362</td>
+<td>6,415</td>
 <td>3,014</td>
-<td>21,784</td>
+<td>21,791</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.241">v1.0.241</a></td>
 <td>2020-09-04T18:06:00Z</td>
-<td>23,202</td>
-<td>5,713</td>
-<td>4,973</td>
-<td>33,888</td>
+<td>23,239</td>
+<td>5,716</td>
+<td>4,978</td>
+<td>33,933</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.233">v1.0.233</a></td>
 <td>2020-08-01T14:51:15Z</td>
-<td>42,686</td>
+<td>42,733</td>
 <td>18,182</td>
 <td>12,351</td>
-<td>73,219</td>
+<td>73,266</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.227">v1.0.227</a></td>
 <td>2020-07-07T20:44:54Z</td>
-<td>40,243</td>
-<td>15,265</td>
+<td>40,257</td>
+<td>15,268</td>
 <td>9,621</td>
-<td>65,129</td>
+<td>65,146</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.224">v1.0.224</a></td>
 <td>2020-06-20T22:26:08Z</td>
-<td>24,745</td>
-<td>10,998</td>
-<td>6,004</td>
-<td>41,747</td>
+<td>24,752</td>
+<td>11,000</td>
+<td>6,005</td>
+<td>41,757</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.220">v1.0.220</a></td>
 <td>2020-06-13T18:26:22Z</td>
-<td>31,587</td>
-<td>9,909</td>
-<td>6,408</td>
-<td>47,904</td>
+<td>31,603</td>
+<td>9,912</td>
+<td>6,409</td>
+<td>47,924</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.218">v1.0.218</a></td>
 <td>2020-06-07T10:43:34Z</td>
-<td>14,524</td>
-<td>6,962</td>
-<td>2,951</td>
-<td>24,437</td>
+<td>14,530</td>
+<td>6,965</td>
+<td>2,952</td>
+<td>24,447</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.216">v1.0.216</a></td>
 <td>2020-05-24T14:21:01Z</td>
-<td>36,882</td>
-<td>14,250</td>
-<td>10,171</td>
-<td>61,303</td>
+<td>36,929</td>
+<td>14,256</td>
+<td>10,172</td>
+<td>61,357</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.201">v1.0.201</a></td>
 <td>2020-04-15T22:55:13Z</td>
-<td>52,917</td>
-<td>20,039</td>
-<td>18,177</td>
-<td>91,133</td>
+<td>52,963</td>
+<td>20,041</td>
+<td>18,179</td>
+<td>91,183</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.200">v1.0.200</a></td>
 <td>2020-04-12T12:17:46Z</td>
-<td>9,548</td>
-<td>4,887</td>
-<td>1,901</td>
-<td>16,336</td>
+<td>9,550</td>
+<td>4,889</td>
+<td>1,902</td>
+<td>16,341</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.199">v1.0.199</a></td>
 <td>2020-04-10T18:41:58Z</td>
-<td>19,282</td>
-<td>5,880</td>
-<td>3,785</td>
-<td>28,947</td>
+<td>19,287</td>
+<td>5,882</td>
+<td>3,786</td>
+<td>28,955</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.197">v1.0.197</a></td>
 <td>2020-03-30T17:21:22Z</td>
-<td>22,151</td>
-<td>9,518</td>
-<td>5,665</td>
-<td>37,334</td>
+<td>22,174</td>
+<td>9,525</td>
+<td>5,672</td>
+<td>37,371</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.195">v1.0.195</a></td>
 <td>2020-03-22T19:56:12Z</td>
-<td>18,880</td>
-<td>7,944</td>
-<td>4,504</td>
-<td>31,328</td>
+<td>18,882</td>
+<td>7,946</td>
+<td>4,505</td>
+<td>31,333</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.193">v1.0.193</a></td>
 <td>2020-03-08T08:58:53Z</td>
-<td>28,618</td>
+<td>28,621</td>
 <td>10,902</td>
 <td>7,374</td>
-<td>46,894</td>
+<td>46,897</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.179">v1.0.179</a></td>
 <td>2020-01-24T22:42:41Z</td>
-<td>70,977</td>
-<td>28,494</td>
-<td>22,508</td>
-<td>121,979</td>
+<td>70,979</td>
+<td>28,499</td>
+<td>22,511</td>
+<td>121,989</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.178">v1.0.178</a></td>
 <td>2020-01-20T19:06:45Z</td>
-<td>17,532</td>
+<td>17,533</td>
 <td>5,959</td>
-<td>2,582</td>
-<td>26,073</td>
+<td>2,583</td>
+<td>26,075</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.175">v1.0.175</a></td>
 <td>2019-12-08T11:48:47Z</td>
-<td>72,235</td>
-<td>16,868</td>
-<td>16,487</td>
-<td>105,590</td>
+<td>72,293</td>
+<td>16,879</td>
+<td>16,491</td>
+<td>105,663</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.174">v1.0.174</a></td>
 <td>2019-11-12T18:20:58Z</td>
 <td>30,396</td>
-<td>11,698</td>
+<td>11,699</td>
 <td>8,219</td>
-<td>50,313</td>
+<td>50,314</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.173">v1.0.173</a></td>
@@ -739,18 +749,18 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.170">v1.0.170</a></td>
 <td>2019-10-13T22:13:04Z</td>
-<td>27,388</td>
+<td>27,392</td>
 <td>8,747</td>
-<td>7,672</td>
-<td>43,807</td>
+<td>7,673</td>
+<td>43,812</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.169">v1.0.169</a></td>
 <td>2019-09-27T18:35:13Z</td>
-<td>17,089</td>
+<td>17,090</td>
 <td>5,918</td>
 <td>3,752</td>
-<td>26,759</td>
+<td>26,760</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.168">v1.0.168</a></td>
@@ -781,8 +791,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td>2019-08-14T21:46:29Z</td>
 <td>18,883</td>
 <td>6,972</td>
-<td>5,461</td>
-<td>31,316</td>
+<td>5,462</td>
+<td>31,317</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.161">v1.0.161</a></td>
@@ -795,10 +805,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.160">v1.0.160</a></td>
 <td>2019-06-15T00:21:40Z</td>
-<td>30,495</td>
+<td>30,500</td>
 <td>7,745</td>
 <td>8,101</td>
-<td>46,341</td>
+<td>46,346</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.159">v1.0.159</a></td>
@@ -867,26 +877,26 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.142">v1.0.142</a></td>
 <td>2019-04-02T16:44:51Z</td>
-<td>14,655</td>
+<td>14,656</td>
 <td>4,565</td>
 <td>4,727</td>
-<td>23,947</td>
+<td>23,948</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.140">v1.0.140</a></td>
 <td>2019-03-10T20:59:58Z</td>
 <td>13,627</td>
 <td>4,170</td>
-<td>3,192</td>
-<td>20,989</td>
+<td>3,194</td>
+<td>20,991</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.135">v1.0.135</a></td>
 <td>2019-02-27T23:36:57Z</td>
-<td>12,494</td>
+<td>12,495</td>
 <td>3,956</td>
 <td>4,077</td>
-<td>20,527</td>
+<td>20,528</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.134">v1.0.134</a></td>
@@ -907,10 +917,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.127">v1.0.127</a></td>
 <td>2019-02-14T23:12:48Z</td>
-<td>9,760</td>
+<td>9,763</td>
 <td>3,170</td>
 <td>2,929</td>
-<td>15,859</td>
+<td>15,862</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.125">v1.0.125</a></td>
@@ -949,8 +959,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td>2018-11-24T12:05:24Z</td>
 <td>16,258</td>
 <td>4,896</td>
-<td>6,380</td>
-<td>27,534</td>
+<td>6,381</td>
+<td>27,535</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.116">v1.0.116</a></td>
@@ -979,10 +989,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.111">v1.0.111</a></td>
 <td>2018-09-30T20:15:09Z</td>
-<td>12,020</td>
-<td>3,300</td>
+<td>12,021</td>
+<td>3,303</td>
 <td>3,668</td>
-<td>18,988</td>
+<td>18,992</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.110">v1.0.110</a></td>
@@ -1077,8 +1087,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td>2018-05-26T16:36:39Z</td>
 <td>2,721</td>
 <td>1,225</td>
-<td>1,654</td>
-<td>5,600</td>
+<td>1,656</td>
+<td>5,602</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.95">v1.0.95</a></td>
@@ -1100,9 +1110,9 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.93">v1.0.93</a></td>
 <td>2018-05-14T11:36:01Z</td>
 <td>1,791</td>
-<td>1,109</td>
+<td>1,112</td>
 <td>759</td>
-<td>3,659</td>
+<td>3,662</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.91">v1.0.91</a></td>
@@ -1131,10 +1141,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.83">v1.0.83</a></td>
 <td>2018-04-04T19:43:58Z</td>
-<td>4,833</td>
+<td>4,837</td>
 <td>2,532</td>
 <td>2,658</td>
-<td>10,023</td>
+<td>10,027</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.82">v1.0.82</a></td>
@@ -1323,10 +1333,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.39">v0.10.39</a></td>
 <td>2017-12-11T21:19:44Z</td>
-<td>5,809</td>
-<td>4,282</td>
-<td>3,183</td>
-<td>13,274</td>
+<td>5,813</td>
+<td>4,286</td>
+<td>3,186</td>
+<td>13,285</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.38">v0.10.38</a></td>
@@ -1395,10 +1405,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.28">v0.10.28</a></td>
 <td>2017-11-30T01:07:46Z</td>
-<td>1,334</td>
+<td>1,336</td>
 <td>1,700</td>
 <td>873</td>
-<td>3,907</td>
+<td>3,909</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.26">v0.10.26</a></td>
@@ -1413,8 +1423,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td>2017-11-24T14:27:49Z</td>
 <td>150</td>
 <td>696</td>
-<td>6,420</td>
-<td>7,266</td>
+<td>6,421</td>
+<td>7,267</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.23">v0.10.23</a></td>

docs/terminal/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/terminal.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/terminal.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>
@@ -415,7 +417,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/terminal.md
 </thead>
 <tbody>
 <tr>
-<td>macOS, Linux, or Windows (via <a href="https://msdn.microsoft.com/en-us/commandline/wsl/faq?f=255&amp;MSPPError=-2147217396">WSL</a>)</td>
+<td>macOS, Linux, or Windows (via <a href="https://docs.microsoft.com/en-us/windows/wsl/faq">WSL</a>)</td>
 <td><strong>Important:</strong> First, <a href="https://nodejs.org/en/download/package-manager/">install Node 10+</a>.<br/><br/><code>NPM_CONFIG_PREFIX=~/.joplin-bin npm install -g joplin</code><br/><code>sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin</code><br><br>By default, the application binary will be installed under <code>~/.joplin-bin</code>. You may change this directory if needed. Alternatively, if your npm permissions are setup as described <a href="https://docs.npmjs.com/getting-started/fixing-npm-permissions#option-2-change-npms-default-directory-to-another-directory">here</a> (Option 2) then simply running <code>npm -g install joplin</code> would work.</td>
 </tr>
 </tbody>

docs/welcome/1_welcome_to_joplin/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/1_welcome_to_joplin.
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/1_welcome_to_joplin.
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/welcome/2_importing_and_exporting_notes/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/2_importing_and_expo
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/2_importing_and_expo
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/welcome/3_synchronising_your_notes/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/3_synchronising_your
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/3_synchronising_your
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/welcome/4_tips/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/4_tips.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/4_tips.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

docs/welcome/5_privacy/index.html

@@ -379,6 +379,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/5_privacy.md
 <li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
 <li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
 <li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +394,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/5_privacy.md
 <ul>
 <li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
 <li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
 <li><a href="https://joplinapp.org/stats/">Stats</a></li>
 <li><a href="https://joplinapp.org/donate/">Donate</a></li>
 </ul>

packages/app-cli/app/cli-integration-tests.js

@@ -4,7 +4,7 @@ const fs = require('fs-extra');
 const Logger = require('@joplin/lib/Logger').default;
 const { dirname } = require('@joplin/lib/path-utils');
 const { DatabaseDriverNode } = require('@joplin/lib/database-driver-node.js');
-const { JoplinDatabase } = require('@joplin/lib/joplin-database.js');
+const JoplinDatabase = require('@joplin/lib/JoplinDatabase').default;
 const BaseModel = require('@joplin/lib/BaseModel').default;
 const Folder = require('@joplin/lib/models/Folder').default;
 const Note = require('@joplin/lib/models/Note').default;

packages/app-cli/app/command-apidoc.js

@@ -4,7 +4,7 @@ const BaseModel = require('@joplin/lib/BaseModel').default;
 const { toTitleCase } = require('@joplin/lib/string-utils.js');
 const { reg } = require('@joplin/lib/registry.js');
 const markdownUtils = require('@joplin/lib/markdownUtils').default;
-const { Database } = require('@joplin/lib/database.js');
+const Database = require('@joplin/lib/database').default;
 const shim = require('@joplin/lib/shim').default;
 
 class Command extends BaseCommand {

packages/app-cli/app/command-set.js

@@ -2,7 +2,7 @@ const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('@joplin/lib/locale');
 const BaseModel = require('@joplin/lib/BaseModel').default;
-const { Database } = require('@joplin/lib/database.js');
+const Database = require('@joplin/lib/database').default;
 const Note = require('@joplin/lib/models/Note').default;
 
 class Command extends BaseCommand {

packages/app-cli/tests/Synchronizer.sharing.ts

@@ -0,0 +1,39 @@
+import { afterAllCleanUp, synchronizerStart, setupDatabaseAndSynchronizer, switchClient } from './test-utils';
+import Note from '@joplin/lib/models/Note';
+import BaseItem from '@joplin/lib/models/BaseItem';
+import shim from '@joplin/lib/shim';
+import Resource from '@joplin/lib/models/Resource';
+
+describe('Synchronizer.sharing', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await setupDatabaseAndSynchronizer(2);
+		await switchClient(1);
+		done();
+	});
+
+	afterAll(async () => {
+		await afterAllCleanUp();
+	});
+
+	it('should mark link resources as shared before syncing', (async () => {
+		let note1 = await Note.save({ title: 'note1' });
+		note1 = await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
+		const resourceId1 = (await Note.linkedResourceIds(note1.body))[0];
+
+		const note2 = await Note.save({ title: 'note2' });
+		await shim.attachFileToNote(note2, `${__dirname}/../tests/support/photo.jpg`);
+
+		expect((await Resource.sharedResourceIds()).length).toBe(0);
+
+		await BaseItem.updateShareStatus(note1, true);
+
+		await synchronizerStart();
+
+		const sharedResourceIds = await Resource.sharedResourceIds();
+		expect(sharedResourceIds.length).toBe(1);
+		expect(sharedResourceIds[0]).toBe(resourceId1);
+	}));
+
+});

packages/app-cli/tests/services_EncryptionService.js

@@ -6,7 +6,7 @@ const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synch
 const Folder = require('@joplin/lib/models/Folder').default;
 const Note = require('@joplin/lib/models/Note').default;
 const Tag = require('@joplin/lib/models/Tag').default;
-const { Database } = require('@joplin/lib/database.js');
+const Database = require('@joplin/lib/database').default;
 const Setting = require('@joplin/lib/models/Setting').default;
 const BaseItem = require('@joplin/lib/models/BaseItem').default;
 const BaseModel = require('@joplin/lib/BaseModel').default;

packages/app-cli/tests/services_rest_Api.ts

@@ -410,8 +410,18 @@ describe('services_rest_Api', function() {
 		const response2 = await api.route(RequestMethod.GET, `notes/${note1.id}/tags`);
 		expect(response2.items.length).toBe(1);
 		await Tag.addNote(tag2.id, note1.id);
-		const response3 = await api.route(RequestMethod.GET, `notes/${note1.id}/tags`);
+		const response3 = await api.route(RequestMethod.GET, `notes/${note1.id}/tags`, { fields: 'id' });
 		expect(response3.items.length).toBe(2);
+
+		// Also check that it only returns the required fields
+		response3.items.sort((a: any, b: any) => {
+			return a.id < b.id ? -1 : +1;
+		});
+
+		const sortedTagIds = [tag.id, tag2.id];
+		sortedTagIds.sort();
+
+		expect(JSON.stringify(response3.items)).toBe(`[{"id":"${sortedTagIds[0]}"},{"id":"${sortedTagIds[1]}"}]`);
 	}));
 
 	it('should update tags when updating notes', (async () => {

packages/app-cli/tests/support/plugins/selected_text/api/JoplinInterop.d.ts

@@ -1,17 +0,0 @@
-import { ExportModule, ImportModule } from './types';
-/**
- * Provides a way to create modules to import external data into Joplin or to export notes into any arbitrary format.
- *
- * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/json_export)
- *
- * To implement an import or export module, you would simply define an object with various event handlers that are called
- * by the application during the import/export process.
- *
- * See the documentation of the [[ExportModule]] and [[ImportModule]] for more information.
- *
- * You may also want to refer to the Joplin API documentation to see the list of properties for each item (note, notebook, etc.) - https://joplinapp.org/api/references/rest_api/
- */
-export default class JoplinInterop {
-    registerExportModule(module: ExportModule): Promise<void>;
-    registerImportModule(module: ImportModule): Promise<void>;
-}

packages/app-cli/tests/test-utils.ts

@@ -18,9 +18,9 @@ import PluginService from '@joplin/lib/services/plugins/PluginService';
 import FileApiDriverJoplinServer from '@joplin/lib/file-api-driver-joplinServer';
 import OneDriveApi from '@joplin/lib/onedrive-api';
 import SyncTargetOneDrive from '@joplin/lib/SyncTargetOneDrive';
+import JoplinDatabase from '@joplin/lib/JoplinDatabase';
 
 const fs = require('fs-extra');
-const { JoplinDatabase } = require('@joplin/lib/joplin-database.js');
 const { DatabaseDriverNode } = require('@joplin/lib/database-driver-node.js');
 import Folder from '@joplin/lib/models/Folder';
 import Note from '@joplin/lib/models/Note';
@@ -52,7 +52,7 @@ import RevisionService from '@joplin/lib/services/RevisionService';
 import ResourceFetcher from '@joplin/lib/services/ResourceFetcher';
 const WebDavApi = require('@joplin/lib/WebDavApi');
 const DropboxApi = require('@joplin/lib/DropboxApi');
-import JoplinServerApi from '@joplin/lib/JoplinServerApi2';
+import JoplinServerApi from '@joplin/lib/JoplinServerApi';
 const { loadKeychainServiceAndSettings } = require('@joplin/lib/services/SettingUtils');
 const md5 = require('md5');
 const S3 = require('aws-sdk/clients/s3');
@@ -402,7 +402,7 @@ async function setupDatabaseAndSynchronizer(id: number, options: any = null) {
 	await fileApi().clearRoot();
 }
 
-function db(id: number = null) {
+function db(id: number = null): JoplinDatabase {
 	if (id === null) id = currentClient_;
 	return databases_[id];
 }
@@ -552,7 +552,7 @@ async function initFileApi(suiteName: string) {
 			username: () => 'admin@localhost',
 			password: () => 'admin',
 		});
-		fileApi = new FileApi(`root:/Apps/Joplin-${suiteName}`, new FileApiDriverJoplinServer(api));
+		fileApi = new FileApi(`Apps/Joplin-${suiteName}`, new FileApiDriverJoplinServer(api));
 	}
 
 	fileApi.setLogger(logger);

packages/app-desktop/app.ts

@@ -31,7 +31,7 @@ import MasterKey from '@joplin/lib/models/MasterKey';
 import Folder from '@joplin/lib/models/Folder';
 const fs = require('fs-extra');
 import Tag from '@joplin/lib/models/Tag';
-const { reg } = require('@joplin/lib/registry.js');
+import { reg } from '@joplin/lib/registry';
 const packageInfo = require('./packageInfo.js');
 import DecryptionWorker from '@joplin/lib/services/DecryptionWorker';
 const ClipperServer = require('@joplin/lib/ClipperServer');
@@ -704,7 +704,7 @@ class Application extends BaseApplication {
 		if (Setting.value('env') === 'dev') {
 			void AlarmService.updateAllNotifications();
 		} else {
-			reg.scheduleSync(1000).then(() => {
+			void reg.scheduleSync(1000).then(() => {
 				// Wait for the first sync before updating the notifications, since synchronisation
 				// might change the notifications.
 				void AlarmService.updateAllNotifications();

packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx

@@ -42,7 +42,7 @@ class ConfigScreenComponent extends React.Component<any, any> {
 
 		this.sidebar_selectionChange = this.sidebar_selectionChange.bind(this);
 		this.checkSyncConfig_ = this.checkSyncConfig_.bind(this);
-		this.checkNextcloudAppButton_click = this.checkNextcloudAppButton_click.bind(this);
+		// this.checkNextcloudAppButton_click = this.checkNextcloudAppButton_click.bind(this);
 		this.showLogButton_click = this.showLogButton_click.bind(this);
 		this.nextcloudAppHelpLink_click = this.nextcloudAppHelpLink_click.bind(this);
 		this.onCancelClick = this.onCancelClick.bind(this);
@@ -57,10 +57,10 @@ class ConfigScreenComponent extends React.Component<any, any> {
 		await shared.checkSyncConfig(this, this.state.settings);
 	}
 
-	async checkNextcloudAppButton_click() {
-		this.setState({ showNextcloudAppLog: true });
-		await shared.checkNextcloudApp(this, this.state.settings);
-	}
+	// async checkNextcloudAppButton_click() {
+	// 	this.setState({ showNextcloudAppLog: true });
+	// 	await shared.checkNextcloudApp(this, this.state.settings);
+	// }
 
 	showLogButton_click() {
 		this.setState({ showNextcloudAppLog: true });
@@ -203,48 +203,48 @@ class ConfigScreenComponent extends React.Component<any, any> {
 				);
 			}
 
-			if (syncTargetMd.name === 'nextcloud') {
-				const syncTarget = settings['sync.5.syncTargets'][settings['sync.5.path']];
+			// if (syncTargetMd.name === 'nextcloud') {
+			// 	const syncTarget = settings['sync.5.syncTargets'][settings['sync.5.path']];
 
-				let status = _('Unknown');
-				let errorMessage = null;
+			// 	let status = _('Unknown');
+			// 	let errorMessage = null;
 
-				if (this.state.checkNextcloudAppResult === 'checking') {
-					status = _('Checking...');
-				} else if (syncTarget) {
-					if (syncTarget.uuid) status = _('OK');
-					if (syncTarget.error) {
-						status = _('Error');
-						errorMessage = syncTarget.error;
-					}
-				}
+			// 	if (this.state.checkNextcloudAppResult === 'checking') {
+			// 		status = _('Checking...');
+			// 	} else if (syncTarget) {
+			// 		if (syncTarget.uuid) status = _('OK');
+			// 		if (syncTarget.error) {
+			// 			status = _('Error');
+			// 			errorMessage = syncTarget.error;
+			// 		}
+			// 	}
 
-				const statusComp = !errorMessage || this.state.checkNextcloudAppResult === 'checking' || !this.state.showNextcloudAppLog ? null : (
-					<div style={statusStyle}>
-						<p style={theme.textStyle}>{_('The Joplin Nextcloud App is either not installed or misconfigured. Please see the full error message below:')}</p>
-						<pre>{errorMessage}</pre>
-					</div>
-				);
+			// 	const statusComp = !errorMessage || this.state.checkNextcloudAppResult === 'checking' || !this.state.showNextcloudAppLog ? null : (
+			// 		<div style={statusStyle}>
+			// 			<p style={theme.textStyle}>{_('The Joplin Nextcloud App is either not installed or misconfigured. Please see the full error message below:')}</p>
+			// 			<pre>{errorMessage}</pre>
+			// 		</div>
+			// 	);
 
-				const showLogButton = !errorMessage || this.state.showNextcloudAppLog ? null : (
-					<a style={theme.urlStyle} href="#" onClick={this.showLogButton_click}>[{_('Show Log')}]</a>
-				);
+			// 	const showLogButton = !errorMessage || this.state.showNextcloudAppLog ? null : (
+			// 		<a style={theme.urlStyle} href="#" onClick={this.showLogButton_click}>[{_('Show Log')}]</a>
+			// 	);
 
-				const appStatusStyle = Object.assign({}, theme.textStyle, { fontWeight: 'bold' });
+			// 	const appStatusStyle = Object.assign({}, theme.textStyle, { fontWeight: 'bold' });
 
-				settingComps.push(
-					<div key="nextcloud_app_check" style={this.rowStyle_}>
-						<span style={theme.textStyle}>Beta: {_('Joplin Nextcloud App status:')} </span><span style={appStatusStyle}>{status}</span>
-						&nbsp;&nbsp;
-						{showLogButton}
-						&nbsp;&nbsp;
-						<Button level={ButtonLevel.Secondary} style={{ display: 'inline-block' }} title={_('Check Status')} disabled={this.state.checkNextcloudAppResult === 'checking'} onClick={this.checkNextcloudAppButton_click}/>
-						&nbsp;&nbsp;
-						<a style={theme.urlStyle} href="#" onClick={this.nextcloudAppHelpLink_click}>[{_('Help')}]</a>
-						{statusComp}
-					</div>
-				);
-			}
+			// 	settingComps.push(
+			// 		<div key="nextcloud_app_check" style={this.rowStyle_}>
+			// 			<span style={theme.textStyle}>Beta: {_('Joplin Nextcloud App status:')} </span><span style={appStatusStyle}>{status}</span>
+			// 			&nbsp;&nbsp;
+			// 			{showLogButton}
+			// 			&nbsp;&nbsp;
+			// 			<Button level={ButtonLevel.Secondary} style={{ display: 'inline-block' }} title={_('Check Status')} disabled={this.state.checkNextcloudAppResult === 'checking'} onClick={this.checkNextcloudAppButton_click}/>
+			// 			&nbsp;&nbsp;
+			// 			<a style={theme.urlStyle} href="#" onClick={this.nextcloudAppHelpLink_click}>[{_('Help')}]</a>
+			// 			{statusComp}
+			// 		</div>
+			// 	);
+			// }
 		}
 
 		let advancedSettingsButton = null;

packages/app-desktop/gui/MainScreen/commands/newNote.ts

@@ -28,6 +28,8 @@ export const runtime = (): CommandRuntime => {
 
 			newNote = await Note.save(newNote, { provisional: true });
 
+			void Note.updateGeolocation(newNote.id);
+
 			utils.store.dispatch({
 				type: 'NOTE_SELECT',
 				id: newNote.id,

packages/app-desktop/gui/MenuBar.tsx

@@ -19,7 +19,7 @@ import stateToWhenClauseContext from '../services/commands/stateToWhenClauseCont
 import bridge from '../services/bridge';
 
 const { connect } = require('react-redux');
-const { reg } = require('@joplin/lib/registry.js');
+import { reg } from '@joplin/lib/registry';
 const packageInfo = require('../packageInfo.js');
 const { clipboard } = require('electron');
 const Menu = bridge().Menu;

packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx

@@ -30,7 +30,7 @@ const { clipboard } = require('electron');
 const shared = require('@joplin/lib/components/shared/note-screen-shared.js');
 const Menu = bridge().Menu;
 const MenuItem = bridge().MenuItem;
-const { reg } = require('@joplin/lib/registry.js');
+import { reg } from '@joplin/lib/registry';
 
 const menuUtils = new MenuUtils(CommandService.instance());
 
@@ -371,7 +371,7 @@ function CodeMirror(props: NoteBodyEditorProps, ref: any) {
 			/* These must be important to prevent the codemirror defaults from taking over*/
 			.CodeMirror {
 				font-family: monospace;
-				font-size: ${theme.editorFontSize}px;
+				font-size: ${props.fontSize}px;
 				height: 100% !important;
 				width: 100% !important;
 				color: inherit !important;

packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx

@@ -31,7 +31,7 @@ import Setting from '@joplin/lib/models/Setting';
 
 // import eventManager from '@joplin/lib/eventManager';
 
-const { reg } = require('@joplin/lib/registry.js');
+import { reg } from '@joplin/lib/registry';
 
 // Based on http://pypl.github.io/PYPL.html
 const topLanguages = [

packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/styles/index.ts

@@ -2,7 +2,7 @@ import { NoteBodyEditorProps } from '../../../utils/types';
 const { buildStyle } = require('@joplin/lib/theme');
 
 export default function styles(props: NoteBodyEditorProps) {
-	return buildStyle('CodeMirror', props.themeId, (theme: any) => {
+	return buildStyle(['CodeMirror', props.fontSize], props.themeId, (theme: any) => {
 		return {
 			root: {
 				position: 'relative',
@@ -49,8 +49,8 @@ export default function styles(props: NoteBodyEditorProps) {
 				flex: 1,
 				overflowY: 'hidden',
 				paddingTop: 0,
-				lineHeight: `${theme.textAreaLineHeight}px`,
-				fontSize: `${theme.editorFontSize}px`,
+				lineHeight: `${Math.round(17 * props.fontSize / 12)}px`,
+				fontSize: `${props.fontSize}px`,
 				color: theme.color,
 				backgroundColor: theme.backgroundColor,
 				codeMirrorTheme: theme.codeMirrorTheme, // Defined in theme.js

packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.ts

@@ -5,7 +5,7 @@ import { extname } from 'path';
 import shim from '@joplin/lib/shim';
 import uuid from '@joplin/lib/uuid';
 
-const { reg } = require('@joplin/lib/registry.js');
+import { reg } from '@joplin/lib/registry';
 
 export default function useExternalPlugins(CodeMirror: any, plugins: PluginStates) {
 

packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useKeymap.ts

@@ -3,7 +3,7 @@ import CommandService from '@joplin/lib/services/CommandService';
 import KeymapService, { KeymapItem } from '@joplin/lib/services/KeymapService';
 import { EditorCommand } from '../../../utils/types';
 import shim from '@joplin/lib/shim';
-const { reg } = require('@joplin/lib/registry.js');
+import { reg } from '@joplin/lib/registry';
 
 export default function useKeymap(CodeMirror: any) {
 

packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx

@@ -16,7 +16,7 @@ import shim from '@joplin/lib/shim';
 
 const { MarkupToHtml } = require('@joplin/renderer');
 const taboverride = require('taboverride');
-const { reg } = require('@joplin/lib/registry.js');
+import { reg } from '@joplin/lib/registry';
 import BaseItem from '@joplin/lib/models/BaseItem';
 const { themeStyle } = require('@joplin/lib/theme');
 const { clipboard } = require('electron');

packages/app-desktop/gui/NoteEditor/NoteEditor.tsx

@@ -34,7 +34,7 @@ import ExternalEditWatcher from '@joplin/lib/services/ExternalEditWatcher';
 const { themeStyle } = require('@joplin/lib/theme');
 const { substrWithEllipsis } = require('@joplin/lib/string-utils');
 const NoteSearchBar = require('../NoteSearchBar.min.js');
-const { reg } = require('@joplin/lib/registry.js');
+import { reg } from '@joplin/lib/registry';
 import Note from '@joplin/lib/models/Note';
 import Folder from '@joplin/lib/models/Folder';
 const bridge = require('electron').remote.require('./bridge').default;
@@ -399,6 +399,7 @@ function NoteEditor(props: NoteEditorProps) {
 		onDrop: onDrop,
 		noteToolbarButtonInfos: props.toolbarButtonInfos,
 		plugins: props.plugins,
+		fontSize: Setting.value('style.editor.fontSize'),
 	};
 
 	let editor = null;