self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00
Code Issues Releases Activity
7,271 Commits 244 Branches 1,275 Tags 551 MiB
26883d31da
Commit Graph

236 Commits

Author SHA1 Message Date
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
Laurent Cozic
70c1e7ae28 Android release v2.2.2 2021-08-09 19:15:42 +01:00
Lee Matos
d2e2866995
All: Resolves #4810, Resolves #4610: Fix AWS S3 sync error and upgrade framework to v3 (#5212) 2021-08-09 19:03:03 +01:00
Lee Matos
f90885709c
Mobile: Resolves #4588: Make sync icon spin in the right direction (#5275) 2021-08-08 18:41:28 +01:00
Laurent Cozic
c3f10d31cb Chore: Convert E2EE related files to TypeScript 2021-08-07 12:22:37 +01:00
Laurent Cozic
d469ac174c Merge branch 'release-2.1' into dev 2021-07-19 10:42:22 +01:00
Laurent Cozic
7a164b9b87 Fixing mobile build 2021-07-16 15:50:33 +01:00
Laurent Cozic
ed8a928a8e Fix mobile build 2021-07-16 14:30:52 +01:00
Laurent Cozic
8395d5daa9 Mobile: Added new beta editor based on CodeMirror 6 2021-07-13 19:13:13 +01:00
Laurent Cozic
e01a17528a Mobile: Removed old editor code 2021-07-12 14:00:51 +01:00
Laurent Cozic
b929a44bd5 Tools: Fixed iOS build for XCode 12 
Ref: https://stackoverflow.com/a/67314652/561309
 2021-07-12 13:51:23 +01:00
Laurent Cozic
bddbc0b54e ios-v12.1.2 2021-07-06 11:32:25 +01:00
Laurent Cozic
0bc892e40e Setup version 2.2 2021-07-03 16:40:44 +01:00
Laurent Cozic
a53a6e6f15 Merge branch 'release-2.1' into dev 2021-07-03 09:35:01 +01:00
Laurent Cozic
e08a909bdb Android release v2.1.4 2021-07-03 09:31:15 +01:00
Laurent Cozic
6a5629391b Merge branch 'release-2.1' into dev 2021-06-27 15:29:35 +01:00
Laurent Cozic
de9d7f747f ios-v12.1.1 2021-06-27 14:43:07 +01:00
Laurent Cozic
a04e7b7d8d Android release v2.1.3 2021-06-27 14:33:22 +01:00
Laurent Cozic
3d03321328 All: Activate Joplin Server optimisations 2021-06-26 10:19:48 +01:00
Laurent Cozic
8e35841d79 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-25 09:28:26 +01:00
Roman Musin
5047cf1027
Android: Disable backup to Google Drive (#5114) 
Ref: https://discourse.joplinapp.org/t/cant-do-a-clean-re-install-on-android-using-joplin-cloud
 2021-06-24 13:24:03 +01:00
Laurent Cozic
752d118e5d lock file 2021-06-24 08:59:05 +01:00
Helmut K. C. Tessarek
5ecb870ffd
Update translations 2021-06-21 11:26:49 -04:00
Laurent Cozic
65e9268e83 Mobile: Fixed version number on config screen 2021-06-21 08:55:02 +01:00
Laurent Cozic
5ef5888bfb Android release v2.1.2 2021-06-20 19:35:28 +01:00
Laurent Cozic
8cc103a062 Android release v2.1.1 2021-06-19 17:42:08 +01:00
Laurent Cozic
5b368e39ca Mobile: Allow enabling and disabling feature flags 2021-06-19 17:32:36 +01:00
Helmut K. C. Tessarek
cef5834d73
All: Update Mermaid: 8.8.4 -> 8.10.2 (#5092) 2021-06-18 08:53:16 +01:00
Laurent Cozic
e04133cfc6 Setup new release 2.1 2021-06-17 18:26:58 +01:00
Laurent Cozic
525ab01b9b Mobile: Add version number to log 2021-06-17 18:19:32 +01:00
Laurent Cozic
757c125bd3 Android release v2.0.4 2021-06-16 13:15:09 +01:00
Laurent Cozic
e0b5ef6630 Android release v2.0.3 2021-06-16 10:48:10 +01:00
Laurent Cozic
fd769945b1 ios-v12.0.2 2021-06-16 09:26:21 +01:00
Laurent Cozic
6e91d2784f Tools: Fixed iOS versions 2021-06-16 09:26:10 +01:00
Laurent Cozic
881b2f17b1 ios-v20.0.1 2021-06-16 09:06:37 +01:00
Laurent Cozic
d8119bcf07 Android release v2.0.2 2021-06-15 21:02:32 +01:00
Roman Musin
9d80a79cda
Android: Resolves #4216: Focus note editor where tapped instead of scrolling to the end (#4998) 2021-06-08 23:39:20 +01:00
JackGruber
dd1c9e3c2a
All: Fixes #5007: Items are filtered in the API search (#5017) 2021-06-07 10:21:24 +01:00
Laurent Cozic
21ea3253db Desktop: Add Joplin Cloud sync target 2021-06-03 17:12:07 +02:00
Laurent Cozic
f5984313be package lock 2021-05-25 18:11:49 +02:00
Laurent Cozic
2806aa1b19 Tools: Moved lib-specific tests under lib package 2021-05-21 15:17:21 +02:00
Roman Musin
9f37aa96c6
Android: Fixes #4912, Fixes #4086, Fixes #4908: Fixed and improved alarm notifications (#4984) 2021-05-19 22:26:42 +01:00
Laurent Cozic
85211e8d5c Mobile: Fixes #4494: Fixed opening URLs that contain non-alphabetical characters 2021-05-19 16:48:55 +02:00
Laurent Cozic
b01f82bb33 Android release v2.0.1 2021-05-16 17:54:13 +02:00
Laurent Cozic
321a58c356 Prepare for v2 2021-05-14 17:17:02 +02:00
Laurent Cozic
d7ff634f5e Merge branch 'release-1.8' into dev 2021-05-14 14:50:04 +02:00
Laurent Cozic
a965da97b6 ios-v10.8.1 2021-05-14 14:43:49 +02:00
Laurent
0765cf5955
All: Add support for sharing notebooks with Joplin Server (#4772) 
- Joplin Server: Adds support for sharing a notebook
- Desktop: Adds support for sharing a notebook with Joplin Server
- Mobile: Adds support for reading and writing to a shared notebook (not possible to share a notebook)
- Cli: Adds support for reading and writing to a shared notebook (not possible to share a notebook)
 2021-05-13 17:57:37 +01:00
Laurent Cozic
a76b4a0d3e Android release v1.8.5 2021-05-09 19:37:09 +02:00
Laurent Cozic
0b67446ec0 All: Security: Apply npm audit security fixes 2021-05-09 19:30:08 +02:00
Laurent Cozic
5c7dd6df5a Android release v1.8.4 2021-05-04 11:11:40 +02:00
Laurent Cozic
43feb1ea7e Android release v1.8.3 2021-04-25 11:08:30 +02:00
Laurent Cozic
06ae47f507 lock files 2021-04-25 10:59:58 +02:00