self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-21 09:38:01 +02:00
Code Issues Releases Activity
6,873 Commits 243 Branches 1,266 Tags 541 MiB
176d3286cd
Commit Graph

1605 Commits

Author SHA1 Message Date
Laurent Cozic
a7eea9fc21 Fixed session swap handling on server 2021-09-21 12:31:53 +01:00
Laurent Cozic
7fac1941cd Server: Manage subscription entirely from Stripe 2021-09-21 10:51:10 +01:00
Laurent Cozic
061761f224 Server: Clear cookie when account has been deleted to allow viewing login page again 2021-09-21 10:49:41 +01:00
Laurent Cozic
63e88c05d9 Server: Add support for changing user own email 2021-09-20 19:48:17 +01:00
Laurent Cozic
a6b1cffd50 Server: Handle Joplin Cloud failed subscription payments 2021-09-20 17:04:09 +01:00
Laurent Cozic
8cc720963a Fixed typo 2021-09-20 17:04:08 +01:00
Laurent Cozic
da884752a8 Desktop: Fixed Sync Wizard logo images on Windows 2021-09-20 16:29:05 +01:00
Laurent Cozic
818c7d4640 Fixed CSRF handling when impersonating user 2021-09-20 15:38:26 +01:00
Laurent Cozic
4577c9c161 Server: Allow entering coupon code on Stripe checkout page 2021-09-20 15:25:59 +01:00
Laurent Cozic
03b4b6eb2d Server: Allow an admin to impersonate a user 2021-09-20 13:49:38 +01:00
Laurent Cozic
4d38397cd5 Server: Improved user list page 2021-09-20 12:20:18 +01:00
Laurent Cozic
37d446b970 Server: Rename admin button "Send reset password email" to more correct "Send account information email" 2021-09-20 11:53:35 +01:00
Laurent Cozic
c91d4bda3c Server: Redirect to user page after changing a user 2021-09-20 11:48:51 +01:00
Laurent Cozic
3e537967ee Tools: Added way to test creating Basic or Pro Joplin Server subscription 2021-09-20 11:46:24 +01:00
Laurent Cozic
0cbc261051 Chore: Remove last remnants of discontinued Nextcloud App 2021-09-19 19:15:10 +01:00
Laurent Cozic
542fdb496a Set default options 2021-09-19 18:54:14 +01:00
Laurent Cozic
d850eedd78 Server: Link to Joplin Cloud signup page on login page 2021-09-19 18:45:16 +01:00
Laurent Cozic
9429b51694 Chore: Fixed regression on mobile app 2021-09-19 15:27:23 +01:00
Laurent Cozic
72e58ee195 Tools: Trying to fix TaskService test on CI 2021-09-19 15:06:09 +01:00
Helmut K. C. Tessarek
56be4d59f4
Update translations 2021-09-19 08:37:08 -04:00
Laurent Cozic
bb740c75ec Desktop release v2.4.7 2021-09-19 13:04:59 +01:00
Laurent Cozic
4244f712e1 Merge branch 'dev' into release-2.4 2021-09-19 13:04:36 +01:00
Laurent Cozic
e447acc076 Desktop: Resolves #5440: Do not escape content when copying from Rich Text editor 2021-09-19 13:00:06 +01:00
Laurent Cozic
87f83236cf Desktop: Fixes #5480: Underline was not applied when using Cmd+U in Rich Text editor 2021-09-19 12:35:06 +01:00
Laurent Cozic
6d981864ef Desktop: Fixes #5461: Editor max width was not always applied in Rich Text editor 2021-09-19 12:04:23 +01:00
Nikhil Gautam
0d40026d8b
Desktop: Resolves #5299: Display 0/0 when no search results are found in editor (#5360) 2021-09-19 11:37:33 +01:00
Caleb John
7a9ec627ee
Desktop: Resolves #5233: Fire resize event whenever the layout changes (#5344) 
* Fire resize event whenever the layout changes

This solves an issue where the markdown editor was changing size
physically, but the refresh function wasn't being called so the
editor would lose track of it's size and place the cursor wrongly.
The editor was able to correctly resize when the window resize event
was fired, but this didn't happen when the sidebars were toggled.
The solution implemented here is to hook in to the function where
layout props are changed, and emit a resize event there.
This means that anytime the layout changes (whether or not it affects
sizing), the resize event will be fired.
 2021-09-19 11:36:23 +01:00
