6927 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laurent Cozic	f371bb8e59	Revert "Merge branch 'desktop-protocol' of https://github.com/roman-r-m/joplin into dev" ... This reverts commit 7c85889c1f, reversing changes made to ab134807ea. Reason: Messed up and accidentally merged a pull request.	2021-09-03 15:03:17 +01:00
Laurent Cozic	7c85889c1f	Merge branch 'desktop-protocol' of https://github.com/roman-r-m/joplin into dev	2021-09-03 15:00:31 +01:00
Piotr Banasik	ab134807ea	Server: Enable multi platform builds (amd64, armv7 and arm64) (#5338)	2021-09-03 14:54:10 +01:00
Laurent Cozic	a5b3bb6058	Doc: Add Joplin Cloud links	2021-09-03 14:50:21 +01:00
Laurent Cozic	8ab1cd984c	Server v2.4.3	2021-09-02 18:49:29 +01:00
Laurent Cozic	e387d9a91b	Merge branch 'dev' into release-2.4	2021-09-02 18:48:43 +01:00
Laurent Cozic	0793b1be59	Releasing sub-packages	2021-09-02 18:40:37 +01:00
Laurent Cozic	19225abbcf	Android 2.4.1	2021-09-02 18:40:37 +01:00
Laurent Cozic	85fa3288ab	Desktop release v2.4.4	2021-09-02 18:40:36 +01:00
Laurent Cozic	17f82c426a	Chore: Added server test	2021-09-02 11:44:13 +01:00
Laurent Cozic	82331c9b93	Server: Display note title as page title when sharing note	2021-09-02 11:37:53 +01:00
Roman	886b6d1126	Add stuff to maybe get it to work on MacOS	2021-09-01 22:46:44 +01:00
Roman	1a703c4ecd	Rename ProtocolUtils -> callbackUrlUtils	2021-09-01 22:28:33 +01:00
Roman	1126899769	Code review changes	2021-09-01 22:27:24 +01:00
James Wu	a571d38862	installer script regex match bracket fix in Debian version check (#5405)	2021-09-01 13:27:16 -06:00
Laurent Cozic	4ab2fb73b7	Doc: Added social links in footer	2021-09-01 15:21:56 +01:00
Laurent Cozic	78c7b79299	Fixed margin	2021-09-01 12:47:35 +01:00
Laurent Cozic	d97ba57dda	Desktop: Sort plugin results according to recommended property, and display Recommended tag	2021-09-01 12:17:20 +01:00
Laurent Cozic	9c44133bd0	Plugin Repo: Allow overridding manifest properties and added recommended plugins	2021-08-31 22:37:56 +01:00
Laurent Cozic	dc008ecf64	Doc: typo	2021-08-31 17:24:40 +01:00
Laurent Cozic	93a4ad09bb	Server: Fixed calculation of max sizes for Postgres	2021-08-31 16:15:20 +01:00
Laurent Cozic	9c1dc7898a	Doc: Add more links to FAQ	2021-08-31 15:39:02 +01:00
Laurent Cozic	6520a481ca	Server: Added Help page for Joplin Cloud	2021-08-31 13:46:46 +01:00
Laurent Cozic	5805a41249	Server: Added icon next to profile button	2021-08-31 12:16:57 +01:00
Laurent Cozic	b88b747ba6	Api: Resolves #5199: Add support for "events" end point to retrieve info about latest note changes	2021-08-30 18:53:24 +01:00
Laurent Cozic	ce89ee5bab	All: Add support for single master password, to simplify handling of multiple encryption keys	2021-08-30 14:15:35 +01:00
SiderealArt	596f679b1f	All: Translation: Update zh_TW.po (#5398)	2021-08-30 07:36:38 -04:00
Laurent Cozic	78d5fd1385	Server v2.4.2	2021-08-28 18:46:45 +01:00
Helmut K. C. Tessarek	0a98854e43	Update translations	2021-08-28 11:50:02 -04:00
Helmut K. C. Tessarek	a8a0dd2dd6	All: Translation: Update da_DK.po (thanks ERYpTION)	2021-08-28 11:49:01 -04:00
Laurent Cozic	ad931a738f	Desktop release v2.4.3	2021-08-28 15:52:09 +01:00
Laurent Cozic	3b6e6e45cf	Desktop: Resolves #5161: Display link to browse plugins when repository cannot be reached	2021-08-28 15:45:27 +01:00
Laurent Cozic	dec0a08954	Desktop, Mobile: Fixes #5391: Fixed crash when a required master key does not exist	2021-08-28 15:36:05 +01:00
Roman	b269c2fdb9	Simplify protocol setup	2021-08-28 14:26:54 +01:00
Laurent Cozic	ad51090cdb	Chore: Convert changelog tool to TypeScript	2021-08-28 10:49:31 +01:00
Aaron	bd4714037c	Doc: Fix committer name in Joplin Server changelog (#5390) ... Signed-off-by: Aaron <admin@datahoarder.dev>	2021-08-28 10:27:21 +01:00
Laurent Cozic	75d118b19e	Desktop release v2.4.2	2021-08-27 17:21:05 +01:00
Laurent Cozic	9296b0ae36	Merge branch 'release-2.4' of github.com:laurent22/joplin into release-2.4	2021-08-27 17:19:31 +01:00
Arda Kılıçdağı	1862030cff	All: Translation: Update tr_TR.po (#5372)	2021-08-27 17:18:26 +01:00
小骏	8a3eb8616e	All: Translation: Update zh_CN.po (#5371)	2021-08-27 17:18:26 +01:00
Laurent Cozic	4c72de8bd8	Desktop: Fixes #5380: Prevent it from crashing with too long search queries	2021-08-27 17:16:09 +01:00
Laurent Cozic	d6da4299ad	Desktop: Fixes #5346: "Move to notebook" would break with empty input	2021-08-27 16:58:42 +01:00
Laurent Cozic	f19c4ab434	Desktop: Allow specific deprecated plugins to still work	2021-08-27 16:34:39 +01:00
Laurent Cozic	70efaddeaf	All: Do not display master key upgrade warnings for new master keys	2021-08-27 11:30:21 +01:00
Laurent Cozic	814f602bd6	Chore: Moved EncryptionService under e2ee directory	2021-08-23 18:47:07 +01:00
Laurent Cozic	da6a5e3bb8	Doc: Added CVE number for server CSRF vulnerability	2021-08-23 14:53:41 +01:00
Laurent Cozic	385b50d6ce	Tools: Create test user with flag	2021-08-23 14:52:07 +01:00
Laurent Cozic	43943299f3	Server: Display user flags in profile when logged in as admin	2021-08-23 14:52:07 +01:00
Laurent Cozic	f11ba29112	Server v2.4.1	2021-08-23 14:51:28 +01:00
Arda Kılıçdağı	edf801a1ef	All: Translation: Update tr_TR.po (#5372)	2021-08-23 09:16:54 -04:00