1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-30 10:36:35 +02:00
Commit Graph

6629 Commits

Author SHA1 Message Date
Laurent Cozic
8b08f0d2b3 Fixed config 2021-07-25 14:21:41 +01:00
Laurent Cozic
fb9ec105df Desktop: Converted Clipper notification to a modal dialog that shows up in all screens 2021-07-25 13:15:56 +01:00
Laurent Cozic
53b4d7af68 Server: Improve installation instructions 2021-07-25 12:03:23 +01:00
Laurent Cozic
3a3aa701ac Desktop, Cli: Fixes #5232: Do not export share properties 2021-07-25 11:51:50 +01:00
Laurent Cozic
830712a3bb Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-25 11:15:54 +01:00
Laurent Cozic
dd1f90819c Server: Fixes #5229: Published notes that contain non-alphabetical characters could end up being truncated 2021-07-25 11:13:27 +01:00
JackGruber
2ed8ac91a9
Server: Add Docker major, minor and beta version tags (#5237) 2021-07-25 10:38:36 +01:00
Helmut K. C. Tessarek
31c3093700
Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-24 19:11:27 -04:00
Vaso3
769094f002
All: Translation: Update sr_RS.po (#5234)
* Update sr_RS.po

Added and improved translation in the first 3k lines of the file

* Update sr_RS.po

Added translation.

* Update sr_RS.po

Few minor changes and fixed broken string.

* Update sr_RS.po

Some more corrections

* Update sr_RS.po

* Update sr_RS.po
2021-07-24 19:10:34 -04:00
Helmut K. C. Tessarek
a60d9fa61f
All: Translation: Update pt_BR.po (thanks kuroppi) 2021-07-24 18:28:20 -04:00
Laurent Cozic
6499ca8e61 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-24 18:57:29 +01:00
Laurent Cozic
2b64b320fb Fixed tests 2021-07-24 18:56:30 +01:00
Laurent Cozic
282f782d50 Server: Fixed certain URLs 2021-07-24 18:34:42 +01:00
Laurent Cozic
5fcf2e48b3 Server v2.2.8 2021-07-24 17:56:36 +01:00
Laurent Cozic
63d4ccdc61 Merge branch 'dev' into release-2.2 2021-07-24 17:55:41 +01:00
Laurent Cozic
19b45de298 Server: Added form tokens to prevent CSRF attacks 2021-07-24 17:45:30 +01:00
Laurent Cozic
b7e9848428 Server: Allow users to cancel Stripe subscription 2021-07-24 16:44:50 +01:00
Laurent Cozic
3f993af7fd Server: Explain how to use Joplin Server with a Joplin app 2021-07-24 15:14:07 +01:00
Laurent Cozic
e1bd127b23 Update website 2021-07-24 11:15:07 +01:00
Ahmad Mamdouh
d3c1edc3ee
Fix wrong variable name (#5235) 2021-07-24 10:41:39 +01:00
Vaso3
471c06b3fd
All: Translation: Update sr_RS.po (#5218)
* Update sr_RS.po

Added and improved translation in the first 3k lines of the file

* Update sr_RS.po

Added translation.

* Update sr_RS.po

Few minor changes and fixed broken string.
2021-07-23 15:51:51 -04:00
Laurent Cozic
e83ab93644 Server: Allow user to upgrade account 2021-07-23 20:34:30 +01:00
Laurent Cozic
75a421edb1 Server: Allow admin to change Stripe subscription 2021-07-23 17:03:49 +01:00
Laurent Cozic
07d2a60c75 Plugins: Add support for loading application chrome and note CSS from the plugin 2021-07-23 11:05:21 +01:00
Laurent Cozic
252d0695a4 Server: Handle Stripe webhook receiving multiple times the same event 2021-07-22 21:54:21 +01:00
Laurent Cozic
27c3cbdf8f Server: Allow enabling or disabling a user. Handle cancelling subscription. 2021-07-22 17:32:10 +01:00
Laurent Cozic
2b378880ce Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-22 17:30:50 +01:00
David Beale
52e1a05f4d
Tools: Remove es module entry points from Turndown packages, as they are not being included in the dist (#5226) 2021-07-22 10:51:19 +01:00
Ahmad Mamdouh
c89037b4a2
Plugins: Add ability to make dialogs fit the application window (#5219) 2021-07-22 10:21:57 +01:00
reportxx
f611d7734b
All: Translation: Update sv.po (#5221) 2021-07-21 14:27:50 -04:00
Laurent Cozic
aadace42a2 Doc: Set website description meta tag 2021-07-21 16:19:01 +01:00
balmag
366ef025dc
All: Translation: Update hu_HU.po (#5215)
Update Hungarian language file
2021-07-20 13:09:18 -04:00
Laurent Cozic
75cc73cc0c Desktop, Cli: Fixes #5213: Import highlighted text from ENEX files 2021-07-20 10:39:20 +01:00
Laurent Cozic
b6cf9d1d5a Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-19 18:14:56 +01:00
Laurent Cozic
29a181f88f Doc: Remove image-rendering CSS 2021-07-19 17:33:34 +01:00
milotype
9ac56b3754
All: Translation: Update hr_HR.po (#5206) 2021-07-19 10:37:27 -04:00
Laurent Cozic
48d6c74a49 Update website 2021-07-19 14:47:33 +01:00
Laurent Cozic
d4cdebafeb Doc: Automatic generation of responsive images 2021-07-19 14:37:59 +01:00
Laurent Cozic
ea5a296d1f Update website 2021-07-19 11:01:01 +01:00
Laurent Cozic
1194f6879f Doc: Display Joplin Cloud links 2021-07-19 10:58:21 +01:00
Laurent Cozic
37ad6132b8 Desktop release v2.2.2 2021-07-19 10:45:30 +01:00
Laurent Cozic
2d92a0f1a0 Merge branch 'dev' into release-2.2 2021-07-19 10:45:03 +01:00
Laurent Cozic
d469ac174c Merge branch 'release-2.1' into dev 2021-07-19 10:42:22 +01:00
Laurent Cozic
882d66383b Desktop release v2.1.9 2021-07-19 10:40:12 +01:00
Laurent Cozic
cafaa9cac5 All: Ensure that timestamps are not changed when sharing or unsharing a note 2021-07-19 10:27:43 +01:00
Laurent Cozic
b2de27b6fc Desktop: Make sure clipper authorisation notification is displayed, even when in config screen 2021-07-19 09:46:32 +01:00
小骏
73c75a8071
All: Translation: Update zh_CN.po (#5203)
* update zh_CN.po

* update zh_CN.po

* update zh_CN.po

* update zh_CN.po
2021-07-18 14:52:14 -04:00
balmag
d2df19ed0c
All: Translation: Update hu_HU.po (#5195) 2021-07-16 17:11:43 -04:00
Helmut K. C. Tessarek
62903874b5
Update translations 2021-07-16 14:18:48 -04:00
Laurent Cozic
bad1bd0fc3 Update website 2021-07-16 18:07:43 +01:00