Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,106 Commits
246 Branches
1,281 Tags
634 MiB
Commit Graph

1804 Commits (f224282a27a10982fda163827b8a97bb37bd87f3)

Author SHA1 Message Date
Laurent Cozic 2133193141 Android 2.5.3 2021-10-28 23:09:16 +01:00
Laurent Cozic 7d70dea265 Desktop release v2.5.6 2021-10-28 22:27:47 +01:00
Laurent Cozic e247be1fa7 Desktop: Fixed default migration logic 2021-10-28 22:26:23 +01:00
Laurent Cozic 9704e75614 Android 2.5.2 2021-10-28 21:23:40 +01:00
Laurent Cozic e4403d4452 Desktop release v2.5.5 2021-10-28 20:56:40 +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
milotype 9d883243ed
All: Translation: Update hr_HR.po (#5640) 
… this time with Poedit ;-)
 2021-10-28 12:23:52 -04: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
Nicholas Axel 5c1cef8476
All: Translation: Update id_ID.po (#5625) 
* Updated Indonesian

Fixed some translations
Added some missing translations

* Add files via upload

* Add files via upload

* Add files via upload
 2021-10-27 14:15:38 -04: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 33249ca05a All: Improved handling of expired sessions when using Joplin Server 2021-10-25 19:46:45 +01:00
Laurent Cozic ace1118cf1 All: Improved handling of expired sessions when using Joplin Server 2021-10-25 17:49:38 +01:00
Laurent Cozic b497177fff Server: Delete all sessions when a password is changed or reset 2021-10-25 17:36:40 +01:00
Laurent Cozic 82227b268e Doc: Improved caching of asset URLs 2021-10-25 16:49:21 +01:00
Laurent Cozic 6714b372ed Doc: Added Hosting.de sponsor 2021-10-25 16:22:30 +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 17cf9b3272 Tools: Improved desktop app runForTesting script 2021-10-24 19:13:56 +01:00
Laurent Cozic 22e5c3a200 Desktop: Fixed Goto Anything scrolling for long lists 2021-10-24 19:12:25 +01:00
Laurent Cozic 72c12354dc All: Improved Joplin Server configuration check to better handle disabled accounts 2021-10-24 14:08:55 +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
sleepntsheep 375214a11f
All: Translation: Update th_TH.po (#5609) 
Co-authored-by: sleepntsheep <contact@papangkorn.com>
 2021-10-21 13:56:40 -04:00
Helmut K. C. Tessarek 2a004dd842
All: Translation: Update da_DK.po (thanks ERYpTION) 2021-10-20 11:56:03 -04:00
Laurent Cozic 04b8204dcb android-2.5.1 2021-10-19 12:53:11 +01:00
Laurent Cozic 0188824421 Merge branch 'dev' into release-2.5 2021-10-19 11:13:38 +01:00
Laurent Cozic 72db8e469d All: Added mechanism to migrate default settings to new values 2021-10-18 12:37:25 +01:00
Laurent Cozic 7d62df8906 Desktop: Improved master password state handling in Encryption screen 2021-10-17 19:10:37 +01:00
Laurent Cozic 6eced7ec4b Desktop release v2.5.4 2021-10-17 18:52:35 +01:00
Laurent Cozic 8d09ed3bac Fixed package path 2021-10-17 18:50:56 +01:00
Laurent Cozic b8919156d1 Desktop release v2.5.3 2021-10-17 17:45:10 +01:00
Laurent Cozic 1406d97b3e Mobile: Fixes #5585: Fixed logic of setting master password in Encryption screen 2021-10-17 17:20:59 +01:00
Laurent Cozic a5560a6652 Fixed mobile package 2021-10-17 16:13:12 +01:00
Laurent Cozic 21a7149493 Fixed mobile build 2021-10-17 14:54:48 +01:00
Laurent Cozic 6bcd801028 Fixed interface 2021-10-16 12:20:04 +01:00
Kingsley Yung 5e6e1bf913
Cli: Fixes #5341: Ignore newline between quotes while spliting batch (#5540) 2021-10-16 12:19:53 +01:00
Kenichi Kobayashi 1d46d9f657
Desktop: Resolves #4827: Laggy scrolling in Markdown viewer (#5496) 2021-10-16 11:44:02 +01:00
Roman Musin 6879481fd5
Desktop: Resolves #5168: Add support for callback URLs (#5416) 2021-10-16 10:07:41 +01:00
Caleb John 2acd55eb81
Desktop, Cli: Resolves #5224: Add Markdown + Front Matter exporter/importer (#5465) 2021-10-16 09:59:37 +01:00
Laurent Cozic 1fee83d408 Desktop: Fixed share dialog button sizes 2021-10-15 16:41:38 +01:00
Laurent Cozic 852c6f2f8d Desktop: Mentioned on share dialog that it may take a few minutes for all notes to appear on the recipient device 2021-10-15 16:34:09 +01:00
Laurent Cozic 0bae4690c9 Removed debug code 2021-10-15 16:17:47 +01:00
Laurent Cozic 8a7fa78c54 Chore: Moved share invitation response logic to separate file (Desktop) 2021-10-15 16:16:02 +01:00
Laurent Cozic a5f2fd8982 Chore: Linter 2021-10-15 12:39:08 +01:00
Laurent Cozic ccf9882452 All: Ensure that shared notebook children are not deleted when shared, unshared and shared again, and a conflict happens 2021-10-15 12:38:14 +01:00
Laurent Cozic eba1d6df56 Tools: Added command to rebuild server files 2021-10-15 12:26:01 +01:00
Laurent Cozic fb935dde18 Tools: Added syncDebugLog to help debugging sync operations 2021-10-15 12:24:22 +01:00
Laurent Cozic 0ccd8dee41 Tools: Fixed TSC compile error 2021-10-14 16:34:53 +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 9bff2d1ef4 Desktop: Improved share error handling 2021-10-14 15:39:17 +01:00
Laurent Cozic 73545484c9 Desktop: Allows a shared notebook recipient to leave the notebook 2021-10-14 15:39:17 +01:00
Laurent Cozic 1f005656a2 Merge branch 'release-2.4' into dev 2021-10-13 18:59:41 +01:00
Laurent Cozic b45585dc21 Desktop release v2.4.12 2021-10-13 17:43:03 +01:00
Laurent Cozic 46786cc186 Tools: Update Electron Builder time server (previous was not working anymore) 2021-10-13 17:42:49 +01:00
Laurent Cozic eca6e2ff3d Desktop release v2.4.11 2021-10-13 12:51:15 +01:00
Laurent Cozic 523382ec83 Desktop release v2.4.10 2021-10-13 10:58:10 +01:00
Laurent Cozic 3d87e89753 Desktop, Cli: Fixes #5543: Fixed running out of memory when importing large ENEX files 2021-10-13 10:57:43 +01:00
Laurent Cozic dcbe853cd8 Desktop, Cli: Fixes #5543: Fixed running out of memory when importing large ENEX files 2021-10-13 10:55:39 +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 8ab3bab771
Update da_DK.po 
Fixed author field
 2021-10-11 19:50:32 +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 53a80f33d9 Doc: Remove hosting.de sponsor 2021-10-09 16:09: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
Rishabhraghwendra18 7b2480179f
Desktop: Fixes #5310: Bright background around code block insertion dialog in dark mode (#5491) 2021-10-08 15:18:26 +01:00
miharix 35f242d961
All: Translation: Update sl_SI.po (#5541) 2021-10-07 18:15:45 -04: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 23996e0efe Desktop: Fixes #5421: Exclude disabled commands from Goto Anything 2021-10-05 18:09:09 +01:00
Laurent Cozic 5a9bc1297b All: Fixes #932: Certain attachments were not being automatically deleted 2021-10-05 17:47:38 +01:00
Laurent Cozic f47478f730 Chore: Fixed highlight.js syntax 
Ref: https://github.com/highlightjs/highlight.js/issues/2277
 2021-10-04 16:58:26 +01:00
Laurent Cozic e069fe90c8 Chore: Fixed lib paths 2021-10-04 15:33:50 +01:00
Helmut K. C. Tessarek 5c7dcf0117
Mobile: Resolves #4701: Improve delete dialog message (#5481) 2021-10-03 18:41:32 +01:00
Andros Fenollosa 3bda77d504
All: Translation: Update es_ES.po (#5523) 2021-10-03 12:34:41 -04:00
Laurent c758377188
All: Add support for public-private key pairs and improved master password support (#5438) 
Also improved SCSS support, which was needed for the master password dialog.
 2021-10-03 16:00:49 +01:00
Laurent Cozic e5e1382255 Desktop release v2.5.1 2021-10-02 11:10:25 +01:00
Helmut K. C. Tessarek 349f8c8256
Update translations 2021-10-02 06:00:03 -04: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 85e20a61d9 Tools: fixed tests 2021-10-01 18:45:07 +01:00
Alexey 38bf7c746b
All: Translation: Update ru_RU.po (#5509) 
Try to fix most of translation errors or untranslated strings.
 2021-09-30 18:18:59 -04:00
Laurent Cozic 0d3ecffed9 Merge branch 'release-2.4' into dev 2021-09-29 20:11:40 +01:00
Laurent Cozic acc5959284 ios-v12.4.2 2021-09-29 19:50:34 +01:00
Laurent Cozic 6c4f71689c Android 2.4.3 2021-09-29 19:50:18 +01:00
Laurent Cozic bb44c4e6ab Desktop release v2.4.9 2021-09-29 19:28:24 +01:00
Laurent Cozic 4b39d30255 All: Fix default sync target 2021-09-29 19:27:26 +01:00
Laurent Cozic e96713d8cf Tools: Fixed server tags 2021-09-29 17:57:05 +01:00
Nicolas Viviani 7e7616405b
Update French translation (#5486) 2021-09-29 17:05:49 +01:00
Laurent Cozic 6242ac0339 Server v2.5.1 2021-09-29 16:53:07 +01:00
Laurent Cozic 883ebe69cc Tools: Fixed server tags 2021-09-29 16:49:59 +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 eceb517128 Update website 2021-09-29 16:30:33 +01:00
Laurent Cozic ff7f487ed0 Merge branch 'release-2.4' into dev 2021-09-29 16:29:38 +01:00
Laurent Cozic 3a9867db33 CLI v2.4.1 2021-09-29 16:29:06 +01:00
Laurent Cozic c831c7bf6f Releasing sub-packages 2021-09-29 16:23:56 +01:00
Laurent Cozic c7cc5cc1a9 publish 2021-09-29 16:22:20 +01:00
Laurent Cozic eb4b0e64ea Releasing sub-packages 2021-09-29 16:16:40 +01:00
Laurent Cozic 9dabac0afe lockfile 2021-09-29 16:09:02 +01:00
Laurent Cozic 73f0f861a5 ios-v12.4.1 2021-09-29 15:31:37 +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 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 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 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
Nikhil Gautam 0d40026d8b
Desktop: Resolves #5299: Display 0/0 when no search results are found in editor (#5360) 2021-09-19 11:37:33 +01:00
Caleb John 7a9ec627ee
Desktop: Resolves #5233: Fire resize event whenever the layout changes (#5344) 
* Fire resize event whenever the layout changes

This solves an issue where the markdown editor was changing size
physically, but the refresh function wasn't being called so the
editor would lose track of it's size and place the cursor wrongly.
The editor was able to correctly resize when the window resize event
was fired, but this didn't happen when the sidebars were toggled.
The solution implemented here is to hook in to the function where
layout props are changed, and emit a resize event there.
This means that anytime the layout changes (whether or not it affects
sizing), the resize event will be fired.
 2021-09-19 11:36:23 +01:00
Marph 2d72d1435e
Desktop: Support for user-data-dir flag (#5467) 
This flag is passed by chromedriver.
 2021-09-19 11:34:04 +01:00
Helmut K. C. Tessarek 12ec7b0c1d
macOS: Added Cmd+Backspace shortcut to delete line (#5478) 2021-09-19 11:32:58 +01:00
JackGruber afe1cf747d
All: Fixes #5444: Misinterpreted search term after filter in quotation marks (#5445) 2021-09-19 11:31:38 +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 f91b4edb30 Tools: Tweak to stress test script 2021-09-17 18:27:25 +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
Abdunnasir Saeed 9679f03cfa
All: Translation: Update ar.po (#5464) 
A complete Arabic translation
 2021-09-15 06:39:50 -04: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 a661a73511 Revert "Server: Enable multi platform builds (amd64, armv7 and arm64) (#5338)" 
This reverts commit ab134807ea.

Does not build:

https://github.com/laurent22/joplin/runs/3597996286?check_suite_focus=true#step:8:388
 2021-09-14 13:01:33 +01:00
Laurent Cozic b00959e143 Server v2.4.4 2021-09-14 12:16:47 +01:00
Laurent Cozic f6f5d6808d Merge branch 'dev' into release-2.4 2021-09-14 12:07:04 +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
mrkaato cd99e675d9
All: Translation: Update fi_FI.po (#5452) 2021-09-12 13:00:30 -04:00