6564 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laurent Cozic	7f00e4ea5b	Desktop: Turn old plugin deprecation notices into errors	2021-08-05 12:02:03 +01:00
Laurent Cozic	8471be16aa	Doc: Improved "work together" section	2021-08-05 11:45:06 +01:00
Laurent Cozic	b8c40da858	Update website	2021-08-05 11:39:00 +01:00
Laurent Cozic	4d3eff3682	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-08-05 11:38:22 +01:00
Laurent Cozic	a16046e8a1	Doc: Updated FAQ	2021-08-05 11:37:49 +01:00
Alexander Dawson	ceb57b515d	All: Translation: Update nb_NO.po (#5263)	2021-08-04 07:24:26 -04:00
Laurent Cozic	c4fcfec581	Server: Clarify beta transition message	2021-08-04 09:34:35 +01:00
Laurent Cozic	2a9654f9ab	Server v2.2.11	2021-08-03 19:48:07 +01:00
Laurent Cozic	724aa726ca	Server: Fixed support emails	2021-08-03 19:47:18 +01:00
Laurent Cozic	0fc4bc05f6	typo	2021-08-03 19:43:20 +01:00
Laurent Cozic	db0e0ee17e	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-08-03 18:25:13 +01:00
Laurent Cozic	6ac22ed0a0	Server: Prevent duplicate Stripe subscriptions and improved Stripe workflow testing	2021-08-03 18:24:33 +01:00
Abdullah Ibnu Hibban	4cfb804d61	All: Translation: Update id_ID.po (thanks to eresytter) (#5251)	2021-08-03 12:54:20 -04:00
reportxx	a3c1be405e	All: Translation: Update sv.po (#5262) ... Please merge this pr to update the Swedish translation.	2021-08-03 12:53:29 -04:00
Laurent Cozic	1f1ee5c3c2	Doc: Add Joplin Cloud student discount info	2021-08-03 17:45:51 +01:00
Laurent Cozic	785248b27f	Server: Disable beta account once expired	2021-08-02 17:56:25 +01:00
Laurent Cozic	89d4d5e642	Update website	2021-08-02 17:44:21 +01:00
Laurent Cozic	8910c87d15	Server: Handle beta user upgrade	2021-08-02 17:43:18 +01:00
Laurent Cozic	447cb2d92d	Server v2.2.10	2021-08-01 11:05:29 +01:00
Laurent Cozic	b5b6111e83	Server: Allows providing a coupon when creating the Stripe checkout session	2021-07-31 17:05:39 +01:00
Laurent Cozic	23553b70e0	Server v2.2.9	2021-07-31 14:53:29 +01:00
Laurent Cozic	03822487ec	Update website	2021-07-31 14:46:37 +01:00
Laurent Cozic	ef35b30645	Doc: Switch to prod mode	2021-07-31 14:45:39 +01:00
Laurent Cozic	edf07488f4	Update website	2021-07-31 14:44:00 +01:00
Laurent Cozic	4f02c7359b	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-31 14:43:32 +01:00
Laurent Cozic	f2547fed8d	Server: Add support for Stripe yearly subscriptions	2021-07-31 14:42:56 +01:00
Helmut K. C. Tessarek	d3a449a86e	All: Translation: Update da_DK.po (thanks ERYpTION)	2021-07-28 13:26:22 -04:00
Laurent Cozic	c76ed7f8ac	Update translations	2021-07-28 13:35:40 +01:00
Laurent Cozic	e9c11f5ac3	Tools: Filtered out problem files from translation build	2021-07-28 13:33:57 +01:00
Laurent Cozic	5c7fa587c0	Tools: Filtered out problem files from translation build	2021-07-28 13:25:49 +01:00
Laurent Cozic	6d86db3cb0	Update website	2021-07-26 18:22:25 +01:00
Laurent Cozic	361802273d	Doc: Added sponsors and automatically build sponsor list on README	2021-07-26 18:21:19 +01:00
Laurent Cozic	8920db5537	Desktop: Fixes #5241: Katex code could be broken after editing it in Rich Text editor	2021-07-26 14:50:31 +01:00
Helmut K. C. Tessarek	d5fcffbac1	All: Translation: Update en_US.po	2021-07-25 19:18:01 -04:00
Helmut K. C. Tessarek	15edd4dfce	Update translations	2021-07-25 19:11:51 -04:00
Laurent Cozic	8b08f0d2b3	Fixed config	2021-07-25 14:21:41 +01:00
Laurent Cozic	fb9ec105df	Desktop: Converted Clipper notification to a modal dialog that shows up in all screens	2021-07-25 13:15:56 +01:00
Laurent Cozic	53b4d7af68	Server: Improve installation instructions	2021-07-25 12:03:23 +01:00
Laurent Cozic	3a3aa701ac	Desktop, Cli: Fixes #5232: Do not export share properties	2021-07-25 11:51:50 +01:00
Laurent Cozic	830712a3bb	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-25 11:15:54 +01:00
Laurent Cozic	dd1f90819c	Server: Fixes #5229: Published notes that contain non-alphabetical characters could end up being truncated	2021-07-25 11:13:27 +01:00
JackGruber	2ed8ac91a9	Server: Add Docker major, minor and beta version tags (#5237)	2021-07-25 10:38:36 +01:00
Helmut K. C. Tessarek	31c3093700	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-24 19:11:27 -04:00
Vaso3	769094f002	All: Translation: Update sr_RS.po (#5234) ... * Update sr_RS.po Added and improved translation in the first 3k lines of the file * Update sr_RS.po Added translation. * Update sr_RS.po Few minor changes and fixed broken string. * Update sr_RS.po Some more corrections * Update sr_RS.po * Update sr_RS.po	2021-07-24 19:10:34 -04:00
Helmut K. C. Tessarek	a60d9fa61f	All: Translation: Update pt_BR.po (thanks kuroppi)	2021-07-24 18:28:20 -04:00
Laurent Cozic	6499ca8e61	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-24 18:57:29 +01:00
Laurent Cozic	2b64b320fb	Fixed tests	2021-07-24 18:56:30 +01:00
Laurent Cozic	282f782d50	Server: Fixed certain URLs	2021-07-24 18:34:42 +01:00
Laurent Cozic	5fcf2e48b3	Server v2.2.8	2021-07-24 17:56:36 +01:00
Laurent Cozic	63d4ccdc61	Merge branch 'dev' into release-2.2	2021-07-24 17:55:41 +01:00