Marph
2d72d1435e
Desktop: Support for user-data-dir flag (#5467) 
This flag is passed by chromedriver.
 2021-09-19 11:34:04 +01:00
Helmut K. C. Tessarek
12ec7b0c1d
macOS: Added Cmd+Backspace shortcut to delete line (#5478) 2021-09-19 11:32:58 +01:00
JackGruber
afe1cf747d
All: Fixes #5444: Misinterpreted search term after filter in quotation marks (#5445) 2021-09-19 11:31:38 +01:00
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 ab134807ea.

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 7c85889c1f, reversing
changes made to ab134807ea.

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
Piotr Banasik
ab134807ea
Server: Enable multi platform builds (amd64, armv7 and arm64) (#5338) 2021-09-03 14:54:10 +01:00
Laurent Cozic
8ab1cd984c Server v2.4.3 2021-09-02 18:49:29 +01:00
Laurent Cozic
e387d9a91b Merge branch 'dev' into release-2.4 2021-09-02 18:48:43 +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
85fa3288ab Desktop release v2.4.4 2021-09-02 18:40:36 +01:00
Laurent Cozic
17f82c426a Chore: Added server test 2021-09-02 11:44:13 +01:00
Laurent Cozic
82331c9b93 Server: Display note title as page title when sharing note 2021-09-02 11:37:53 +01:00
Roman
886b6d1126 Add stuff to maybe get it to work on MacOS 2021-09-01 22:46:44 +01:00
Roman
1a703c4ecd Rename ProtocolUtils -> callbackUrlUtils 2021-09-01 22:28:33 +01:00
Roman
1126899769 Code review changes 2021-09-01 22:27:24 +01:00
Laurent Cozic
78c7b79299 Fixed margin 2021-09-01 12:47:35 +01:00
Laurent Cozic
d97ba57dda Desktop: Sort plugin results according to recommended property, and display Recommended tag 2021-09-01 12:17:20 +01:00
Laurent Cozic
9c44133bd0 Plugin Repo: Allow overridding manifest properties and added recommended plugins 2021-08-31 22:37:56 +01:00
Laurent Cozic
93a4ad09bb Server: Fixed calculation of max sizes for Postgres 2021-08-31 16:15:20 +01:00
Laurent Cozic
9c1dc7898a Doc: Add more links to FAQ 2021-08-31 15:39:02 +01:00
Laurent Cozic
6520a481ca Server: Added Help page for Joplin Cloud 2021-08-31 13:46:46 +01:00
Laurent Cozic
5805a41249 Server: Added icon next to profile button 2021-08-31 12:16:57 +01:00
Laurent Cozic
b88b747ba6 Api: Resolves #5199: Add support for "events" end point to retrieve info about latest note changes 2021-08-30 18:53:24 +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
SiderealArt
596f679b1f
All: Translation: Update zh_TW.po (#5398) 2021-08-30 07:36:38 -04:00
Laurent Cozic
78d5fd1385 Server v2.4.2 2021-08-28 18:46:45 +01:00
Helmut K. C. Tessarek
0a98854e43
Update translations 2021-08-28 11:50:02 -04:00
Helmut K. C. Tessarek
a8a0dd2dd6
All: Translation: Update da_DK.po (thanks ERYpTION) 2021-08-28 11:49:01 -04:00
Laurent Cozic
ad931a738f Desktop release v2.4.3 2021-08-28 15:52:09 +01:00
Laurent Cozic
3b6e6e45cf Desktop: Resolves #5161: Display link to browse plugins when repository cannot be reached 2021-08-28 15:45:27 +01:00
Laurent Cozic
dec0a08954 Desktop, Mobile: Fixes #5391: Fixed crash when a required master key does not exist 2021-08-28 15:36:05 +01:00
Roman
b269c2fdb9 Simplify protocol setup 2021-08-28 14:26:54 +01:00
Laurent Cozic
ad51090cdb Chore: Convert changelog tool to TypeScript 2021-08-28 10:49:31 +01:00
Laurent Cozic
75d118b19e Desktop release v2.4.2 2021-08-27 17:21:05 +01:00
Laurent Cozic
4c72de8bd8 Desktop: Fixes #5380: Prevent it from crashing with too long search queries 2021-08-27 17:16:09 +01:00
Laurent Cozic
d6da4299ad Desktop: Fixes #5346: "Move to notebook" would break with empty input 2021-08-27 16:58:42 +01:00
Laurent Cozic
f19c4ab434 Desktop: Allow specific deprecated plugins to still work 2021-08-27 16:34:39 +01:00
Laurent Cozic
70efaddeaf All: Do not display master key upgrade warnings for new master keys 2021-08-27 11:30:21 +01:00
Laurent Cozic
814f602bd6 Chore: Moved EncryptionService under e2ee directory 2021-08-23 18:47:07 +01:00
Laurent Cozic
385b50d6ce Tools: Create test user with flag 2021-08-23 14:52:07 +01:00
Laurent Cozic
43943299f3 Server: Display user flags in profile when logged in as admin 2021-08-23 14:52:07 +01:00
Laurent Cozic
f11ba29112 Server v2.4.1 2021-08-23 14:51:28 +01:00
Arda Kılıçdağı
edf801a1ef
All: Translation: Update tr_TR.po (#5372) 2021-08-23 09:16:54 -04:00
小骏
f441177f7a
All: Translation: Update zh_CN.po (#5371) 2021-08-23 09:15:31 -04:00
Laurent Cozic
30c7410cbe Desktop release v2.4.1 2021-08-23 09:51:49 +01:00
Caleb John
4ba417a2f4
Desktop: Various improvements to Markdown import and export (#5290) 
In preparation for #5224
 2021-08-23 00:35:45 +01:00
Caleb John
e3bd24f819
Desktop: Resolves #5364: Disable inline code background in vim mode (#5370) 
Also ensure that highlight marks are shown above inline code
 2021-08-23 00:34:04 +01:00
Laurent Cozic
6e087bcb23 Server: Handle flags for accounts over limit 2021-08-22 13:10:29 +01:00
Laurent Cozic
f922e9a239 Server: Moved database types to separate file 2021-08-22 11:43:41 +01:00
Laurent Cozic
82b157b491 Server: Add support for user flags 2021-08-22 11:28:15 +01:00
Laurent Cozic
50f421c5d9 Tools: Setup release 2.4 2021-08-21 10:46:46 +01:00
Caleb John
a4785efd58
Desktop: Split code block class in two (#5359) 
This makes it clear that once class controls the background
and the other controls the foreground
 2021-08-21 10:34:54 +01:00
Roman
f42fd0ecce Fix enum usage 2021-08-20 21:43:37 +01:00
Roman
62c5f433d7 Rename enum values 2021-08-20 21:24:16 +01:00
Roman Musin
e73a4b7286
Merge branch 'dev' into desktop-protocol 2021-08-20 12:02:11 +01:00
Laurent Cozic
d6c4228a41 Tools: Move Android URL update to update-readme script 2021-08-20 11:37:12 +01:00
Helmut K. C. Tessarek
45e35576bd
update en_US.po 2021-08-19 08:08:55 -04:00
Helmut K. C. Tessarek
8eb1f7340b
Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-19 08:06:58 -04:00
Helmut K. C. Tessarek
2242cd2e4a
Update translations 2021-08-19 08:06:11 -04:00
Laurent Cozic
16b928a0f9 fixed imports 2021-08-19 13:02:54 +01:00
albanobattistella
351ddfe8a3
All: Translation: Update it_IT.po (#5347) 2021-08-19 07:49:51 -04:00
Laurent Cozic
ea99099b48 Update French translation and fix a few mistakes in code 2021-08-19 10:48:26 +01:00
Sailon Bispo
b257d620b7
All: Translation: Update bt_PR.po (#5340) 
* Updating PT-BR Translate

* Fixing the three dots
 2021-08-19 03:02:02 -04:00
Laurent Cozic
11d35711c1 Tools: Add linter rules for a few TypeScript naming conventions 2021-08-18 16:21:48 +01:00
Laurent Cozic
06ed58b809 All: Improved sync locks so that they do not prevent upgrading a sync target 2021-08-18 15:49:43 +01:00
Laurent Cozic
1efe3d3c6a Server: Prevent crash when returning too many rows using SQLite 2021-08-18 12:48:22 +01:00
Ahmad Mamdouh
9b27b3b1fb
Plugins: Resolves #5288: Improved support for fitToContent webview property (#5298) 2021-08-18 12:09:45 +01:00
JackGruber
d0313585be
Mobile: Show the used tags first in the tagging dialog (#5315) 2021-08-18 12:06:58 +01:00
Caleb John
189f9d1091
Desktop: Fixes #5327: Add more specific classes for CodeMirror elements (#5333) 
Some themes use fairly specific classes so we need to overide them.

When changing notebooks, or when entering the editor from settings
the order that css is loaded changes in which case this bug wouldn't
manifest
 2021-08-18 12:05:52 +01:00
Caleb John
352b78b5f7
Desktop: Removes markdown inline code padding (#5331) 
Ref: https://github.com/laurent22/joplin/pull/5314#issuecomment-900256897
 2021-08-18 12:03:34 +01:00
Laurent Cozic
4f5ad86028 Desktop: Fixes #5184: GotoAnything is not working on first try 2021-08-18 11:54:28 +01:00
Laurent Cozic
0cec4753d8 Server: Fixes #5328: Filenames with non-ascii characters could not be downloaded from published note 2021-08-17 23:29:46 +01:00
Laurent Cozic
51dbf885b7 Doc: Added sponsor 2021-08-17 14:19:37 +01:00
Laurent Cozic
ac82e4b074 Server: Re-enable account when new subscription is associated with it 2021-08-17 12:23:26 +01:00