4675 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laurent Cozic	88ac57d7f3	Tools: Fixed handling of security vulnerabilities in git-changelog	2020-09-12 00:22:17 +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
Laurent Cozic	582ab4ac13	All: Implemented more reliable way to sync device and server clocks that would work with filesystem sync too	2020-09-09 11:39:13 +01:00
Laurent Cozic	c9adccad4a	Get NTP time working on Android	2020-09-09 10:56:17 +01:00
Laurent Cozic	f41ba67e15	Improved ntp time	2020-09-09 00:34:27 +01:00
Laurent Cozic	1f70a76c7e	Desktop: Fixes #3729: Fix lock issue when device does not have the right time	2020-09-08 23:57:48 +01:00
Cristi	5fe3732a38	All: Translation: Update ro.po (#3728)	2020-09-08 18:29:07 -04:00
Harris Arvanitis	445533cfcc	All: Translation: Update el_GR.po (#3718)	2020-09-08 18:28:42 -04:00
Laurent Cozic	a8e29249d6	Electron release v1.1.244	2020-09-08 01:03:29 +01:00
Laurent Cozic	e4a3cbd2ff	Increase minor version	2020-09-08 01:03:12 +01:00
Laurent Cozic	96b7ce9d50	Electron release v1.0.243	2020-09-08 00:57:35 +01:00
Laurent Cozic	2bbc1e7ecd	Desktop: Fixes #3710: Fix applying tags to multiple notes	2020-09-08 00:49:58 +01:00
Laurent Cozic	83619b279d	Desktop: Fixes #3697: Fixed copying link in Rich Text editor	2020-09-08 00:29:31 +01:00
Laurent Cozic	8b5a99d494	Desktop: Fixes #3553: Fixed viewer font size, in particular for inline code	2020-09-08 00:00:43 +01:00
Laurent Cozic	67d4123608	Desktop: Add log statement to try to fix issue #3536	2020-09-07 23:55:37 +01:00
Laurent Cozic	a424e3c899	Desktop, Cli: Fixes #3689: Fixed note export when there are folders with non-existing parents. Also fixed long path issue on Windows.	2020-09-07 22:12:51 +01:00
Laurent	08d4b5a714	Mobile: Fixes #3022: Fix issue with action button disappearing in some contexts (#3702)	2020-09-07 17:42:16 +01:00
Laurent Cozic	68aefd5e4c	Desktop: Rename menu item from "Export" to "Export all" to clarify what it does	2020-09-07 17:33:51 +01:00
Laurent Cozic	57d750bc9a	All: Security: Disallow EMBED tags to prevent XSS vulnerability	2020-09-06 19:29:42 +01:00
Caleb John	fbe966903b	Desktop: Resolves #3560: Make codemirror the default code editor (#3703)	2020-09-06 16:28:23 +01:00
Jose Esteve	652748f969	Cli: Resolves #3711: Fix keytar library being loaded up in FreeBSD. (#3712) ... Issue https://github.com/laurent22/joplin/issues/3711 This patch replaces the 'isLinux' check by a more restrictive version which fixes the false positive in BSD systems. This was causing Joplin not to load due to the lack of X11 in headless mode.	2020-09-06 15:20:38 +01:00
Naveen M V	e108fdb1d8	Desktop: Fuzzy search (#3632)	2020-09-06 13:07:00 +01:00
Anjula Karunarathne	a8296e2e37	Desktop: Add keyboard shortcut editor (#3525)	2020-09-06 13:00:25 +01:00
Laurent Cozic	0998fc0ad7	Doc: Update dontate page	2020-09-05 22:49:40 +01:00
Laurent Cozic	d5f3e860b9	Merge branch 'dev' of github.com:laurent22/joplin into dev	2020-09-05 22:48:42 +01:00
Laurent Cozic	4e624f7db5	Doc: Added new sponsor	2020-09-05 22:28:28 +01:00
Anton Deriabin	5b697b7e16	Doc: Fixed wrong e2ee spec link (#3655)	2020-09-05 00:14:49 +01:00
Caleb John	30e0d69a74	Desktop: Load Codemirror css in index.html (#3673)	2020-09-05 00:02:20 +01:00
Caleb John	652816fd26	Desktop: Change codemirror default home and end to be visual line based (#3672)	2020-09-05 00:01:06 +01:00
Laurent Cozic	3a33e5f416	Electron release v1.0.242	2020-09-04 22:46:26 +01:00
Laurent Cozic	277dac5512	Desktop: Fixes sync target upgrade issue when custom TLS settings are used	2020-09-04 22:46:09 +01:00
Laurent Cozic	81d97d9f9d	Update website	2020-09-04 19:34:43 +01:00
Laurent Cozic	a4873cd40d	Android release v1.0.340	2020-09-04 19:22:28 +01:00
Laurent Cozic	20cb2daf43	Merge branch 'dev' of github.com:laurent22/joplin into dev	2020-09-04 19:15:04 +01:00