self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-20 18:48:28 +02:00
Code Issues Releases Activity
6,898 Commits 245 Branches 1,280 Tags
Commit Graph

1625 Commits

Author SHA1 Message Date
Laurent Cozic
43c594b6b2 Server, Desktop: Sync deleted items first to allow fixing oversized accounts 2021-09-18 15:02:24 +01:00
Laurent Cozic
024967ce60 Server: Fixed calculating total item size after an item has been deleted 2021-09-18 14:46:10 +01:00
Laurent Cozic
cd877f64cd Server: Improved support for background tasks and added admin UI to view them 2021-09-18 11:29:24 +01:00
Laurent Cozic
f91b4edb30 Tools: Tweak to stress test script 2021-09-17 18:27:25 +01:00
Laurent Cozic
b56177a4e3 Tools: Added tools to stress test Joplin Server 2021-09-17 10:59:10 +01:00
Laurent Cozic
4e70ca6fd0 Server: Exclude certain queries from slow log 2021-09-16 17:36:06 +01:00
Laurent Cozic
2e04656b54 Server v2.4.8 2021-09-15 23:17:14 +01:00
Laurent Cozic
5e8b7420ff Server: Added support for app level slow SQL query log 2021-09-15 23:14:14 +01:00
Laurent Cozic
8ae4e30fd2 Server v2.4.7 2021-09-15 16:58:59 +01:00
Laurent Cozic
3ce947e82c Server: Fixed handling of brute force limiter by getting correct user IP 2021-09-15 16:57:18 +01:00
Laurent Cozic
c2298213d7 Server: Improve flag logic 2021-09-15 12:06:01 +01:00
Abdunnasir Saeed
9679f03cfa
All: Translation: Update ar.po (#5464) 
A complete Arabic translation
 2021-09-15 06:39:50 -04:00
Laurent Cozic
3cddac3931 Server v2.4.6 2021-09-14 16:02:51 +01:00
Laurent Cozic
41c1e3bec9 Server: Fix transaction deadlock logging 2021-09-14 15:59:01 +01:00
Laurent Cozic
25c5892e74 Server v2.4.5 2021-09-14 13:02:56 +01:00
Laurent Cozic
a661a73511 Revert "Server: Enable multi platform builds (amd64, armv7 and arm64) (#5338)" 
This reverts commit ab134807eae53b303fe8bb054ec5808543fa9624.

Does not build:

https://github.com/laurent22/joplin/runs/3597996286?check_suite_focus=true#step:8:388
 2021-09-14 13:01:33 +01:00
Laurent Cozic
b00959e143 Server v2.4.4 2021-09-14 12:16:47 +01:00
Laurent Cozic
f6f5d6808d Merge branch 'dev' into release-2.4 2021-09-14 12:07:04 +01:00
Laurent Cozic
01b653fc34 Server: Add transaction info to debug deadlock issues 2021-09-14 12:05:29 +01:00
Laurent Cozic
4e7fe66883 Server: Add link to Stripe subscription page to manage payment details 2021-09-13 12:30:36 +01:00
mrkaato
cd99e675d9
All: Translation: Update fi_FI.po (#5452) 2021-09-12 13:00:30 -04:00
Laurent Cozic
a7130ce17a Tools: Added script to compile SASS files 2021-09-12 16:35:08 +01:00
Laurent Cozic
20f8743079 Tools: Upgrade back package-lock files to v2 2021-09-12 16:34:03 +01:00
Laurent Cozic
660b53575e Doc: Update sponsors 2021-09-12 13:08:02 +01:00
Kenichi Kobayashi
6c43b78496
All: Fixes #5447: Plugin onNoteSelectionChange() is triggered twice after a search (#5449) 2021-09-12 11:40:14 +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
4b93664240 Desktop release v2.4.6 2021-09-09 19:25:54 +01:00
Laurent Cozic
a2c6461af8 Desktop: Fix handling of disabled master keys when enabling E2EE 2021-09-09 19:24:52 +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
267c32143b Desktop: Fix handling of disabled master keys when enabling E2EE 2021-09-09 18:42:00 +01:00
Laurent Cozic
9260b2a9ab Plugins: Add support for enabledConditions when creating menu item from command 2021-09-09 14:44:16 +01:00
Xavi Ivars
0a54854f54
All: Translation: Update ca.po (#5432) 
* Update ca.po

* Update ca.po

A ton of improvements
 2021-09-08 16:33:30 -04:00
Laurent Cozic
9ebec8c178 Cli: Fixes #5435: Setting note contents using "set" command does not update note timestamp 2021-09-08 10:32:44 +01:00
Laurent Cozic
6181250d86 Desktop release v2.4.5 2021-09-06 18:35:37 +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
80762572cf Chore: Moved app state to separate file 2021-09-04 18:11:29 +01:00
Marph
8e5d209d3c
All: Translation: Update de_DE.po (#5419) 2021-09-04 13:07:09 -04:00
reportxx
f71dad6d09
All: Translation: Update sv.po (#5418) 2021-09-04 12:05:59 -04:00
Laurent Cozic
f5891dfae8 Tools: Fixed build 2021-09-04 15:15:25 +01:00
Laurent Cozic
736bbbd8ed Plugins: Fixed import API 
Ref: https://discourse.joplinapp.org/t/prompt-when-the-plugin-is-running-typeerror-this-module-oninit-is-not-a-function/20009/14
 2021-09-04 15:07:38 +01:00
Laurent Cozic
973121addd Fixed missing command 2021-09-04 14:36:52 +01:00
Laurent Cozic
71c470f59d Desktop: Fixes #5417: Handle invalid search index in Goto Anything 2021-09-04 14:26:29 +01:00
Laurent Cozic
c529b972e3 Chore: Automatically create command index for desktop app 2021-09-04 13:43:25 +01:00
Laurent Cozic
e6bff3f2e0 Chore: Moved desktop app reducer to separate file so that it can be unit tested 2021-09-04 12:37:22 +01:00
Laurent Cozic
1bc674a1f9 Tools: Update ignored files when running desktop app in dev mode 2021-09-03 16:43:06 +01:00
Laurent Cozic
f371bb8e59 Revert "Merge branch 'desktop-protocol' of https://github.com/roman-r-m/joplin into dev" 
This reverts commit 7c85889c1f94eadcbcf21675aec5d576b77ba781, reversing
changes made to ab134807eae53b303fe8bb054ec5808543fa9624.

Reason: Messed up and accidentally merged a pull request.
 2021-09-03 15:03:17 +01:00
Laurent Cozic
7c85889c1f Merge branch 'desktop-protocol' of https://github.com/roman-r-m/joplin into dev 2021-09-03 15:00:31 +01:00