1388 Commits

Author	SHA1	Message	Date
Laurent Cozic	c38834b04c	Updated French translation	2020-09-15 12:08:49 +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	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	b7523e1b21	Merge branch 'dev' into release-1.1	2020-09-12 00:03:29 +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
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
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	e4a3cbd2ff	Increase minor version	2020-09-08 01:03:12 +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
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	199c411a7d	CLI v1.0.167	2020-09-04 18:17:24 +01:00
Eduardo Kimmel	085109288f	All: Translation: Update pt_BR.po (#3668) ... Updated some pt_br translations.	2020-08-28 17:43:30 -04:00
Alexander Knyazev	c6cf0f3ba5	All: Translation: Update ru_RU.po (#3666) ... Co-authored-by: Alexander Knyazev <a.knyazev@omprussia.ru>	2020-08-28 17:42:31 -04:00
rnbastos	f9bdce7e24	All: Translation: Update pt_BR.po (#3642) ... Update pt_BR translation.	2020-08-28 17:41:29 -04:00
Kourosh	f8cf4db5db	All: Translation: Update fa.po (#3637)	2020-08-28 17:40:33 -04:00
Naveen M V	82e96840e9	All: When searching, weight notes using Okapi BM25 score (#3454)	2020-08-18 23:53:28 +01:00
Matias Laporte	9d962f0328	All: Translation: Update es_ES.po (#3629)	2020-08-13 20:38:30 -04:00
alexchee	8c7a24282c	All: Fixes #3591: Fixed sync fetching issue (#3599)	2020-08-08 00:30:11 +01:00
Naveen M V	f99f3f8a6d	All: Resolves #1877: Add search filters (#3213)	2020-08-08 00:13:21 +01:00
Laurent Cozic	5ade9ff2f6	Tools: Updated eslint and clarified comma-dangle rule	2020-08-04 23:00:11 +01:00
Laurent Cozic	0718828d60	Merge branch 'master' into dev	2020-08-02 16:12:11 +01:00
Laurent Cozic	d13f54c2ce	CLI v1.0.166	2020-08-02 15:03:57 +01:00
Laurent	0c147236a3	All: Add mechanism to lock and upgrade sync targets (#3524)	2020-08-02 12:28:50 +01:00
Anjula Karunarathne	88f22fabf7	Desktop: Added KeymapService to manage keyboard shortcuts (#3252)	2020-08-02 12:26:55 +01:00
Thatcher Chamberlin	5f46d60c5e	Desktop, Cli, Update Katex to v0.12.0 (#3571)	2020-08-02 12:24:03 +01:00
Laurent Cozic	ab0538df43	All: Security: Apply latest package security updates	2020-08-01 18:56:26 +01:00
Laurent	cd761932c1	Merge branch 'dev' into cli-shortcuts-ts	2020-08-01 17:50:03 +01:00
Laurent Cozic	79e708779f	Merge branch 'master' of github.com:laurent22/joplin	2020-08-01 14:49:31 +01:00
Laurent Cozic	98905f6892	Tools: Cleaned up and improve build config, and fixed TypeScript Watch high CPU usage	2020-08-01 14:48:56 +01:00
Retew	44e57c3959	All: Translation: Update ru_RU.po (#3579)	2020-07-29 23:35:43 -04:00
voltinus	35d48394ce	All: Translation: Update pl_PL.po (#3577)	2020-07-29 23:32:24 -04:00
Laurent Cozic	64d7603eed	Revert "All: Added support for hierarchical/nested tags (#2572)" ... This reverts commit e11e57f1d839754369557698d13fade92047fd4d.	2020-07-28 18:50:34 +01:00
Laurent Cozic	e2d3630783	Tools: Added sync target snapshots	2020-07-25 11:38:43 +01:00
Laurent Cozic	b6dafd6da6	Doc: Showcasing plugins as screenshots (#3549) ... Co-authored-by: Mehrad Mahmoudian <m.mahmoudian@gmail.com>	2020-07-24 19:42:44 +01:00
Laurent Cozic	c19cc1b39a	Merge branch 'master' of github.com:laurent22/joplin	2020-07-24 17:28:55 +01:00
Laurent Cozic	73bd6f9776	Update turndown	2020-07-24 17:28:28 +01:00
WhiredPlanck	6fef55398f	All: Translation: Update zh_CN.po (#3542) ... * [trans] Update zh_CN.po * [trans] Give the specific names of AWS secret and AWS key	2020-07-24 11:58:09 -04:00
Laurent Cozic	8f8d11c9b3	Desktop: Fixes #3510: Note links would be broken after saving a note in Rich Text editor	2020-07-23 19:38:42 +00:00
Laurent Cozic	1cd86fd3ea	Cli: Fixes #3548: Desktop-only scripts were incorrectly being loaded in CLI server tool	2020-07-23 19:04:04 +00:00
Helmut K. C. Tessarek	62bc296abe	Update translations	2020-07-19 15:18:42 -04:00
Gen Neko	e58dc809ec	All: Translation: Update ja_JP.po (#3526) ... Translate new strings for the nested tag and note properties.	2020-07-19 14:41:40 -04:00
Arda Kılıçdağı	abd57ad384	All: Translation: Update tr_TR.po (#3523) ... Turkish translations updated	2020-07-18 13:42:48 -04:00