Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,988 Commits
245 Branches
1,281 Tags
616 MiB
Commit Graph

6988 Commits (01b63ad26325d95dd2a24d5980053800ebc36d05)

Author SHA1 Message Date
Laurent Cozic 050873b4ca Update website 2021-10-08 10:40:50 +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 3ef4994486 Merge branch 'dev' into release-2.5 2021-10-07 14:30:02 +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
tangodev be01657ef9
Doc: Fix path for dev tools (#5539) 2021-10-06 15:19:58 +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 b6b972bbd9 Desktop release v2.5.1 2021-10-01 19:37:23 +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
Juvecu e3e83352c3
Doc: Remove orphaned word (#5510) 
Line 17 had " This" tacked onto the back like someone started writing something or removed something and left remnants. I couldn't find where it came from in any history so I removed the extra word.
 2021-09-30 18:17:54 -04:00
Laurent Cozic def561aef2 Update website 2021-09-29 20:12:59 +01: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 ba17742895 Ignore dist file for eslint 2021-09-28 10:52:48 +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