224 Commits

Author	SHA1	Message	Date
Laurent Cozic	aeb8b31b86	Server: Fixes #5269: Fixed layout of notes on mobile devices	2021-08-11 18:17:59 +01:00
Laurent Cozic	34d6742563	Revert "Tools: Upgrade package locks to v2" ... Revert because it's been done in release-2.2 and too much of a mess to fix the conflicts. This reverts commit 94232b667d.	2021-08-11 16:41:38 +01:00
Laurent Cozic	94232b667d	Tools: Upgrade package locks to v2	2021-08-10 22:58:45 +01:00
Laurent Cozic	77cdd3467d	Server: Resolves #5286: Set better filename and mime type for files downloaded via published notes	2021-08-10 19:13:16 +01:00
Laurent Cozic	4b5318c6d0	Server: Re-enable account when subscription is paid	2021-08-10 18:21:15 +01:00
Laurent Cozic	a3b37ca59d	Merge branch 'release-2.2' into dev	2021-08-10 16:56:26 +01:00
Laurent Cozic	b90ec3af1e	Tools: Update version numbers of sub-packages	2021-08-10 15:41:54 +01:00
Laurent Cozic	6359c9ca98	Server: Fix regression	2021-08-09 22:22:31 +01:00
Laurent Cozic	f14c74d802	Server: Disable upload for accounts with subscription failed payments	2021-08-09 19:00:22 +01:00
Laurent Cozic	391204c31e	Server: Allow setting email key to prevent the same email to be sent multiple times	2021-08-09 16:55:04 +01:00
Laurent Cozic	a16046e8a1	Doc: Updated FAQ	2021-08-05 11:37:49 +01: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	6ac22ed0a0	Server: Prevent duplicate Stripe subscriptions and improved Stripe workflow testing	2021-08-03 18:24:33 +01:00
Laurent Cozic	785248b27f	Server: Disable beta account once expired	2021-08-02 17:56:25 +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	f2547fed8d	Server: Add support for Stripe yearly subscriptions	2021-07-31 14:42:56 +01:00
Laurent Cozic	8b08f0d2b3	Fixed config	2021-07-25 14:21:41 +01:00
Laurent Cozic	53b4d7af68	Server: Improve installation instructions	2021-07-25 12:03:23 +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
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	19b45de298	Server: Added form tokens to prevent CSRF attacks	2021-07-24 17:45:30 +01:00
Laurent Cozic	b7e9848428	Server: Allow users to cancel Stripe subscription	2021-07-24 16:44:50 +01:00
Laurent Cozic	3f993af7fd	Server: Explain how to use Joplin Server with a Joplin app	2021-07-24 15:14:07 +01:00
Laurent Cozic	e83ab93644	Server: Allow user to upgrade account	2021-07-23 20:34:30 +01:00
Laurent Cozic	75a421edb1	Server: Allow admin to change Stripe subscription	2021-07-23 17:03:49 +01:00
Laurent Cozic	252d0695a4	Server: Handle Stripe webhook receiving multiple times the same event	2021-07-22 21:54:21 +01:00
Laurent Cozic	27c3cbdf8f	Server: Allow enabling or disabling a user. Handle cancelling subscription.	2021-07-22 17:32:10 +01:00
Laurent Cozic	4567b78f0c	Server: Clarify error message when user info cannot be saved	2021-07-16 17:05:15 +01:00
Laurent Cozic	92520e58fb	Server: Set default of env SUPPORT_EMAIL to "SUPPORT_EMAIL" to make it clear it needs to be set	2021-07-16 16:56:21 +01:00
Laurent Cozic	7245aead39	Server: Make sure email URLs are displayed as clickable links	2021-07-16 16:37:18 +01:00
Laurent Cozic	9823ac3379	Tools: Fixed server test user creation	2021-07-16 16:35:58 +01:00
Laurent Cozic	4ceca9e44c	Doc: Clean up styling and bug fixes	2021-07-12 10:37:58 +01:00
Laurent Cozic	6a93cb289e	Server: Moved email templates to separate files	2021-07-11 22:11:20 +01:00
Laurent Cozic	952b2b3427	Server v2.2.7	2021-07-11 18:32:05 +01:00
Laurent Cozic	ff8f230555	Renamed "Share note" to "Publish note"	2021-07-11 18:08:42 +01:00
Laurent Cozic	1808367d78	comment	2021-07-11 18:05:51 +01:00
Laurent Cozic	89f4ca14e8	Server: Fixed mail queue as some emails were not being processed	2021-07-11 18:03:44 +01:00
Laurent Cozic	f761bad6bb	Tools: Jest slow threshold	2021-07-11 16:30:50 +01:00
Laurent Cozic	62b619865a	Server: Added support for resetting user password	2021-07-11 16:28:07 +01:00