1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-27 10:32:58 +02:00
Commit Graph

6864 Commits

Author SHA1 Message Date
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
cbfc646745 Tools: Set Postgres work memory for dev db 2021-10-10 19:59:39 +01:00
Laurent Cozic
c2e61f548f Tools: Added a few tools to make testing server easier 2021-10-10 19:59:39 +01:00
Laurent
0eb79ba932
Tools: Fixed out of memory error on CI (#5550) 2021-10-10 12:30:21 +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
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