1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-21 09:38:01 +02:00
Commit Graph

188 Commits

Author SHA1 Message Date
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
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
4a7746beb2 Desktop: Upgrade Electron from v10 to v14 2021-10-01 19:35:27 +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
4b39d30255 All: Fix default sync target 2021-09-29 19:27:26 +01:00
Laurent Cozic
6a22fb51f3 Setup new release 2.5 2021-09-29 16:45:06 +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
97bfd5ef04 Tools: Add test unit for building Docker image 2021-09-23 16:48:26 +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
9429b51694 Chore: Fixed regression on mobile app 2021-09-19 15:27:23 +01:00
Helmut K. C. Tessarek
9d5d891fe3
Desktop, Mobile: Resolves #5295: Update Mermaid 8.10.2 -> 8.12.1 and fix gitGraph crash (#5448) 2021-09-11 19:47:01 +01:00
Laurent Cozic
96ac12b460 Chore: Converted encryption config screens to React Hooks to share logic between desktop and mobile 2021-09-10 19:05:47 +01:00
Laurent Cozic
d33b99cffb Desktop: Fix handling of disabled master keys when enabling E2EE 2021-09-09 18:46:58 +01:00
Laurent Cozic
9407efd8ec All: Allow disabling any master key, including default or active one
Ref: https://discourse.joplinapp.org/t/syncing-error-with-joplin-cloud-and-e2ee-master-key-is-not-loaded/20115/5
2021-09-06 18:33:17 +01:00
Laurent Cozic
8996a0159a Lock file and TS error 2021-09-06 17:05:27 +01:00
Laurent Cozic
478d4accf1 Desktop: Load themes as CSS variables for use in custom themes and internal components 2021-09-06 16:57:07 +01:00
Laurent Cozic
0793b1be59 Releasing sub-packages 2021-09-02 18:40:37 +01:00
Laurent Cozic
19225abbcf Android 2.4.1 2021-09-02 18:40:37 +01:00
Laurent Cozic
ce89ee5bab All: Add support for single master password, to simplify handling of multiple encryption keys 2021-08-30 14:15:35 +01:00
Laurent Cozic
814f602bd6 Chore: Moved EncryptionService under e2ee directory 2021-08-23 18:47:07 +01:00
Laurent Cozic
50f421c5d9 Tools: Setup release 2.4 2021-08-21 10:46:46 +01:00
JackGruber
d0313585be
Mobile: Show the used tags first in the tagging dialog (#5315) 2021-08-18 12:06:58 +01:00
Laurent Cozic
7faa58e0f9 All: Add a way to disable a master key 2021-08-17 12:03:19 +01:00
Laurent Cozic
edc3496506 Tools: Fixed tests 2021-08-16 18:05:22 +01:00
Laurent Cozic
be500f29cc Tools: Trying yet again to upgrade lock files to v2 2021-08-16 16:21:56 +01:00
Laurent Cozic
f5f05e6cc5 All: Added "None" sync target to allow disabling synchronisation 2021-08-16 16:18:32 +01:00
Laurent Cozic
fe4900d254 Desktop: Add Sync Wizard dialog 2021-08-16 15:20:14 +01:00
Laurent Cozic
dc192fb4c1 Android 2.3.4 2021-08-15 14:32:35 +01:00
Laurent Cozic
3abebe6a32 Tools: Fixed Android build 2021-08-15 14:10:52 +01:00
Laurent Cozic
2011369c83 ios-v12.3.1 2021-08-15 12:20:48 +01:00
Laurent Cozic
6ce19ed680 Android 2.3.3 2021-08-12 21:57:37 +01:00
Laurent Cozic
d0251400a4 version 2021-08-12 21:32:54 +01:00
Laurent Cozic
f0ad813f40 Tools: remove git pull from Android release script, which can make upload fail 2021-08-12 21:26:29 +01:00
Laurent Cozic
11cf8474f7 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-12 19:27:14 +01:00
Laurent Cozic
77a8ab8125 Tools: Fixed lib import statements 2021-08-12 19:26:35 +01:00
Laurent Cozic
bd907ddeb2 Tools: Trying again to upgrade lock files to v2 2021-08-12 18:01:55 +01:00
Laurent
dcd5a8d975
All: Improved E2EE usability by making its state a property of the sync target (#5276) 2021-08-12 16:54:10 +01:00
Laurent Cozic
9c37a3e5e4 Setup new release 2.3 2021-08-12 16:49:37 +01:00
Laurent Cozic
b5f148c33a Re-apply package-lock v2 2021-08-11 17:34:17 +01:00
Laurent Cozic
5526e5ca71 Android release v2.2.5 2021-08-11 11:45:00 +01:00
Laurent Cozic
6927335330 Revert: All: Resolves #4810, Resolves #4610: Fix AWS S3 sync error and upgrade framework to v3 (#5212)
Revert commit d2e2866995

Ref: https://github.com/laurent22/joplin/issues/5287
2021-08-11 11:24:01 +01:00
Laurent Cozic
11bd3d9e1f Merge branch 'release-2.2' into dev 2021-08-10 12:09:46 +01:00
Laurent Cozic
c3263a132f ios-v12.2.1 2021-08-10 11:56:58 +01:00
Laurent Cozic
afb7e1a157 Mobile: Upgraded React Native to v0.64 2021-08-09 21:45:41 +01:00
Laurent Cozic
34d3e8f027 Android release v2.2.3 2021-08-09 19:35:43 +01:00