6785 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laurent Cozic	c45f961b8c	Server: Fixed Stripe checkout when a coupon is used	2021-09-26 18:09:52 +01:00
Laurent Cozic	05ec7cc8fa	All: Implemented htmlpack package which could be used to export an HTML file and all its resources into a single HTML file	2021-09-26 17:58:06 +01:00
Laurent Cozic	57a1d03b4b	Server: Do not allow accepting share more than once	2021-09-26 17:58:06 +01:00
小骏	1df2d8d7af	All: Translation: Update zh_CN.po (#5504)	2021-09-26 09:15:39 -04:00
Laurent Cozic	b1d0c15210	Desktop, Cli: Make exported HTML more readable on mobile	2021-09-26 12:01:46 +01:00
Laurent Cozic	2fd4fb3e73	Server v2.4.10	2021-09-25 20:07:23 +01:00
Laurent Cozic	9f17b28f85	Chore: Cleaned up server UserItem interface	2021-09-25 19:51:44 +01:00
Laurent Cozic	8ada059401	Desktop: Improved accepting a folder share	2021-09-25 18:00:43 +01:00
Laurent Cozic	0175348868	Server: Improved share service reliability and optimised performance	2021-09-25 17:39:42 +01:00
Laurent Cozic	e8e8ea3780	typo	2021-09-24 15:14:00 +01:00
Laurent Cozic	3c13c8d080	Tools: Allow tagging a server release as "latest"	2021-09-23 17:13:54 +01:00
Laurent Cozic	97bfd5ef04	Tools: Add test unit for building Docker image	2021-09-23 16:48:26 +01:00
Laurent Cozic	e3fd34e5d6	Server: Security: Implement clickjacking defense	2021-09-23 15:56:40 +01:00
Laurent Cozic	f144daed96	Desktop, Cli: Allow importing certain corrupted ENEX files	2021-09-23 15:35:49 +01:00
Laurent Cozic	add9d884e6	Doc: Improved pre-release doc and link to it from Donate section	2021-09-23 14:18:31 +01:00
Laurent Cozic	62f81b4315	Chore: Converts ENEX import file to TypeScript	2021-09-23 13:16:22 +01:00
Laurent Cozic	f33088fbe0	Android 2.4.2	2021-09-22 18:12:29 +01:00
Laurent Cozic	31b6d06418	lock files	2021-09-22 17:38:35 +01:00
Laurent Cozic	06cd5ffa2d	Server v2.4.9	2021-09-22 17:32:27 +01:00
Laurent Cozic	f3d4d8eaed	Desktop release v2.4.8	2021-09-22 17:29:57 +01:00
Gen Neko	dc08e1ded5	All: Translation: Update ja_JP.po (#5488)	2021-09-22 05:57:58 -04:00
reportxx	31c3fec8d8	All: Translation: Update sv.po (#5484)	2021-09-22 05:57:22 -04:00
Laurent Cozic	4487cb85fc	Tools: Trying to fix tests	2021-09-21 16:26:56 +01:00
Laurent Cozic	56cac1f729	Desktop: Fixes #5161: Improved plugin search and installing new plugins from China	2021-09-21 16:22:58 +01:00
Laurent Cozic	3ade7ed849	Doc: Clarified Joplin Cloud Education Discount	2021-09-21 13:29:29 +01:00
Laurent Cozic	a7eea9fc21	Fixed session swap handling on server	2021-09-21 12:31:53 +01:00
Laurent Cozic	7fac1941cd	Server: Manage subscription entirely from Stripe	2021-09-21 10:51:10 +01:00
Laurent Cozic	061761f224	Server: Clear cookie when account has been deleted to allow viewing login page again	2021-09-21 10:49:41 +01:00
Laurent Cozic	63e88c05d9	Server: Add support for changing user own email	2021-09-20 19:48:17 +01:00
Laurent Cozic	a6b1cffd50	Server: Handle Joplin Cloud failed subscription payments	2021-09-20 17:04:09 +01:00
Laurent Cozic	8cc720963a	Fixed typo	2021-09-20 17:04:08 +01:00
Laurent Cozic	da884752a8	Desktop: Fixed Sync Wizard logo images on Windows	2021-09-20 16:29:05 +01:00
Laurent Cozic	818c7d4640	Fixed CSRF handling when impersonating user	2021-09-20 15:38:26 +01:00
Laurent Cozic	4577c9c161	Server: Allow entering coupon code on Stripe checkout page	2021-09-20 15:25:59 +01:00
Laurent Cozic	03b4b6eb2d	Server: Allow an admin to impersonate a user	2021-09-20 13:49:38 +01:00
Laurent Cozic	4d38397cd5	Server: Improved user list page	2021-09-20 12:20:18 +01:00
Laurent Cozic	37d446b970	Server: Rename admin button "Send reset password email" to more correct "Send account information email"	2021-09-20 11:53:35 +01:00
Laurent Cozic	c91d4bda3c	Server: Redirect to user page after changing a user	2021-09-20 11:48:51 +01:00
Laurent Cozic	3e537967ee	Tools: Added way to test creating Basic or Pro Joplin Server subscription	2021-09-20 11:46:24 +01:00
Laurent Cozic	0cbc261051	Chore: Remove last remnants of discontinued Nextcloud App	2021-09-19 19:15:10 +01:00
Laurent Cozic	542fdb496a	Set default options	2021-09-19 18:54:14 +01:00
Laurent Cozic	d850eedd78	Server: Link to Joplin Cloud signup page on login page	2021-09-19 18:45:16 +01:00
Laurent Cozic	9429b51694	Chore: Fixed regression on mobile app	2021-09-19 15:27:23 +01:00
Laurent Cozic	72e58ee195	Tools: Trying to fix TaskService test on CI	2021-09-19 15:06:09 +01:00
Helmut K. C. Tessarek	56be4d59f4	Update translations	2021-09-19 08:37:08 -04:00
Laurent Cozic	bb740c75ec	Desktop release v2.4.7	2021-09-19 13:04:59 +01:00
Laurent Cozic	4244f712e1	Merge branch 'dev' into release-2.4	2021-09-19 13:04:36 +01:00
Laurent Cozic	e447acc076	Desktop: Resolves #5440: Do not escape content when copying from Rich Text editor	2021-09-19 13:00:06 +01:00
Laurent Cozic	87f83236cf	Desktop: Fixes #5480: Underline was not applied when using Cmd+U in Rich Text editor	2021-09-19 12:35:06 +01:00
Laurent Cozic	6d981864ef	Desktop: Fixes #5461: Editor max width was not always applied in Rich Text editor	2021-09-19 12:04:23 +01:00