6184 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laurent Cozic	7c92015fe6	Desktop: Fixes #4983: Fixed readability of links in notification banners	2021-06-21 19:30:20 +01:00
Laurent Cozic	0e757ad562	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-06-21 19:09:17 +01:00
Laurent Cozic	0c12c7f811	Server: Split permission to share note or folder	2021-06-21 19:06:44 +01:00
Helmut K. C. Tessarek	5ecb870ffd	Update translations	2021-06-21 11:26:49 -04:00
Helmut K. C. Tessarek	e58e2a3421	All: Translation: Update da_DK.po (thanks ERYpTION)	2021-06-21 11:21:41 -04:00
Abdallah Ahmed	2e7e1948f8	Docs: Fix a typo in JoplinViewsDialogs.ts comments (#5108) ... Just fixed a small typo in the comments.	2021-06-21 13:32:17 +01:00
Laurent Cozic	caabdbd815	Desktop: Fixed note history line count information (Regression)	2021-06-21 10:06:36 +01:00
Laurent Cozic	65e9268e83	Mobile: Fixed version number on config screen	2021-06-21 08:55:02 +01:00
Laurent Cozic	4eec54cd48	Android 2.1.2	2021-06-20 19:37:13 +01:00
Laurent Cozic	5ef5888bfb	Android release v2.1.2	2021-06-20 19:35:28 +01:00
Laurent Cozic	12aae48ce6	Server: Fixed transaction locking issue when a sub-transaction fails	2021-06-20 19:30:33 +01:00
Laurent Cozic	5bb68ba65d	All: Fixed issue when trying to sync an item associated with a share that no longer exists	2021-06-20 19:29:59 +01:00
Laurent Cozic	112157e33f	Server: Fixed handling of max item size for encrypted items	2021-06-20 16:29:35 +01:00
Laurent Cozic	d129744138	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-06-20 14:35:56 +01:00
Laurent Cozic	975951ccbc	Doc: Clarified logo and icon license	2021-06-20 14:33:33 +01:00
Denys Golubiev	efb6aaf8cc	Linux: Fixes #5105: Use --no-sandbox option for Linux Mint LDME 4 Debbie as well. (#5106)	2021-06-20 14:19:12 +01:00
Laurent Cozic	9323caf2f1	Fixed revision issue for old revisions	2021-06-20 13:59:58 +01:00
Laurent Cozic	d13b1f96ba	fixed tests	2021-06-20 13:46:50 +01:00
Laurent Cozic	8e55fe31ee	fix tests	2021-06-20 12:30:45 +01:00
Laurent Cozic	50ecdc2ff1	Plugins: Add support for read and writing text, HTML and images from/to clipboard	2021-06-20 12:03:18 +01:00
Laurent Cozic	8a2ca0535d	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-06-20 11:20:51 +01:00
Laurent Cozic	097e49d797	All: Fixes #5051: Fixed error that could prevent a revision from being created, and that would prevent the revision service from processing the rest of the notes	2021-06-20 11:19:59 +01:00
Longhao.Chen	11ffbe7d66	Update zh_CN.po (#5101)	2021-06-20 09:50:43 +01:00
Laurent Cozic	e79f965e5d	Android 2.1.1	2021-06-19 18:27:27 +01:00
Laurent Cozic	8cc103a062	Android release v2.1.1	2021-06-19 17:42:08 +01:00
Laurent Cozic	7f05efb789	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-06-19 17:35:19 +01:00
Laurent Cozic	5b368e39ca	Mobile: Allow enabling and disabling feature flags	2021-06-19 17:32:36 +01:00
Laurent Cozic	b88bbc74a2	Desktop release v2.1.3	2021-06-19 16:26:39 +01:00
Laurent Cozic	fc132216cb	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-06-19 16:25:53 +01:00
Laurent Cozic	1dc49c7673	Desktop release v2.1.2	2021-06-19 16:25:19 +01:00
Laurent Cozic	ab9bbcbff2	Plugins: Fixed saving secure settings to the keychain, and added way to store plugin settings to settings.json	2021-06-19 15:56:37 +01:00
Laurent Cozic	b7b12f9369	Server v2.1.3	2021-06-19 15:15:25 +01:00
Laurent Cozic	d8752ab889	Tools: Fixed Docker image tagging for pre-releases	2021-06-19 15:14:19 +01:00
Laurent Cozic	372495afd3	Desktop release v2.1.1	2021-06-19 14:28:27 +01:00
Laurent Cozic	2320934853	Server v2.1.2	2021-06-19 14:25:15 +01:00
Laurent Cozic	326fef486c	All: Added feature flags to disable Joplin Server sync optimisations by default, so that it still work with server 2.0	2021-06-19 14:22:53 +01:00
Laurent Cozic	7aff6d271d	Cli: Added flag to disable local lock when synchronising	2021-06-19 11:41:36 +01:00
Laurent Cozic	a86a80b21c	Fixed column type for Postgres	2021-06-19 11:05:06 +01:00
Laurent Cozic	4dc1210eb5	All: Improved first sync speed when synchronising with Joplin Server	2021-06-19 10:34:44 +01:00
Laurent Cozic	0222c0f0a6	All: Allow uploading items in batch when synchronising with Joplin Server	2021-06-18 17:17:25 +01:00
Laurent Cozic	63f7349c17	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-06-18 17:15:01 +01:00
Laurent Cozic	3b9c02e92d	Server: Add support for uploading multiple items in one request	2021-06-18 11:50:06 +01:00
Helmut K. C. Tessarek	cef5834d73	All: Update Mermaid: 8.8.4 -> 8.10.2 (#5092)	2021-06-18 08:53:16 +01:00
Francisco Mora	b341caf287	All: Translation: Update es_ES.po (#5096)	2021-06-17 22:15:48 -04:00
小骏	fc063fe68e	All: Translation: Update zh_CN.po (#5079) ... * update zh_CN.po * update zh_CN.po	2021-06-17 20:36:11 +01:00
Laurent Cozic	d73eab6f82	Fixed tests	2021-06-17 18:32:52 +01:00
Laurent Cozic	d698ea0c12	Server v2.1.1	2021-06-17 18:27:54 +01:00
Laurent Cozic	e04133cfc6	Setup new release 2.1	2021-06-17 18:26:58 +01:00
Laurent Cozic	525ab01b9b	Mobile: Add version number to log	2021-06-17 18:19:32 +01:00
Laurent Cozic	0d33955fcd	All: Mask auth token and password in log	2021-06-17 18:17:23 +01:00