4907 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laurent Cozic	a9b26246e6	Merge branch 'dev' into release-1.2	2020-09-21 11:56:32 +01:00
Laurent Cozic	cc1e941dd9	Merge branch 'release-1.1' into dev	2020-09-21 11:55:47 +01:00
Laurent Cozic	9610b7e6bd	Electron release v1.1.4	2020-09-21 11:42:26 +01:00
Marc BOUVIER	ad85a12535	All: Translation: Update fr_FR.po (#3776)	2020-09-19 13:35:05 -04:00
Ji-Hyeon Gim	b825346829	All: Translation: Update ko.po (#3771) ... Update ko.po translations. Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>	2020-09-19 13:32:37 -04:00
Ettore Atalan	bd4cbaf93d	All: Translation: Update de_DE.po (#3770) ... This patch includes the translation of missing strings, the improvement of the existing translation and the replacement of Anglicisms by German words.	2020-09-19 13:31:25 -04:00
Laurent Cozic	9af2a19bdf	Merge branch 'dev' into release-1.2	2020-09-19 14:22:02 +01:00
Laurent Cozic	d3fa906a9a	Merge branch 'dev' of github.com:laurent22/joplin into dev	2020-09-19 14:20:02 +01:00
Gen Neko	22679641ee	All: Translation: Update ja_JP.po (#3761)	2020-09-18 01:56:18 -04:00
Laurent Cozic	0ca7457000	Electron release v1.1.3	2020-09-17 10:19:25 +01:00
Laurent Cozic	c84e49c71c	All: Fixes #3696: Increased file extension limit to 20 to prevent issue when using external editors	2020-09-17 10:17:45 +01:00
Laurent Cozic	07ab0e986d	Merge branch 'release-1.1' of github.com:laurent22/joplin into release-1.1	2020-09-17 10:00:30 +01:00
Laurent Cozic	17957f5da4	Desktop, Cli: Do not prevent export when one item is still encrypted	2020-09-17 10:00:13 +01:00
Naveen M V	a7b5d43e69	Desktop: Fix: Creating a note after backward redirection places it in a wrong notebook (#3759)	2020-09-17 09:32:52 +01:00
Caleb John	38eda3f151	Desktop: Fixes #3749: Use joplin list handling in emacs mode (#3758)	2020-09-17 09:29:19 +01:00
Laurent	056285deda	Desktop: UI update (#3586)	2020-09-15 14:01:07 +01:00
Laurent Cozic	bdedf69439	Tools: Remove console statement	2020-09-15 12:13:29 +01:00
Laurent Cozic	c9451d8675	Electron release v1.1.2	2020-09-15 12:12:16 +01:00
Laurent Cozic	c38834b04c	Updated French translation	2020-09-15 12:08:49 +01:00
Laurent Cozic	851eee1500	Fixed and simplified translations	2020-09-15 12:08:25 +01:00
Laurent Cozic	40e24102ce	Merge branch 'release-1.1' into dev	2020-09-14 13:06:56 +01:00
Laurent Cozic	7614a795e9	Fixed tests	2020-09-14 13:06:33 +01:00
Laurent Cozic	1273a1dc5f	Merge branch 'dev' of github.com:laurent22/joplin into dev	2020-09-14 11:26:41 +01:00
Laurent Cozic	10909fe4fc	Merge branch 'release-1.1' into dev	2020-09-14 11:26:27 +01:00
Laurent Cozic	9b3d3026bf	Merge branch 'release-1.0' into dev	2020-09-14 11:26:18 +01:00
Laurent Cozic	96076c84f4	CLI v1.0.168	2020-09-14 09:50:09 +01:00
Helmut K. C. Tessarek	2c553db45a	Update translations	2020-09-14 02:22:27 -04:00
Laurent Cozic	7d7005596f	Desktop: Security: Upgrade packages to fix vulnerabilities	2020-09-13 17:25:46 +01:00
Laurent Cozic	998dd52adc	Desktop: Clarifies labels of certain actions, and added shortcut for note list toggle	2020-09-13 17:21:11 +01:00
Patryk Długajczyk	2a1c6d6475	Linux: Fixes #3720: Fix icons path in AppImage build (#3721)	2020-09-12 00:45:44 +01:00
Laurent Cozic	1ba0644142	Merge branch 'release-1.1' of github.com:laurent22/joplin into release-1.1	2020-09-12 00:24:10 +01:00
Laurent Cozic	88ac57d7f3	Tools: Fixed handling of security vulnerabilities in git-changelog	2020-09-12 00:22:17 +01:00
Laurent Cozic	314686bede	Android release v1.1.1	2020-09-12 00:18:03 +01:00
Laurent Cozic	af8845f209	Tools: Fixed Android version handling	2020-09-12 00:10:18 +01:00
Laurent Cozic	c95d7f9d37	Electron release v1.1.1	2020-09-12 00:06:59 +01:00
Laurent Cozic	2510c659e6	Clear build number	2020-09-12 00:06:25 +01:00
Laurent Cozic	b7523e1b21	Merge branch 'dev' into release-1.1	2020-09-12 00:03:29 +01:00
Laurent Cozic	e4e9e801a2	Android: Fix build	2020-09-11 23:57:06 +01:00
Laurent Cozic	524ec12d8a	Android: Remove option for new editor as it crashes the app	2020-09-11 23:56:45 +01:00
Laurent Cozic	1108e8c28a	Merge branch 'release-1.0' into dev	2020-09-11 23:34:44 +01:00
Laurent Cozic	0f1156ab9c	Desktop: Fixed clock sync logic when creating new sync target	2020-09-11 23:33:34 +01:00
Laurent Cozic	2a08cc332a	Merge branch 'dev' of github.com:laurent22/joplin into dev	2020-09-11 23:02:53 +01:00
Naveen M V	5d2baa872e	Desktop: Fix wildcard search (#3713)	2020-09-11 22:52:32 +01:00
Naveen M V	4b377589aa	Desktop: Fix bug with quotes when searching (#3735)	2020-09-11 11:30:57 +01:00
Laurent Cozic	cf78204c85	Doc: Added more info about sync lock refresh mechanism	2020-09-11 11:26:07 +01:00
Laurent Cozic	c513cdd4eb	Desktop: Sync immediately on startup	2020-09-09 14:45:26 +01:00
Laurent Cozic	5f410e80e6	Merge branch 'release-1.0' into dev	2020-09-09 13:59:36 +01:00
Laurent Cozic	2aa7eaa192	Electron release v1.0.245	2020-09-09 12:39:06 +01:00
Laurent Cozic	b24d060281	All: Got clock sync to work on mobile	2020-09-09 12:25:31 +01:00
Laurent Cozic	a014b9347e	Merge branch 'release-1.0' of github.com:laurent22/joplin into release-1.0	2020-09-09 11:39:57 +01:00