self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity
8,474 Commits 243 Branches 1,267 Tags 542 MiB
c8f7772f1b
Commit Graph

579 Commits

Author SHA1 Message Date
Laurent Cozic
26883d31da Setup new release 2.7 2021-12-27 17:56:59 +01:00
Laurent Cozic
e08359f7e0 Tools: Removed no longer needed double-dash and fixed CI 2021-12-21 17:55:30 +01:00
Laurent Cozic
106ce4b09d Tools: Do not clear output of tsc watch 2021-12-21 12:43:12 +01:00
Laurent Cozic
a7a2dfbbd0 Tools: Allow the server clean command to run on Windows 2021-12-20 16:48:40 +01:00
Laurent
7f64fbfd9b
Tools: Use Yarn 3 to manage monorepo (#5833) 2021-12-20 15:08:43 +00:00
Daniel Landau
79a930597d
Doc: Add instructions for Docker on Linux (#5864) 2021-12-18 15:16:57 +00:00
Laurent Cozic
10c6af8aa7 Fixed tests 2021-12-16 11:42:33 +01:00
Laurent Cozic
e9ce3d194c Server: Changed ID length from 32 to 22 characters 
Should still prevent collisions for 60 times the age of the Universe
 2021-12-16 11:27:22 +01:00
Laurent Cozic
83a46e563d Server: Disable logs and items pages for end-user 
These pages don't provide very useful information, even possibly
confusing and could probably be used to DoS the server since the
associated requests are not optimised.
 2021-12-16 11:18:35 +01:00
Laurent Cozic
aa42cebbca Server: Setup localisation 2021-12-16 11:08:43 +01:00
Laurent Cozic
4a1bc075ac Server: Display NTP server domain and port when there is an error, and display message when NTP check is skipped 2021-12-16 10:53:28 +01:00
Laurent Cozic
684857752f Server v2.6.14 2021-12-09 10:20:47 +01:00
Laurent Cozic
35f684a1ee Server: Increase default MAX_TIME_DRIFT to 2000 2021-12-03 12:24:29 +00:00
Laurent Cozic
122afd6d46 Server: Improved storage command 2021-12-02 11:27:22 +00:00
Laurent
6bbf053a4f
Tools: Run Joplin Server Postgres tests on CI (#5807) 2021-11-30 15:37:07 +00:00
Laurent Cozic
6eec0dd58e Server v2.6.13 2021-11-29 18:41:53 +00:00
Laurent Cozic
dc67eace24 Server: Allow disabling NTP time drift check 2021-11-29 18:39:07 +00:00
Laurent Cozic
4fecb083a7 Server: Optimise reading from external storage when fallback driver is not present 2021-11-29 18:28:39 +00:00
Laurent Cozic
ef23d99b47 Added tests 2021-11-29 17:51:41 +00:00
Laurent Cozic
01048f5971 Server: Added command to delete database item content 2021-11-29 17:27:40 +00:00
Laurent Cozic
a6884a2ee4 Server: Remove unique constraint errors from the log when they are already handled by the application 2021-11-29 10:17:13 +00:00
MovingEarth
920847245f
Server: Do not set the SMTP auth option when user or password are not set (#5791) 2021-11-28 19:45:07 +00:00
Laurent Cozic
8e54a65ca5 Server: Increase default MAX_TIME_DRIFT to 100ms 2021-11-24 10:57:38 +00:00
Laurent Cozic
7985958f03 Server v2.6.12 2021-11-23 16:31:11 +00:00
Laurent Cozic
75f729620e Server: Added task to compress changes older than 6 months 2021-11-23 16:25:36 +00:00
Laurent Cozic
080c3cc7dc Server: Allow specifying a max content size when importing content to new storage 2021-11-23 16:06:56 +00:00
Laurent Cozic
16d5047379 Server: Perform storage checks before starting services 2021-11-20 15:20:10 +00:00
Laurent Cozic
fc419d98c4 Server: Fixed HandleOversizedAccounts task interval 2021-11-17 18:41:26 +00:00
Laurent Cozic
0bf323dc63 Server: Resolves #5738: Check for time drift when the server starts 2021-11-17 18:41:25 +00:00
Laurent Cozic
42a4edb19c Server: Display more detailed error messages on SQL query errors 2021-11-16 11:31:13 +00:00
Laurent Cozic
3716972829 Server: Display more debug info in error log 2021-11-16 10:51:56 +00:00
nzlov
90957e5a34
Doc: Server: fix type File -> Filesystem (#5730) 
update  `STORAGE_DRIVER` type . From `File` to `Filesystem`
 2021-11-15 00:50:30 -05:00
Laurent Cozic
c908347cec Server v2.6.11 2021-11-14 17:15:03 +00:00
Laurent Cozic
5eb3a926db Server: Prevent large data blobs from crashing the application 
Ref: https://github.com/brianc/node-postgres/issues/2653
 2021-11-14 16:47:16 +00:00
Laurent Cozic
73b702b8dc typo 2021-11-13 17:27:45 +00:00
Laurent Cozic
4b23d6c1f5 Doc: Add section on how to setup Joplin Server storage 2021-11-13 17:25:05 +00:00
Laurent Cozic
61df69f609 Server v2.6.10 2021-11-13 12:48:36 +00:00
Laurent Cozic
76d95a9e18 Server v2.6.9 2021-11-13 12:47:08 +00:00
Laurent Cozic
5a41d80b75 Server: Improved storage migration error handling, and improved storage test units 2021-11-13 11:50:33 +00:00
Laurent Cozic
5cd4537044 Server: Rename "ReadOnly" mode to "ReadAndClear" to avoid any confusion 2021-11-11 17:31:24 +00:00
Laurent Cozic
4bfb4db5f1 Server: Fixed S3 connection string record in db 2021-11-11 16:36:43 +00:00
Laurent Cozic
4fc3bcbfd7 Server: Fixed S3 storage connection and improved connectiob checks 2021-11-11 16:32:34 +00:00
Laurent Cozic
73137cfb27 Server: Hide credentials from the log 2021-11-11 16:13:36 +00:00
Laurent Cozic
72f336a5af Server v2.6.8 2021-11-11 15:24:21 +00:00
Laurent Cozic
dfa5f8b357 Server: Fixed S3 configuration 2021-11-11 15:22:30 +00:00
Laurent Cozic
3cdbd6dd15 Server v2.6.7 2021-11-11 14:44:06 +00:00
Laurent Cozic
c6dec0a045 Server: Added command to test a storage connection 2021-11-11 14:42:22 +00:00
Laurent Cozic
4879edc59a Server v2.6.6 2021-11-11 14:06:27 +00:00
Laurent Cozic
005f720f7b Server: Added command to migrate content to different storage 2021-11-11 13:59:05 +00:00
Laurent Cozic
fc64c8264c Server v2.6.5 2021-11-10 12:08:10 +00:00
Laurent Cozic
cc23a8b70b Server v2.6.4 2021-11-10 12:07:06 +00:00
Laurent Cozic
9ffa29f658 Chore: Add tests for storage driver loading 2021-11-10 12:03:45 +00:00
Laurent Cozic
7431da9f3a Server: Lazy-load storage drivers 2021-11-10 11:48:06 +00:00
Laurent
485c0d0314
Server: Allow storing item content in database, filesystem or S3 (depending on config) (#5602) 2021-11-09 16:05:42 +00:00
Laurent Cozic
021ce14348 Server v2.6.3 2021-11-08 15:21:20 +00:00
Laurent Cozic
3e5ad0a374 Desktop, Cli: Fixes #5653: Long resource filenames were being incorrectly cut 2021-11-07 16:41:39 +00:00
Laurent Cozic
70d5c7a648 Server: Set resource content size when viewing published note 2021-11-07 11:47:37 +00:00
Laurent Cozic
9e1cb9db2c Server: Immediately ask user to set password after Stripe checkout 2021-11-04 12:49:51 +00:00
Laurent
af19865865
All, Server: Add support for sharing notes when E2EE is enabled (#5529) 2021-11-03 16:24:40 +00:00
Laurent Cozic
a0d23046bf Migration can be null 2021-11-03 15:20:17 +00:00
Laurent Cozic
7ad73df170 Server: Display latest migration name after auto-migration 2021-11-03 15:18:20 +00:00
Laurent Cozic
ce5c5d6042 Server: Disable mailer service if no-reply email is not set 2021-11-03 14:11:13 +00:00
Laurent Cozic
8c6d78e01c Merge branch 'dev' into release-2.6 2021-11-03 12:55:28 +00:00
Laurent Cozic
a65c424233 Server v2.6.2 2021-11-03 12:55:01 +00:00
Laurent Cozic
190550fe8e Tools: Fixed server tests 2021-11-03 12:53:25 +00:00
Laurent Cozic
f1bfcfde81 Server v2.6.1 2021-11-03 12:27:28 +00:00
Laurent
47a31c4ef1
All, Server: Add support for faster built-in sync locks (#5662) 2021-11-03 12:26:26 +00:00
Laurent Cozic
bcd568a496 Setup new release 2.6 2021-11-02 20:07:13 +00:00
Laurent Cozic
08ee2b200f Merge branch 'release-2.5' into dev 2021-11-02 14:47:19 +00:00
Laurent Cozic
57b8aa1789 Server v2.5.10 2021-11-02 14:46:52 +00:00
Laurent Cozic
b5d792c606 Server: Improved env variable handling to make it self documenting and enforce type checking 2021-11-02 12:51:59 +00:00
Laurent Cozic
370441333f Server: Improved logging and rendering of low level middleware errors 2021-11-01 19:20:36 +00:00
Laurent Cozic
99ea4b73b5 Server: Fixed issue that could cause server to return empty items in some rare cases 2021-10-31 18:29:47 +00:00
Laurent Cozic
f7a18bac2a Server: Add unique constraint on name and owner ID of items table 
In theory, the server enforces uniquness because when doing a PUT
operation it either creates the items if it doesn't exist, or overwrite
it. However, there's race condition that makes it possible for multiple
items with the same name being created per user. So we add this
constraint to ensure that any additional query would fail (which can be
recovered by repeating the request).
 2021-10-30 10:37:56 +01:00
Laurent Cozic
251400ccaf Server v2.5.9 2021-10-28 20:44:25 +01:00
Laurent Cozic
6c6e2a68e1 Merge branch 'dev' into release-2.5 2021-10-28 20:43:14 +01:00
Laurent Cozic
4a2af32f6b Server: Remove session expiration for now 2021-10-28 20:42:26 +01:00
Laurent Cozic
3359ea3fa0 Server v2.5.8 2021-10-28 17:07:44 +01:00
Laurent Cozic
2cbcfa5bc8 Slow down migration 2021-10-28 17:06:16 +01:00
Laurent Cozic
0a7fdac850 Server v2.5.7 2021-10-27 19:40:32 +01:00
Laurent Cozic
a753429277 Server: Fixed items.owner_id migration 2021-10-27 19:38:45 +01:00
Laurent Cozic
dca13b3a68 Server: Moved CLI commands to separate files 2021-10-27 19:30:43 +01:00
Laurent Cozic
9ba90b551a Server: Fixed Stripe portal page redirection 2021-10-27 16:39:45 +01:00
Laurent Cozic
f1c4d35ef3 Server: Fixed owner_id migration for SQLite 2021-10-27 16:33:03 +01:00
Laurent Cozic
b0e3e1b50e Server v2.5.6 2021-10-27 16:21:21 +01:00
Laurent Cozic
b655f2780f Server: Added item owner ID, and allow disabling db auto-migrations 2021-10-27 16:18:42 +01:00
Laurent Cozic
0ada1dfb46 Server: Expire sessions after 12 hours 2021-10-26 12:35:06 +01:00
Laurent Cozic
b497177fff Server: Delete all sessions when a password is changed or reset 2021-10-25 17:36:40 +01:00
Piotr Kowalski
1a90ad326f
Server: Fixed display of latest migration in startup log (#5627) 2021-10-25 12:31:01 +01:00
Laurent Cozic
2f09f884be Server: Run oversized account task more frequently 2021-10-24 12:23:36 +01:00
Laurent Cozic
bc5a853460 Server: Improved task service log entries 2021-10-24 12:23:36 +01:00
Laurent Cozic
643bddf44e Added comments 2021-10-24 12:23:36 +01:00
Laurent Cozic
d4a03222f5 Server v2.5.5 2021-10-23 21:58:53 +01:00
Laurent Cozic
82f7052ebf Tools: Fixing server Docker image build 2021-10-23 21:57:53 +01:00
Laurent Cozic
cbbaad9a92 Server v2.5.4 2021-10-23 20:10:04 +01:00
Laurent Cozic
46a4ed0684 Server v2.5.3 2021-10-23 18:23:45 +01:00
Laurent Cozic
169b585928 Server: Added tool to delete old changes 2021-10-23 17:51:44 +01:00
Laurent Cozic
eba1d6df56 Tools: Added command to rebuild server files 2021-10-15 12:26:01 +01:00
Laurent Cozic
47fc51ea8a Server: Fixed issue when a notebook is shared, then unshared, then shared again 2021-10-14 15:39:18 +01:00
Laurent Cozic
5a6d851368 Tools: Trying to make TaskService test more robust 2021-10-12 12:50:37 +01:00
Laurent Cozic
8fbea6a90a Doc: Added Stripe doc 2021-10-12 12:50:37 +01:00
Laurent Cozic
c2e61f548f Tools: Added a few tools to make testing server easier 2021-10-10 19:59:39 +01:00
Laurent Cozic
03f40daedc Chore: Refactor compilePackageInfo script so that it can be used from both desktop and server app 2021-10-09 15:32:15 +01:00
Laurent Cozic
6de42d84a5 Server v2.5.2 2021-10-07 14:37:10 +01:00
Laurent Cozic
31efc9b23e Server: Sort flags by date 2021-10-07 14:29:23 +01:00
Laurent Cozic
5b58811833 Server: Add support for promotion codes 2021-10-07 14:19:40 +01:00
Laurent Cozic
7e05b5b6dd Server: Fixes #5507: Fixed links in published notes 2021-10-06 11:07:45 +01:00
Laurent Cozic
d5eb21d318 Tools: Fixed tests 2021-10-02 10:48:49 +01:00
Laurent Cozic
4a7746beb2 Desktop: Upgrade Electron from v10 to v14 2021-10-01 19:35:27 +01:00
Laurent Cozic
6242ac0339 Server v2.5.1 2021-09-29 16:53:07 +01:00
Laurent Cozic
6a22fb51f3 Setup new release 2.5 2021-09-29 16:45:06 +01:00
Laurent Cozic
730098c683 Allow setting a custom Stripe price for testing 2021-09-29 16:32:51 +01:00
Laurent Cozic
5de53706d8 Server: Remove AccountOverLimit flag from accounts that are now below the limit 2021-09-28 18:16:22 +01:00
Laurent Cozic
3a11885705 Server: Allow manually deleting a user flag 2021-09-28 17:42:00 +01:00
Laurent Cozic
5da820aa0a Server: Correctly attach Stripe sub to Joplin Server sub when it is recreated from Stripe 2021-09-28 15:09:21 +01:00
Laurent Cozic
79d1ad706a Server: Add support for events and use them to track background tasks 2021-09-28 11:01:04 +01:00
Laurent Cozic
24945a0d3e Server: Also clear admin session ID on logout after impersonating a user 2021-09-27 18:34:12 +01:00
Laurent Cozic
8c9331cf61 Server: Display banner when an account is disabled and provide reason 2021-09-27 18:30:46 +01:00
Laurent Cozic
6fec2a93fc Server: Only disable API access when an account is disabled 2021-09-27 17:46:53 +01:00
Laurent Cozic
2dd80454e4 Server: Send reminder email every time a payment fails 2021-09-27 12:09:23 +01:00
Laurent Cozic
dd0b983a09 Server v2.4.11 2021-09-26 18:11:12 +01:00
Laurent Cozic
c45f961b8c Server: Fixed Stripe checkout when a coupon is used 2021-09-26 18:09:52 +01:00
Laurent Cozic
57a1d03b4b Server: Do not allow accepting share more than once 2021-09-26 17:58:06 +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
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