1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-12 08:54:00 +02:00
Commit Graph

6388 Commits

Author SHA1 Message Date
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
Elaborendum
e88753c609
All: Translation: Update es_ES.po (#5190) 2021-07-15 12:49:27 -04:00
Laurent Cozic
8395d5daa9 Mobile: Added new beta editor based on CodeMirror 6 2021-07-13 19:13:13 +01:00
Laurent Cozic
e01a17528a Mobile: Removed old editor code 2021-07-12 14:00:51 +01:00
Laurent Cozic
b929a44bd5 Tools: Fixed iOS build for XCode 12
Ref: https://stackoverflow.com/a/67314652/561309
2021-07-12 13:51:23 +01:00
Laurent Cozic
131e6d6fb4 Doc: Disable GA in dev mode 2021-07-12 10:50:59 +01:00
Laurent Cozic
4ceca9e44c Doc: Clean up styling and bug fixes 2021-07-12 10:37:58 +01:00
Laurent Cozic
9dc703c312 Doc: Progressive enhancements on download page 2021-07-12 10:14:39 +01:00
Laurent Cozic
0f64c8d0fe Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-12 10:02:20 +01:00
Amanda
71e6aec144
Doc: Update download.md (#5180) 2021-07-11 23:13:28 +01:00
Laurent Cozic
6a93cb289e Server: Moved email templates to separate files 2021-07-11 22:11:20 +01:00
Laurent Cozic
b3ca5cdc6f Doc: Redirect to Install section when trying to download Linux app 2021-07-11 19:20:18 +01:00
Laurent Cozic
952b2b3427 Server v2.2.7 2021-07-11 18:32:05 +01:00
Laurent Cozic
426915c75d Update website 2021-07-11 18:31:21 +01:00
Laurent Cozic
f78ffc5e79 Doc: Moved sync section up and added more details 2021-07-11 18:30:42 +01:00
Laurent Cozic
ff8f230555 Renamed "Share note" to "Publish note" 2021-07-11 18:08:42 +01:00
Laurent Cozic
1808367d78 comment 2021-07-11 18:05:51 +01:00
Laurent Cozic
89f4ca14e8 Server: Fixed mail queue as some emails were not being processed 2021-07-11 18:03:44 +01:00
Laurent Cozic
a4255bb8fe Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-11 16:31:45 +01:00
Laurent Cozic
f761bad6bb Tools: Jest slow threshold 2021-07-11 16:30:50 +01:00
philip-n
018381dad3
Doc: Fix typo (#5179)
cross-plaform --> cross-pla**t**form
2021-07-11 16:29:40 +01:00
Laurent Cozic
62b619865a Server: Added support for resetting user password 2021-07-11 16:28:07 +01:00
Laurent Cozic
240cb35756 Server: Check password complexity 2021-07-11 15:04:01 +01:00
Laurent Cozic
f6f68e9413 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-11 11:43:25 +01:00
Laurent Cozic
f8d2c26c8e Server: Disallow changing email address until a secure solution to change it is implemented 2021-07-11 11:35:49 +01:00