5480 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Po-chiang Chao	545940f545	All: Translation: Update zh_TW.po (#4278) ... Include new strings and fuzzy translated strings	2021-01-01 19:18:52 -05:00
Laurent Cozic	d58f39823a	Doc: Added link to new specs, and added more details to delta sync spec	2021-01-01 13:25:05 +00:00
Laurent Cozic	f9fb1b8a81	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-01-01 13:04:30 +00:00
Laurent Cozic	56ded0062a	All: Add more log info when a revision cannot be deleted due to still-encrypted itel	2021-01-01 13:04:15 +00:00
Laurent Cozic	83b29d7c51	macOS: Fixed paste as text in Rich Text editor	2021-01-01 12:38:17 +00:00
Arda Kılıçdağı	1ec0746263	All: Translation: Update tr_TR.po (#4274) ... Hello, You can find the updated Turkish translations in this pull request. Also, happy new year! 🎉	2020-12-31 12:08:09 -05:00
Laurent Cozic	568d11bddf	Merge branch 'dev' of github.com:laurent22/joplin into dev	2020-12-31 16:04:06 +00:00
Laurent Cozic	97b25ac99d	Doc: Add spec for Joplin Server delta sync	2020-12-31 15:58:38 +00:00
Laurent Cozic	7f1d3d8a5d	Doc: Added spec for server URL formats	2020-12-31 12:38:22 +00:00
Elaborendum	fde201fbe9	All: Translation: Update es_ES.po (#4260) ... * Updated es_ES.po * Reverting some changes * Redid translation using current .po file	2020-12-31 00:59:25 -05:00
Laurent Cozic	694a1b4ede	Merge branch 'dev' of github.com:laurent22/joplin into dev	2020-12-30 23:53:20 +00:00
Laurent Cozic	20d126b39d	Server: Fixed access control on user list and clean up	2020-12-30 23:50:44 +00:00
Helmut K. C. Tessarek	8ca9c3092a	Clipper release v1.6.1	2020-12-30 14:50:47 -05:00
Laurent Cozic	d2771029a3	Server: Support for notifications and clean up	2020-12-30 18:35:18 +00:00
Laurent Cozic	4128c53fcf	Update French translation	2020-12-30 13:07:41 +00:00
Laurent Cozic	a14410b28c	Android release v1.6.4	2020-12-30 12:04:25 +00:00
Laurent Cozic	d1f8520e6e	Mobile: Fixed package import issue	2020-12-30 11:51:43 +00:00
Laurent Cozic	d76746b8e4	Android release v1.6.3	2020-12-30 11:05:04 +00:00
Laurent Cozic	89d173b460	Mobile: Add support for Joplin Server	2020-12-30 10:54:00 +00:00
Laurent Cozic	81aba8b8b0	Server: Fixed pagination	2020-12-30 02:24:29 +00:00
Laurent Cozic	9e076bf194	Desktop release v1.5.14	2020-12-30 00:18:46 +00:00
Laurent Cozic	74a797b410	Desktop, Cli: Fixed importing ENEX files that contain hidden sections	2020-12-30 00:17:15 +00:00
Laurent Cozic	f48697572d	Server: Fixed file count issue for PostgreSQL	2020-12-29 23:48:34 +00:00
Laurent Cozic	e61e8b7b94	Server: Fixed URLs	2020-12-29 23:22:57 +00:00
Laurent Cozic	1deab7e8d1	Android release v1.6.2	2020-12-29 19:42:30 +00:00
Laurent Cozic	86b28b5ecf	Desktop release v1.6.1	2020-12-29 18:30:38 +00:00
Laurent Cozic	938e723434	Merge branch 'dev' of github.com:laurent22/joplin into dev	2020-12-29 18:07:02 +00:00
Laurent Cozic	ee2ec28cd4	Server: Add basic file manager	2020-12-29 18:04:57 +00:00
Helmut K. C. Tessarek	9dc505e85b	fix typo in source and all translations	2020-12-29 12:10:52 -05:00
Helmut K. C. Tessarek	3df31584af	update en_US.po	2020-12-29 11:50:31 -05:00
Zhang YANG	a7e3b381cb	All: Translation: Update zh_CN.po (#4263)	2020-12-29 11:23:33 -05:00
Laurent Cozic	70381a233b	Merge branch 'release-1.5' into dev	2020-12-29 16:17:18 +00:00
Laurent Cozic	2966fe0df2	Desktop release v1.5.13	2020-12-29 16:14:27 +00:00
Laurent Cozic	143f0b4bc5	Desktop, Cli: Improve support for SVG images when importing ENEX files	2020-12-29 15:58:20 +00:00
Helmut K. C. Tessarek	24ec3b8897	Update translations (for new server code)	2020-12-28 15:17:17 -05:00
Beowulf2	01aa4f9d5e	All: Translation: Update de_DE.po (#4258)	2020-12-28 14:39:58 -05:00
Manuel Tassi	520efdcb39	All: Translation: Update it_IT.po (#4256) ... * Update it_IT.po * Update it_IT.po * Update it_IT.po	2020-12-28 14:39:38 -05:00
Laurent Cozic	34a99f738c	linter	2020-12-28 17:26:15 +00:00
Laurent Cozic	0e0de1207f	Server: Adding basic file manager	2020-12-28 16:37:12 +00:00
Laurent Cozic	2fda067034	Server: Improved logging and error handling	2020-12-28 15:15:30 +00:00
Laurent Cozic	29177330b0	Merge branch 'release-1.5' into dev	2020-12-28 14:31:37 +00:00
Laurent Cozic	66a5490b54	Desktop release v1.5.12	2020-12-28 14:29:37 +00:00
Laurent Cozic	469cd19ec1	Desktop: Fix issue when importing ENEX file that contains invalid list elements	2020-12-28 14:29:02 +00:00
Laurent	41684a64ef	Server: Add Joplin Server package (#1872)	2020-12-28 11:48:47 +00:00
Laurent Cozic	2cd7839552	Increase version num to 1.6	2020-12-27 22:46:27 +00:00
Laurent Cozic	c3d4617612	Update website	2020-12-27 22:41:47 +00:00
Laurent Cozic	158fafc4a0	Merge branch 'release-1.5' into dev	2020-12-27 22:40:26 +00:00
Laurent Cozic	0f59731c06	Plugin Generator release v1.5.3	2020-12-27 22:28:16 +00:00
Laurent Cozic	d0f1a67d96	Plugins: Updated types	2020-12-27 22:26:17 +00:00
Laurent Cozic	2a1434f987	Generator: Fixed publish logic	2020-12-27 22:25:17 +00:00