Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,426 Commits
245 Branches
1,287 Tags
540 MiB
Commit Graph

454 Commits (dd705680f159ee485bc1a1cf6bc06f7235a9b79d)

Author SHA1 Message Date
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 e3fd34e5d6 Server: Security: Implement clickjacking defense 2021-09-23 15:56:40 +01:00
Laurent Cozic 06cd5ffa2d Server v2.4.9 2021-09-22 17:32:27 +01:00
Laurent Cozic 4487cb85fc Tools: Trying to fix tests 2021-09-21 16:26:56 +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 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 d850eedd78 Server: Link to Joplin Cloud signup page on login page 2021-09-19 18:45:16 +01:00
Laurent Cozic 72e58ee195 Tools: Trying to fix TaskService test on CI 2021-09-19 15:06:09 +01:00
Laurent Cozic 4244f712e1 Merge branch 'dev' into release-2.4 2021-09-19 13:04:36 +01:00
Laurent Cozic 43c594b6b2 Server, Desktop: Sync deleted items first to allow fixing oversized accounts 2021-09-18 15:02:24 +01:00
Laurent Cozic 024967ce60 Server: Fixed calculating total item size after an item has been deleted 2021-09-18 14:46:10 +01:00
Laurent Cozic cd877f64cd Server: Improved support for background tasks and added admin UI to view them 2021-09-18 11:29:24 +01:00
Laurent Cozic b56177a4e3 Tools: Added tools to stress test Joplin Server 2021-09-17 10:59:10 +01:00
Laurent Cozic 4e70ca6fd0 Server: Exclude certain queries from slow log 2021-09-16 17:36:06 +01:00
Laurent Cozic 2e04656b54 Server v2.4.8 2021-09-15 23:17:14 +01:00
Laurent Cozic 5e8b7420ff Server: Added support for app level slow SQL query log 2021-09-15 23:14:14 +01:00
Laurent Cozic 8ae4e30fd2 Server v2.4.7 2021-09-15 16:58:59 +01:00
Laurent Cozic 3ce947e82c Server: Fixed handling of brute force limiter by getting correct user IP 2021-09-15 16:57:18 +01:00
Laurent Cozic c2298213d7 Server: Improve flag logic 2021-09-15 12:06:01 +01:00
Laurent Cozic 3cddac3931 Server v2.4.6 2021-09-14 16:02:51 +01:00
Laurent Cozic 41c1e3bec9 Server: Fix transaction deadlock logging 2021-09-14 15:59:01 +01:00
Laurent Cozic 25c5892e74 Server v2.4.5 2021-09-14 13:02:56 +01:00
Laurent Cozic b00959e143 Server v2.4.4 2021-09-14 12:16:47 +01:00
Laurent Cozic 01b653fc34 Server: Add transaction info to debug deadlock issues 2021-09-14 12:05:29 +01:00
Laurent Cozic 4e7fe66883 Server: Add link to Stripe subscription page to manage payment details 2021-09-13 12:30:36 +01:00
Laurent Cozic 8ab1cd984c Server v2.4.3 2021-09-02 18:49:29 +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
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 78d5fd1385 Server v2.4.2 2021-08-28 18:46:45 +01:00
Laurent Cozic 814f602bd6 Chore: Moved EncryptionService under e2ee directory 2021-08-23 18:47:07 +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
Laurent Cozic 6e087bcb23 Server: Handle flags for accounts over limit 2021-08-22 13:10:29 +01:00
Laurent Cozic f922e9a239 Server: Moved database types to separate file 2021-08-22 11:43:41 +01:00
Laurent Cozic 82b157b491 Server: Add support for user flags 2021-08-22 11:28:15 +01:00
Laurent Cozic 50f421c5d9 Tools: Setup release 2.4 2021-08-21 10:46:46 +01:00
Laurent Cozic 1efe3d3c6a Server: Prevent crash when returning too many rows using SQLite 2021-08-18 12:48:22 +01:00
Laurent Cozic 0cec4753d8 Server: Fixes #5328: Filenames with non-ascii characters could not be downloaded from published note 2021-08-17 23:29:46 +01:00
Laurent Cozic ac82e4b074 Server: Re-enable account when new subscription is associated with it 2021-08-17 12:23:26 +01:00
Laurent Cozic 5c50ee9b14 Merge branch 'release-2.3' into dev 2021-08-16 11:00:21 +01:00
Laurent Cozic fd78306111 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-15 12:22:46 +01:00
Laurent Cozic 2a732ba03d Merge branch 'dev' into release-2.3 2021-08-15 12:15:28 +01:00
Laurent Cozic bcadb3662b Server: Increase cookies security - set HttpOnly, Secure and SameSite flags 2021-08-15 11:09:52 +01:00
Aaron 7b2c271070
Server: Fix missing CSS file error in DevTools (#5309) 2021-08-15 10:26:29 +01:00
Laurent Cozic e0971baec4 Tools: Fixed tests 2021-08-15 00:54:24 +01:00
Laurent Cozic c7421dfbe1 Server: Fixed second duration 2021-08-15 00:39:28 +01:00
Laurent Cozic 543413d64b Server: Add request rate limter on session and login end points 2021-08-15 00:31:27 +01:00
Laurent Cozic 2c79ce25fa Server: Added commands to control db migrations - list, down, up 2021-08-14 17:49:01 +01:00
Laurent Cozic 6ae5ccb638 Server v2.3.7 2021-08-13 22:20:21 +01:00
Laurent Cozic 30a23ea118 Merge branch 'dev' into release-2.3 2021-08-13 22:20:05 +01:00
Laurent Cozic a9961ae3ec Server: Fix migrations 2021-08-13 22:19:20 +01:00
Laurent Cozic d42d17e1ed Server v2.3.6 2021-08-13 21:59:45 +01:00
Laurent Cozic 60ef24a3f7 Merge branch 'dev' into release-2.3 2021-08-13 21:59:29 +01:00
Laurent Cozic f518549cfe Server: Fix migrations 2021-08-13 21:58:39 +01:00
Laurent Cozic d0ffc03ccc Server v2.3.5 2021-08-13 19:01:31 +01:00
Laurent Cozic 32c8cc9030 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-13 18:59:55 +01:00
Laurent Cozic d42d181f31 Server: Fixed pagination link styling 2021-08-13 18:59:45 +01:00
Laurent Cozic 1478c368c5 Server v2.3.4 2021-08-13 17:57:06 +01:00
Laurent Cozic c96ec36d0d Server v2.3.3 2021-08-13 10:15:38 +01:00
Laurent Cozic bd907ddeb2 Tools: Trying again to upgrade lock files to v2 2021-08-12 18:01:55 +01:00
Laurent Cozic f7e90490e9 Server v2.3.2 2021-08-12 17:26:58 +01:00
Laurent Cozic ba3cbfa051 Server v2.3.1 2021-08-12 16:50:56 +01:00
Laurent Cozic 9c37a3e5e4 Setup new release 2.3 2021-08-12 16:49:37 +01:00
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
Laurent Cozic 240cb35756 Server: Check password complexity 2021-07-11 15:04:01 +01:00
Laurent Cozic f8d2c26c8e Server: Disallow changing email address until a secure solution to change it is implemented 2021-07-11 11:35:49 +01:00
Laurent Cozic 54130bb4af Doc: Fixed download page on mobile and other tweaks 2021-07-10 12:40:48 +01:00
Laurent 5214da0a44
Doc: Added new website front page and moved doc under /help (#5169) 2021-07-10 11:16:13 +01:00
Laurent Cozic aa4f1146ca Server v2.2.6 2021-07-09 16:58:19 +01:00
Laurent Cozic 5a27d4dc31 Server: Fixed change processing logic 2021-07-09 16:52:23 +01:00
Laurent Cozic 6c1a6b0a61 Server: Fixed styling of shared note 2021-07-04 16:17:09 +01:00
Laurent Cozic f3359158b9 Server v2.2.5 2021-07-03 22:40:48 +01:00
Laurent Cozic e210926340 Server: Make app context immutable and derive the per-request context properties from it 2021-07-03 22:39:54 +01:00
Laurent Cozic 492c5851e3 Server v2.2.4 2021-07-03 22:11:29 +01:00
Laurent Cozic 238cc86590 Server: Fixed issue with user sessions being mixed up 2021-07-03 22:08:50 +01:00
Laurent Cozic 51d5e57b9f Server v2.2.3 2021-07-03 20:38:51 +01:00
Laurent Cozic 264f36f257 Server: Fixed size of a database field 2021-07-03 20:37:27 +01:00
Laurent Cozic 082c8ffecb Server v2.2.2 2021-07-03 19:28:47 +01:00
Laurent Cozic 8883df24df Server: Only emit "created" event when new user is saved 2021-07-03 19:24:23 +01:00
Laurent Cozic d99c34f1dd Server: Improved logging and reliability of cron tasks 2021-07-03 19:23:43 +01:00
Laurent Cozic 7d9a222fbb Server v2.2.1 2021-07-03 16:41:57 +01:00
Laurent Cozic 0bc892e40e Setup version 2.2 2021-07-03 16:40:44 +01:00
Laurent Cozic 125af75b93 Server: Remove dangerous "Delete all" button for now 2021-07-03 16:30:40 +01:00
Laurent Cozic 3d18514c3c Server: Display max size info in dashboard 2021-07-03 16:24:36 +01:00
Laurent Cozic 7447793e77 Server: Hide "Is Admin" from dashboard 2021-07-03 16:10:15 +01:00
Laurent Cozic 427218b1f4 Server: Normalize email addresses before saving them 2021-07-03 16:06:05 +01:00
Laurent Cozic b507fbf837 Server: Add support for account max total size 2021-07-03 15:27:55 +01:00
Laurent Cozic bfa7ea7871 Server: Moved Joplin-specific context properties under its own namespace 2021-07-02 18:53:45 +01:00
Laurent Cozic 65d87220de Server v2.1.6 2021-06-24 11:01:59 +01:00
Laurent Cozic f86879778b Server: Fixed accessing main website (Regression) 2021-06-24 11:00:31 +01:00
Laurent Cozic 5390e100e6 Server v2.1.5 2021-06-24 09:26:53 +01:00
Laurent Cozic 51f3c0016e All, Server: Add support for X-API-MIN-VERSION header 2021-06-24 09:25:58 +01:00
Laurent Cozic c2cd1733cc Server v2.1.4 2021-06-24 08:26:20 +01:00
Laurent Cozic 8e712eacf5 Fixed tsc build 2021-06-21 21:32:05 +01:00
Laurent Cozic 0c12c7f811 Server: Split permission to share note or folder 2021-06-21 19:06:44 +01:00
Laurent Cozic 12aae48ce6 Server: Fixed transaction locking issue when a sub-transaction fails 2021-06-20 19:30:33 +01:00
Laurent Cozic 112157e33f Server: Fixed handling of max item size for encrypted items 2021-06-20 16:29:35 +01:00
Laurent Cozic b7b12f9369 Server v2.1.3 2021-06-19 15:15:25 +01:00
Laurent Cozic 2320934853 Server v2.1.2 2021-06-19 14:25:15 +01:00
Laurent Cozic a86a80b21c Fixed column type for Postgres 2021-06-19 11:05:06 +01:00
Laurent Cozic 4dc1210eb5 All: Improved first sync speed when synchronising with Joplin Server 2021-06-19 10:34:44 +01:00
Laurent Cozic 0222c0f0a6 All: Allow uploading items in batch when synchronising with Joplin Server 2021-06-18 17:17:25 +01:00
Laurent Cozic 3b9c02e92d Server: Add support for uploading multiple items in one request 2021-06-18 11:50:06 +01:00
Laurent Cozic d73eab6f82 Fixed tests 2021-06-17 18:32:52 +01:00
Laurent Cozic d698ea0c12 Server v2.1.1 2021-06-17 18:27:54 +01:00
Laurent Cozic e04133cfc6 Setup new release 2.1 2021-06-17 18:26:58 +01:00
Laurent Cozic 7f0b3fd718 Server: Added account info to dashboard and title to pages 2021-06-17 18:04:35 +01:00
Laurent Cozic 65c3d01cc6 Server: Sort users by name, then email 2021-06-17 17:34:17 +01:00
Laurent Cozic ac03c08f33 Server: Hide Reset Password button when creating new users 2021-06-17 17:30:45 +01:00
Laurent Cozic ea1d614f82 Tools: Utility to measure perforemances 2021-06-17 17:27:03 +01:00
Laurent Cozic c682c8879c Server: Added way to batch requests (currently disabled) 2021-06-17 16:55:45 +01:00
Laurent Cozic e8532441bc Server: Added way to debug slow queries 2021-06-17 16:51:25 +01:00
Laurent Cozic a38958ab7b Tools: Added scripts to test server performances 2021-06-17 11:21:37 +01:00
Laurent Cozic 232e0c937a Server v2.0.14 2021-06-17 09:52:40 +01:00
Laurent Cozic 479237d16f Server: Allow sending reset password email from admin UI 2021-06-17 09:49:56 +01:00
Laurent Cozic 6ae0e84a1a Server: Tokens would expire too soon 2021-06-17 09:28:45 +01:00
Laurent Cozic 8c56cf98be Server v2.0.13 2021-06-16 15:28:41 +01:00
Laurent Cozic 18965494d9 Server: Allow creating a new user with no password, which must be set via email confirmation 2021-06-16 15:24:15 +01:00
Laurent Cozic ecd1602658 Server: Allow creating a user with a specific account type from admin UI 2021-06-16 15:02:26 +01:00
Laurent Cozic 3c181906c2 Server: Fixed issue with user not being able to modify own profile 2021-06-16 14:34:58 +01:00
Laurent Cozic ea65313bdb Server: Fixed error message when item is over the limit 2021-06-16 11:07:21 +01:00
Laurent Cozic 8a00eef901 Server v2.0.12 2021-06-15 17:24:56 +01:00
Laurent Cozic 6f27eae7dd Server v2.0.11 2021-06-15 12:41:59 +01:00
Laurent Cozic ba38bf3490 Server v2.0.10 2021-06-15 12:28:05 +01:00
Laurent Cozic 2cf70675dc All: Fixed user content URLs when sharing note via Joplin Server 2021-06-15 12:25:55 +01:00
Laurent Cozic 551033f8ba Merge branch 'dev' into release-2.0 2021-06-12 10:00:04 +02:00
Ahmad Mamdouh 2af3bf61ea
All: Conflict notes will now populate a new field with the ID of the conflict note. (#5049) 2021-06-12 08:46:49 +01:00
Laurent Cozic af9f3eedd3 Server v2.0.9 2021-06-11 18:49:29 +02:00
Laurent Cozic 8f1e3ba43c Server v2.0.8 2021-06-11 18:29:40 +02:00
Laurent Cozic 8459b46cd0 Tools: Allow building Docker image from CI 2021-06-11 18:24:59 +02:00
Laurent Cozic 5d233a7387 Tools: Fixed tests 2021-06-11 01:15:43 +02:00
Laurent Cozic a36b13dcb4 Server: Handle custom user content URLs 2021-06-10 19:33:04 +02:00
Laurent Cozic 4098c01e7c Merge branch 'dev' into release-2.0 2021-06-10 14:03:50 +02:00
Laurent Cozic c37eb56ed7 Tools: Fixed tests 2021-06-10 11:13:00 +02:00