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

6462 Commits

Author SHA1 Message Date
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
Laurent Cozic
36948732d6 Doc: Added higher res screenshot for 4k screens 2021-07-16 18:06:41 +01:00
Laurent Cozic
f3e5a22ff2 Update website 2021-07-16 17:32:38 +01:00
Laurent Cozic
e5d71d0cae Doc: Add Donate button A/B testing 2021-07-16 17:32:01 +01:00
Laurent Cozic
eb0dd8dcd2 Update website 2021-07-16 17:14:56 +01:00
Laurent Cozic
f3a69184b5 Doc: Rename "Support" to "Support us" 2021-07-16 17:14:12 +01:00
Laurent Cozic
4567b78f0c Server: Clarify error message when user info cannot be saved 2021-07-16 17:05:15 +01:00
Laurent Cozic
92520e58fb Server: Set default of env SUPPORT_EMAIL to "SUPPORT_EMAIL" to make it clear it needs to be set 2021-07-16 16:56:21 +01:00
Laurent Cozic
7245aead39 Server: Make sure email URLs are displayed as clickable links 2021-07-16 16:37:18 +01:00
Laurent Cozic
9823ac3379 Tools: Fixed server test user creation 2021-07-16 16:35:58 +01:00
Laurent Cozic
7a164b9b87 Fixing mobile build 2021-07-16 15:50:33 +01:00
Laurent Cozic
e125430748 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-16 14:32:09 +01:00
Laurent Cozic
ed8a928a8e Fix mobile build 2021-07-16 14:30:52 +01:00
Roman Musin
7f709c210c
Remove unused condition in synchronizer (#5194) 2021-07-16 11:48:54 +01:00
Laurent
8e4be78013
Desktop: Make Markdown editor styling closer to view styling (#5174) 2021-07-16 11:32:29 +01:00
Laurent Cozic
58c4f9eded Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-16 11:13:50 +01:00
Xavi Ivars
2c525c2163
All: Translation: Update ca.po (#5193) 2021-07-15 13:29:02 -04:00
stephan11H
68f119efbd
All: Translation: Update de_DE.po (#5186)
* update german translation file

* update German translation file

* changed translation for *full changelog*

Co-authored-by: Stephan Hildebrand <stephan.hildebrand@rwth-aachen.de>
2021-07-15 12:51:33 -04:00