1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-18 09:35:20 +02:00
Commit Graph

160 Commits

Author SHA1 Message Date
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