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

848 Commits

Author SHA1 Message Date
Laurent Cozic
73314447b9 Desktop: Fixes #4441: Fixed copying text from Rich Text editor 2021-01-30 11:08:11 +00:00
Zhang YANG
477b9fb8e8
All: Translation: Update zh_CN.po (#4442)
* Update zh_CN translation (2020-12-29)

* Minor update

* Update zh_CN.po
2021-01-29 20:49:15 -05:00
Laurent Cozic
cb2c2160ae Desktop: Fixed updating plugins 2021-01-29 21:54:08 +00:00
Laurent Cozic
ccbc329cbf Server: Add support for sharing notes via a link 2021-01-29 18:45:11 +00:00
Gen Neko
4a847a096b
All: Translation: Update ja_JP.po (#4440) 2021-01-29 01:29:32 -05:00
Vaso3
db985b9faf
All: Translation: Update sr_RS.po (#4438)
Added and improved translation in first 1k lines of the file

Co-authored-by: Vasily <50267052+VasilyKaiser@users.noreply.github.com>
2021-01-28 14:04:34 -05:00
Helmut K. C. Tessarek
b0af917a35
Update translations 2021-01-28 11:37:28 -05:00
Ji-Hyeon Gim
f898fd4ef0
All: Translation: Update ko.po (#4436)
It updates Korean translation to be better.

Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>
2021-01-28 11:29:18 -05:00
Laurent Cozic
42c80e6e28 Merge branch 'release-1.7' into dev 2021-01-28 10:22:33 +00:00
Laurent Cozic
2f8aafd85b Releasing sub-packages 2021-01-27 23:59:02 +00:00
Laurent Cozic
95253f70ea Plugin Repo: Add link to plugin commit in commit message 2021-01-27 23:57:08 +00:00
Laurent Cozic
4156b13c32 Desktop: Fixed plugin panel issue that could crash app in rare case
Ref: https://discourse.joplinapp.org/t/rearranging-the-pannels-crushed-the-app-and-generated-fatal-error/14373
2021-01-27 22:52:54 +00:00
Laurent Cozic
18dfc5a987 Desktop release v1.7.9 2021-01-27 22:13:10 +00:00
Laurent Cozic
ae29238592 Desktop release v1.7.8 2021-01-27 22:12:05 +00:00
Laurent Cozic
99445cac27 Tools: Make sure notarization does not make Travis timeout the task 2021-01-27 22:11:40 +00:00
Laurent Cozic
95f59a67ea Android release v1.7.1 2021-01-27 17:49:13 +00:00
Laurent Cozic
fb04a3ae20 Desktop release v1.7.7 2021-01-27 17:43:25 +00:00
Laurent Cozic
12187b9da3 Mobile: Fixed mobile build 2021-01-27 17:42:58 +00:00
Laurent Cozic
35597ce3c2 Doc: Updated doc for resource creation from a plugin 2021-01-27 13:00:10 +00:00
Laurent Cozic
ea49242f24 Plugins: Add support for joplin.plugins.installationDir to allow accessing external files packaged with the plugin 2021-01-27 12:48:47 +00:00
Vaso3
f60f07ad19
All: Translation: Update sr_RS.po (#4429)
Corrected and added translation in the first 600 lines of the file.
2021-01-26 20:46:07 -05:00
Laurent Cozic
8de46ed462 Desktop release v1.7.6 2021-01-26 23:57:01 +00:00
Laurent Cozic
cda9441c69 Desktop: Fixed installing plugins 2021-01-26 23:56:35 +00:00
Laurent Cozic
11b8821bf4 Desktop release v1.7.5 2021-01-25 23:08:45 +00:00
Laurent Cozic
f7a457fb6c Desktop, Cli: Some imported ENEX files incorrectly had invisible sections 2021-01-25 15:54:11 +00:00
Laurent Cozic
63a5bfa756 Server: Fixed error handling when no session is provided 2021-01-25 12:13:02 +00:00
Laurent Cozic
e828c8e6eb Server: Fixes #4402: Fixed uploading empty file to the API 2021-01-25 12:04:18 +00:00
Laurent Cozic
dbbbd22aef Desktop: Localise "Click to add tags" button 2021-01-25 10:20:56 +00:00
Laurent Cozic
ad56d02eb8 Fixed CLI release script 2021-01-24 21:56:59 +00:00
Laurent Cozic
adad4cab75 Doc: Automatically create Joplin Server changelog 2021-01-24 19:25:32 +00:00
Laurent Cozic
89a2e9fe9a Server release v1.7.2 2021-01-24 18:56:53 +00:00
Laurent Cozic
774be9cc0d Desktop: Do not allow installing plugins incompatible with current app version 2021-01-24 18:45:42 +00:00
Laurent Cozic
351a05fb0d Desktop: In config screen, click on a plugin name to open its home page 2021-01-24 18:20:00 +00:00
Laurent Cozic
a320e113ac Plugins: Add support for joplin.plugins.require API to allow using sqlite3 or fs-extra from a plugin 2021-01-24 18:03:33 +00:00
Ji-Hyeon Gim
1509e6e58a
All: Translation: Update ko.po (#4410)
It updates fuzzy/missing translations for Korean.

Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>
2021-01-24 12:09:55 -05:00
Laurent Cozic
cbd842c268 Plugins: Add support for plugins.dataDir function, to provide a path for plugin to store its own data 2021-01-24 15:51:35 +00:00
Laurent Cozic
257cde4383 Desktop, Cli: Improved error handling when importing ENEX 2021-01-24 15:24:10 +00:00
Laurent Cozic
039da8c15c Releasing sub-packages 2021-01-23 16:20:38 +00:00
Laurent Cozic
0cbecabff2 Plugin Repo: Prevent faulty packages from generating commits on each check 2021-01-23 16:18:59 +00:00
Laurent Cozic
63559ac8b9 Tools: Apply eslint rule "no-multi-spaces" 2021-01-23 15:51:19 +00:00
Laurent Cozic
0e2351e79e Mobile: Removing no longer used beta Markdown editor
Ref: https://discourse.joplinapp.org/t/anyone-using-the-beta-editor-on-ios/11658
2021-01-22 23:36:02 +00:00
Laurent Cozic
86610e7561 Converted models and services to TypeScript 2021-01-22 17:41:11 +00:00
Laurent Cozic
c895f7cd4f Desktop release v1.7.4 2021-01-22 10:56:22 +00:00
Laurent Cozic
83c1753049 Merge branch 'release-1.7' into dev 2021-01-22 10:55:00 +00:00
Laurent Cozic
22a7668d4b Server: Fixed password hashing when changing password 2021-01-22 01:11:06 +00:00
Laurent Cozic
469143c2e8 Plugins: Fixed dropdown settings 2021-01-22 00:55:58 +00:00
Laurent Cozic
d4a6078392 Desktop: Enable TLS options for Joplin Server 2021-01-22 00:31:10 +00:00
Laurent Cozic
0c09202950 Update website 2021-01-21 23:12:49 +00:00
Laurent Cozic
5128ef22bf Fix CLI build 2021-01-21 23:12:04 +00:00
Laurent Cozic
43a8f4a46e Desktop: Added button to browse plugins 2021-01-21 22:57:09 +00:00
Laurent Cozic
63493214a0 Desktop: Move plugin settings under separate section in config menu 2021-01-21 22:40:14 +00:00
Laurent Cozic
fa9f5fd458 Desktop: Fixes #4337: Make sure note is automatically saved when format is set via keyboard shortcut in Rich Text editor 2021-01-21 18:33:33 +00:00
Laurent Cozic
2d4ae4d8de Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-01-21 18:26:56 +00:00
Laurent Cozic
716a92944d Desktop, Mobile: Fixes #4363: Added missing translations 2021-01-21 18:23:32 +00:00
Laurent Cozic
3ecf942b44 Merge branch 'release-1.6' into dev 2021-01-21 13:49:23 +00:00
Laurent Cozic
33db9883c9 ios-v10.6.3 2021-01-21 13:47:04 +00:00
Laurent Cozic
85355f8eda Android release v1.6.7 2021-01-21 11:25:45 +00:00
Laurent Cozic
1c696bf989 CLI v1.6.4 2021-01-21 10:02:05 +00:00
Laurent Cozic
7a8629c38d Cli: Fixed version number 2021-01-21 10:00:42 +00:00
Laurent Cozic
9b24c2f4a9 All: Disable log statement when saving settings 2021-01-21 09:57:53 +00:00
Laurent Cozic
ff0c1b62b3 Releasing sub-packages 2021-01-21 00:17:54 +00:00
Laurent Cozic
1e611a7ab9 Tools: Added README for plugin-repo-cli 2021-01-21 00:16:59 +00:00
Laurent Cozic
f9b0e2f6df Tools: Various improvements on plugin-repo-cli 2021-01-21 00:12:59 +00:00
Laurent Cozic
fc7bd41c10 Desktop release v1.6.8 2021-01-20 15:49:39 +00:00
Laurent Cozic
8d35298500 Desktop: Fixes #4305: Fixed infinite sync issue with OneDrive
- Disable support for unreliable OneDrive delta sync, and switched to basic sync
- More robust error handling to take into account how unreliable the OneDrive API became
2021-01-20 15:49:02 +00:00
Laurent Cozic
0e1fb9f491 Desktop release v1.7.3 2021-01-19 23:05:06 +00:00
Laurent Cozic
df1df6dc1f Tools: Minor tweaks on desktop release script 2021-01-19 23:04:49 +00:00
Laurent Cozic
ad34cee234 Desktop release v1.7.2 2021-01-19 23:03:14 +00:00
Laurent Cozic
ddf3e16ff0 Tools: Minor tweaks on desktop release script 2021-01-19 23:02:58 +00:00
Laurent Cozic
4e2e26f033 Desktop release v1.7.1 2021-01-19 22:59:19 +00:00
Laurent Cozic
f37d37e613 Desktop: Allow updating a plugin 2021-01-19 22:58:09 +00:00
Laurent Cozic
63e30f6ccb Plugins: Updated types 2021-01-19 16:48:13 +00:00
Laurent Cozic
9c718baf61 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-01-18 20:11:17 +00:00
Laurent Cozic
e8ae29adf2 Tools: Clean up and fix tool dependencies 2021-01-18 20:09:11 +00:00
eresytter
0c67805626
All: Translation: Update id_ID.po (#4387) 2021-01-18 14:16:58 -05:00
Laurent Cozic
e91c94baca Added version command 2021-01-18 15:12:21 +00:00
Laurent Cozic
aa74d05b24 Releasing sub-packages 2021-01-18 15:00:00 +00:00
Laurent Cozic
40779d09c0 Releasing sub-packages 2021-01-18 14:49:39 +00:00
Laurent Cozic
351d8d94c5 Set version numbers 2021-01-18 14:49:14 +00:00
Laurent Cozic
6addd52ba4 Fix script 2021-01-18 14:48:42 +00:00
Laurent Cozic
ea5849855f Releasing sub-packages 2021-01-18 14:42:40 +00:00
Laurent Cozic
c81529dc45 Fix repo builder package.json 2021-01-18 14:42:23 +00:00
Laurent Cozic
b6d7971691 Set version numbers on sub-packages 2021-01-18 14:40:39 +00:00
Laurent Cozic
446db2d688 Releasing sub-packages 2021-01-18 14:38:23 +00:00
Laurent Cozic
52da072f9a Plugins: Updated plugin repo script 2021-01-18 14:37:27 +00:00
Laurent Cozic
0d2bf6d787 Server: Improved config and support for Docker 2021-01-18 10:13:26 +00:00
Roman Musin
59fe4a2193
Mobile: When attaching a file to a note set correct title and extension (#4373) 2021-01-17 11:40:24 +00:00
Caleb John
df6d146c84
SideBar -> Sidebar in app.ts (#4375) 2021-01-17 11:34:37 +00:00
Laurent Cozic
eb3493f648 Server: Fixed tests and clean up 2021-01-15 22:02:36 +00:00
Laurent Cozic
7fd4c28a5b Plugin Generator release v1.7.3 2021-01-15 17:04:18 +00:00
Laurent Cozic
d1b55aeceb Generator: Fixes #4360: Scripts were no longer being compiled 2021-01-15 17:03:38 +00:00
Laurent Cozic
413ec1a933 Server: Refactored to use Router class 2021-01-14 22:36:46 +00:00
Laurent Cozic
7ad29577f9 Server: Improved how routes can be defined 2021-01-14 18:27:59 +00:00
Laurent Cozic
7652a5a0a0 Server: Added tests for logout and fixed transaction deadlock 2021-01-14 17:18:27 +00:00
Laurent Cozic
105189fc57 Plugin Generator release v1.7.2 2021-01-14 15:48:10 +00:00
Laurent Cozic
e559999aa4 Generator: Fixed crash when no external script needs to be compiled 2021-01-14 15:47:34 +00:00
Laurent Cozic
4a230d7cd5 Server: Removed all controller
These controllers were mostly here to allow testing the business logic.
However now that the routes are tested directly they are no longer
necessary. And testing the routes significantly increase the test
coverage.
2021-01-14 14:28:20 +00:00
Laurent Cozic
9b2e5e2959 Server: Removed the need for session controller 2021-01-14 13:29:03 +00:00
Laurent Cozic
3c5ac1ecc5 Server: Removed the need for file controller 2021-01-14 13:07:38 +00:00
Laurent Cozic
03dc1bbfe1 Server: Removed the need for profile controller 2021-01-14 12:50:45 +00:00
Laurent Cozic
80580ba54d Server: Clean up test units 2021-01-14 11:55:27 +00:00
Laurent Cozic
6a80b2ae9e Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-01-13 23:26:02 +00:00
Laurent Cozic
f14ea46f0b Server: Moved controller tests to route and model 2021-01-13 23:20:45 +00:00
Laurent Cozic
247bd9bfd9 Server: Moved session tests to route 2021-01-13 22:06:47 +00:00
Laurent Cozic
fc58db5d1a Server: Removed controller dependency from route 2021-01-13 21:50:43 +00:00
Laurent Cozic
66a09e5068 Server: Moved file API tests to route 2021-01-13 18:11:35 +00:00
jibedoubleve
b53e475f99
Update French translation + fix a typo (#4349) 2021-01-13 12:39:59 +00:00
Laurent Cozic
ecb6134828 Plugin Generator release v1.7.1 2021-01-13 12:19:36 +00:00
Laurent Cozic
4b2bb1168b Setup new release version 1.7 2021-01-13 12:19:12 +00:00
Laurent Cozic
4743b0b5ce Plugins: Updated types 2021-01-13 12:17:54 +00:00
Laurent Cozic
3abf21d4ae Generator: Fixed issue that could result in an invalid JPL file 2021-01-13 12:16:36 +00:00
Laurent Cozic
6cdb16c8ab Server: Started moving controller tests to routes 2021-01-12 22:03:31 +00:00
rnbastos
b7bfa2b997
Updated pt_BR translation (#4344) 2021-01-12 21:27:16 +00:00
Laurent Cozic
eab2371206 Server: Add test units for sessions route 2021-01-12 18:08:14 +00:00
Laurent Cozic
63615ffbaf Server: Unit test request routing 2021-01-12 17:33:14 +00:00
Laurent Cozic
59fa51c5bf Server: Added test units for user login 2021-01-12 17:14:09 +00:00
Laurent Cozic
c70f023fe0 Server: Added test units for notification handler 2021-01-12 16:49:39 +00:00
Laurent Cozic
fb5eb1a47b Server: Dismiss admin password notification when password has been changed 2021-01-12 16:02:44 +00:00
Laurent Cozic
5aa5089ae0 Plugins: Add support for "keywords" manifest field 2021-01-12 15:34:59 +00:00
Laurent Cozic
4413e6a1ee Tools: Handle obsolete packages on plugin repo 2021-01-12 15:29:08 +00:00
Laurent Cozic
309a97fb5b Fixed publishing toggleSidebars plugin 2021-01-12 12:36:15 +00:00
Laurent Cozic
1b5b2342fc Move plugin under joplin namespace 2021-01-12 12:30:45 +00:00
Laurent Cozic
0f23277bfc Chore: SideBar => Sidebar 2021-01-12 12:28:55 +00:00
Laurent Cozic
e595e19c0d Typo 2021-01-12 02:27:56 +00:00
Laurent Cozic
79dde365f0 Doc: Updated doc and tests for plugin postMessage() update 2021-01-11 23:34:06 +00:00
Laurent Cozic
2489409abb Plugins: Added support for bi-directional messages in content scripts and webview scripts using postMessage 2021-01-11 23:33:10 +00:00
Laurent Cozic
cbad3b1190 Merge branch 'release-1.6' into dev 2021-01-11 22:41:26 +00:00
Laurent Cozic
b74b849830 Desktop release v1.6.7 2021-01-11 22:18:24 +00:00
Caleb John
63a331c82f Desktop: Fixes #4338: Some commands were no longer working (#4343) 2021-01-11 22:17:55 +00:00
Caleb John
b7313568de
Desktop: Fixes #4338: Some commands were no longer working (#4343) 2021-01-11 22:17:34 +00:00
Laurent Cozic
25341858d5 Tools: Fixed plugin repo table and sort by name 2021-01-11 12:46:21 +00:00
Laurent Cozic
dc6ae90113 Tools: Auto-update README when building plugin repo 2021-01-11 12:42:11 +00:00
Laurent Cozic
7530d2e4bc CLI v1.6.3 2021-01-11 11:52:17 +00:00
Laurent Cozic
f678434411 Fixed deps 2021-01-11 11:51:53 +00:00
Laurent Cozic
9d547a58c9 CLI v1.6.2 2021-01-11 11:42:17 +00:00
Laurent Cozic
aa4905ab45 Releasing sub-packages 2021-01-11 11:40:56 +00:00
Laurent Cozic
b24eb5d09c ios-v10.6.2 2021-01-11 11:16:46 +00:00
Laurent Cozic
1bc56d0fa9 ios-v10.6.1 2021-01-11 11:16:17 +00:00
Laurent Cozic
a77d500bfa CLI v1.6.1 2021-01-11 11:10:58 +00:00
Laurent Cozic
8fea9ba193 Android release v1.6.6 2021-01-10 00:53:26 +00:00
Laurent Cozic
3fdcd3aaa6 Android release v1.6.5 2021-01-10 00:14:36 +00:00
Laurent Cozic
f58b7563e6 Desktop release v1.6.6 2021-01-09 13:17:23 +00:00
Laurent Cozic
d434723244 Desktop: Add way to install plugin from file 2021-01-09 13:14:39 +00:00
Laurent Cozic
fca8f71f4a Desktop release v1.6.5 2021-01-08 22:22:44 +00:00
Laurent Cozic
023170548f Plugins: Added joplin.settings.onChange event 2021-01-08 22:20:59 +00:00
Laurent Cozic
d75adc3740 Desktop: Fixed attaching local files that contain spaces in path
Ref: https://discourse.joplinapp.org/t/a-minor-bug-on-linking-to-local-files/13654
2021-01-08 18:33:22 +00:00
Laurent Cozic
0bf3531f51 Plugins: Fixes #4308: Fixed "exportFolders" command when exporting JEX file 2021-01-08 18:06:33 +00:00
Laurent Cozic
c9f40ea23f Desktop, Cli: Resolves #4310: Do not display error message when fixing ENEX resource mime type 2021-01-08 17:49:53 +00:00
Laurent Cozic
c8755839be Desktop, Cli: Resolves #4316: Improved support for bold and italic format when importing ENEX file 2021-01-08 17:40:18 +00:00
Laurent Cozic
c3e696db5a Merge branch 'release-1.5' into dev 2021-01-08 17:27:41 +00:00
Laurent Cozic
a0134005b7 Plugin Generator release v1.6.11 2021-01-08 16:45:44 +00:00
Laurent Cozic
b66d90bbcc Tools: Fixed config of demo plugins 2021-01-08 16:44:11 +00:00
Laurent Cozic
41edf5b2da Plugins: Updated types 2021-01-08 16:36:48 +00:00
Caleb John
c484c88715
Desktop: Fix issue that was preventing editor context menu from being refreshed (#4303) 2021-01-08 16:35:23 +00:00
Laurent Cozic
4a0fb124a7 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-01-08 16:32:11 +00:00
Laurent Cozic
ebbaa5177b Generator: Better handling of external scripts 2021-01-08 16:31:11 +00:00
Jonathan Heard
5d1dc224ca
All: Fixes #4313: Fixed OneDrive issue that would require a full resync every time (#4324) 2021-01-08 16:07:03 +00:00
Helmut K. C. Tessarek
3626714403
actually toggle something ;-) (#4309)
* actually toggle something ;-)

* make ids a bit longer
2021-01-08 10:36:37 -05:00
JackGruber
3884ada760
Doc: Fix typo on json array (#4322) 2021-01-08 00:36:38 -05:00
Laurent Cozic
16788d1437 Tools: Setup server tests 2021-01-07 22:15:41 +00:00
Laurent Cozic
ccf5271584 Desktop: Handle case where a command is sent to an editor that is gone 2021-01-07 22:03:13 +00:00
Laurent Cozic
df3e6a6219 Desktop: Fixed context menu not being displayed on high DPI screens 2021-01-07 21:44:31 +00:00
Laurent Cozic
f43ec71d9a Tools: Increase Jest timeout on server tests 2021-01-07 21:34:07 +00:00
Laurent Cozic
32dab88054 Tools: Fixed validatePluginId test 2021-01-07 19:30:29 +00:00
Laurent Cozic
1b5868a7c5 Desktop release v1.6.4 2021-01-07 17:05:31 +00:00
Laurent Cozic
72712e71eb Desktop release v1.6.3 2021-01-07 17:05:21 +00:00
Laurent Cozic
ec29f791ba Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-01-07 17:04:04 +00:00
Caleb John
98cbb237b5
Desktop: Fixes: #4317: Spell checker inserts correction at wrong location (#4318) 2021-01-07 17:01:44 +00:00
Jan Blunck
826dda5a75
Mobile: Fixes #4268: Fix "Not implemented" error when downloading resources with S3 sync target (#4279)
Since the RNFetchBlob API doesn't support writing binary data directly
it creates a custom Writable which is doing the base64 encoding per 
chunk.

This also fixes a problem with the S3 synchronization code using the
shim.fsDriver().writeBinaryFile().

Tested with AVD Android 10.0 target.

Signed-off-by: Jan Blunck <jblunck@users.noreply.github.com>
2021-01-07 16:36:07 +00:00
Laurent Cozic
6dc5a816e5 Desktop: Add support for searching and installing plugins from repository 2021-01-07 16:30:53 +00:00
Laurent Cozic
1700b29f7d Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-01-07 16:30:13 +00:00
Jerry Zhao
7a6966405c
All: Support natural sorting by title (#4272) 2021-01-07 16:29:53 +00:00
Gen Neko
99fb578db4
All: Translation: Update ja_JP.po (#4307) 2021-01-06 19:15:02 -05:00
Laurent Cozic
7114228fd6 Validate plugin ID 2021-01-06 20:27:04 +00:00
Laurent Cozic
8d4d438136 Tools: Updated script to build plugin repository 2021-01-06 20:23:23 +00:00
Laurent Cozic
420ac8359c Tools: Updated script to build plugin repository 2021-01-06 19:43:05 +00:00
Laurent Cozic
fe7691d786 Plugin Generator release v1.6.10 2021-01-05 21:59:41 +00:00
Laurent Cozic
db4f35b936 Generator: Added "npm run update" command 2021-01-05 21:59:16 +00:00
Laurent Cozic
72aabf71f3 Plugin Generator release v1.6.9 2021-01-05 21:49:37 +00:00
Laurent Cozic
d145ce1876 Generator: Fixed package name conversion and added test units 2021-01-05 21:49:08 +00:00
Laurent Cozic
ab6f02a949 Plugin Generator release v1.6.8 2021-01-05 18:28:36 +00:00
Laurent Cozic
1339414443 Generator: Merge ignore files when updating plugin 2021-01-05 18:28:12 +00:00
Laurent Cozic
732ca53b70 Plugin Generator release v1.6.7 2021-01-05 18:20:00 +00:00
Laurent Cozic
fa749d6d2a Generator: Merge ignore files when updating plugin 2021-01-05 18:18:40 +00:00
Laurent Cozic
6e69343bb6 Plugin Generator release v1.6.6 2021-01-05 18:02:35 +00:00
Laurent Cozic
520454affb Generator: Do not overwrite README.md when updating 2021-01-05 17:57:42 +00:00
Laurent Cozic
734514b6d8 Tools: Add script to build plugin repository 2021-01-05 15:25:15 +00:00
Laurent Cozic
ceb252b9ad Add "plugins" sub-package to group official Joplin plugins 2021-01-05 13:38:38 +00:00
Laurent Cozic
f121245e40 Plugin Generator release v1.6.5 2021-01-05 13:27:41 +00:00
Laurent Cozic
215a1e0240 Generator: Cleaned up prompts 2021-01-05 12:09:43 +00:00
Laurent Cozic
8ed36d7a29 Plugin Generator release v1.6.4 2021-01-05 11:31:26 +00:00
Laurent Cozic
2b33df2955 Tools: Fixed git-changelog for server 2021-01-04 22:33:36 +00:00
Laurent Cozic
5c283e4508 Desktop release v1.6.2 2021-01-04 19:39:01 +00:00
Laurent Cozic
c94ee5d99a Plugin Generator release v1.6.3 2021-01-04 19:38:41 +00:00
Laurent Cozic
4a258a2427 Generator: Better handling of package.json keywords 2021-01-04 19:32:30 +00:00
Laurent Cozic
330ef6f7e6 Tools: Fixed plugin package.json 2021-01-04 19:18:29 +00:00
Laurent Cozic
4a579393f3 Plugins: Updated types 2021-01-04 18:46:43 +00:00
Laurent Cozic
1091795a3a Generator: Update plugin generator to handle requirements of coming plugin repository 2021-01-04 18:45:43 +00:00
Laurent Cozic
b5fc206202 Plugins: Added joplin.workspace.selectedFolder() 2021-01-04 16:49:59 +00:00
Laurent Cozic
794fb6a122 Plugins: Fixes #4285: Allow API paths that contain 4 elements 2021-01-04 16:17:06 +00:00
Laurent Cozic
ec7cccf573 Doc: Fixed server doc 2021-01-04 16:16:09 +00:00
Laurent Cozic
e94a1cac1c Server release v1.6.4 2021-01-04 15:03:36 +00:00
Laurent Cozic
fb01c64133 Server: Added script to create release 2021-01-04 15:01:45 +00:00
Laurent Cozic
1dbeff1908 Tests: Fixed potential timing issue in tests
Might fix this: https://travis-ci.org/github/laurent22/joplin/jobs/752585346#L1352
2021-01-03 16:27:51 +00:00
Laurent Cozic
4f2d316db4 Doc: Fixed code block issue and cleaned up Download table 2021-01-03 15:55:47 +00:00
Laurent Cozic
ac8ddb1166 Plugin Generator release v1.6.2 2021-01-03 13:27:39 +00:00
Laurent Cozic
b61150457c Generator: Update homepage URL 2021-01-03 13:26:58 +00:00
Laurent Cozic
3e948146cd Generator: Resolves #4229: Add support for compiling content script 2021-01-03 13:21:48 +00:00
Roman Musin
8492a7ee26
Android: Fix images/resources long press - do not show menu on pinch zoom (#4275) 2021-01-03 11:23:17 +00:00
Laurent Cozic
0e57baf5b9 Desktop: Made editor padding more consistent and ensure it is present even when sidebars are gone 2021-01-02 17:27:37 +00:00
Laurent Cozic
05f65c326a Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-01-02 16:55:20 +00:00
Laurent Cozic
491714cde6 Desktop, Mobile: Fixed issue where file:// URLs would not be rendered correctly 2021-01-02 16:53:59 +00:00
Laurent Cozic
34c1096307 Plugins: Allow loading external JS or CSS from dialog 2021-01-02 16:21:32 +00:00
Roman Musin
ebe3ddcd21
Android: Resolves #4020: Enable Android Backup support again (#4277) 2021-01-02 15:31:54 +00:00
Daeraxa
ca5ac9696b
Desktop: Sort attachments in a case insensitive way in Attachments screen (#4273)
Update to add case insensitive sorting - https://discourse.joplinapp.org/t/a-feature-request/13486/5?u=daeraxa
2021-01-02 15:27:53 +00:00
Caleb John
fdfbb84d37
Desktop: Resolves #4257: Add extra macOS keys (#4259) 2021-01-02 15:12:29 +00:00
Jonathan Heard
740aba90ea
All: Resolves #3528: Upload Big Notes to Onedrive (#4120) 2021-01-02 15:09:33 +00:00
Laurent Cozic
eab9ff175c Tools: Added script to simplify iOS release 2021-01-02 14:56:47 +00:00
Laurent Cozic
5b295d5f6f Plugins: Add support for hiding and showing panels 2021-01-02 13:32:15 +00:00
Helmut K. C. Tessarek
0be8cdf760
Update translations 2021-01-01 21:00:35 -05:00
Po-chiang Chao
545940f545
All: Translation: Update zh_TW.po (#4278)
Include new strings and fuzzy translated strings
2021-01-01 19:18:52 -05:00
Laurent Cozic
f9fb1b8a81 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-01-01 13:04:30 +00:00
Laurent Cozic
56ded0062a All: Add more log info when a revision cannot be deleted due to still-encrypted itel 2021-01-01 13:04:15 +00:00
Laurent Cozic
83b29d7c51 macOS: Fixed paste as text in Rich Text editor 2021-01-01 12:38:17 +00:00
Arda Kılıçdağı
1ec0746263
All: Translation: Update tr_TR.po (#4274)
Hello,

You can find the updated Turkish translations in this pull request.

Also, happy new year! 🎉
2020-12-31 12:08:09 -05:00
Elaborendum
fde201fbe9
All: Translation: Update es_ES.po (#4260)
* Updated es_ES.po

* Reverting some changes

* Redid translation using current .po file
2020-12-31 00:59:25 -05:00
Laurent Cozic
694a1b4ede Merge branch 'dev' of github.com:laurent22/joplin into dev 2020-12-30 23:53:20 +00:00
Laurent Cozic
20d126b39d Server: Fixed access control on user list and clean up 2020-12-30 23:50:44 +00:00
Helmut K. C. Tessarek
8ca9c3092a
Clipper release v1.6.1 2020-12-30 14:50:47 -05:00
Laurent Cozic
d2771029a3 Server: Support for notifications and clean up 2020-12-30 18:35:18 +00:00
Laurent Cozic
4128c53fcf Update French translation 2020-12-30 13:07:41 +00:00
Laurent Cozic
a14410b28c Android release v1.6.4 2020-12-30 12:04:25 +00:00
Laurent Cozic
d1f8520e6e Mobile: Fixed package import issue 2020-12-30 11:51:43 +00:00
Laurent Cozic
d76746b8e4 Android release v1.6.3 2020-12-30 11:05:04 +00:00
Laurent Cozic
89d173b460 Mobile: Add support for Joplin Server 2020-12-30 10:54:00 +00:00
Laurent Cozic
81aba8b8b0 Server: Fixed pagination 2020-12-30 02:24:29 +00:00
Laurent Cozic
9e076bf194 Desktop release v1.5.14 2020-12-30 00:18:46 +00:00
Laurent Cozic
74a797b410 Desktop, Cli: Fixed importing ENEX files that contain hidden sections 2020-12-30 00:17:15 +00:00
Laurent Cozic
f48697572d Server: Fixed file count issue for PostgreSQL 2020-12-29 23:48:34 +00:00
Laurent Cozic
e61e8b7b94 Server: Fixed URLs 2020-12-29 23:22:57 +00:00
Laurent Cozic
1deab7e8d1 Android release v1.6.2 2020-12-29 19:42:30 +00:00
Laurent Cozic
86b28b5ecf Desktop release v1.6.1 2020-12-29 18:30:38 +00:00
Laurent Cozic
938e723434 Merge branch 'dev' of github.com:laurent22/joplin into dev 2020-12-29 18:07:02 +00:00
Laurent Cozic
ee2ec28cd4 Server: Add basic file manager 2020-12-29 18:04:57 +00:00
Helmut K. C. Tessarek
9dc505e85b
fix typo in source and all translations 2020-12-29 12:10:52 -05:00
Helmut K. C. Tessarek
3df31584af
update en_US.po 2020-12-29 11:50:31 -05:00
Zhang YANG
a7e3b381cb
All: Translation: Update zh_CN.po (#4263) 2020-12-29 11:23:33 -05:00
Laurent Cozic
70381a233b Merge branch 'release-1.5' into dev 2020-12-29 16:17:18 +00:00
Laurent Cozic
2966fe0df2 Desktop release v1.5.13 2020-12-29 16:14:27 +00:00
Laurent Cozic
143f0b4bc5 Desktop, Cli: Improve support for SVG images when importing ENEX files 2020-12-29 15:58:20 +00:00
Helmut K. C. Tessarek
24ec3b8897
Update translations (for new server code) 2020-12-28 15:17:17 -05:00
Beowulf2
01aa4f9d5e
All: Translation: Update de_DE.po (#4258) 2020-12-28 14:39:58 -05:00
Manuel Tassi
520efdcb39
All: Translation: Update it_IT.po (#4256)
* Update it_IT.po

* Update it_IT.po

* Update it_IT.po
2020-12-28 14:39:38 -05:00
Laurent Cozic
34a99f738c linter 2020-12-28 17:26:15 +00:00
Laurent Cozic
0e0de1207f Server: Adding basic file manager 2020-12-28 16:37:12 +00:00
Laurent Cozic
2fda067034 Server: Improved logging and error handling 2020-12-28 15:15:30 +00:00
Laurent Cozic
29177330b0 Merge branch 'release-1.5' into dev 2020-12-28 14:31:37 +00:00
Laurent Cozic
66a5490b54 Desktop release v1.5.12 2020-12-28 14:29:37 +00:00
Laurent Cozic
469cd19ec1 Desktop: Fix issue when importing ENEX file that contains invalid list elements 2020-12-28 14:29:02 +00:00
Laurent
41684a64ef
Server: Add Joplin Server package (#1872) 2020-12-28 11:48:47 +00:00
Laurent Cozic
2cd7839552 Increase version num to 1.6 2020-12-27 22:46:27 +00:00
Laurent Cozic
0f59731c06 Plugin Generator release v1.5.3 2020-12-27 22:28:16 +00:00
Laurent Cozic
d0f1a67d96 Plugins: Updated types 2020-12-27 22:26:17 +00:00
Laurent Cozic
2a1434f987 Generator: Fixed publish logic 2020-12-27 22:25:17 +00:00
Laurent Cozic
1ee177880d Plugin Generator release v1.5.2 2020-12-27 22:23:18 +00:00
Laurent Cozic
f6d899eb29 Generator: Fixed publish script 2020-12-27 22:22:29 +00:00
Laurent Cozic
325a5ab08f ios-v10.5.1 2020-12-27 19:47:44 +00:00
Laurent Cozic
c158878b66 Desktop release v1.5.11 2020-12-27 19:19:13 +00:00
Laurent Cozic
0f0f9c1161 macOS: Update app icon 2020-12-26 13:49:00 +00:00
Laurent Cozic
79612163b2 Android release v1.5.1 2020-12-26 00:57:31 +00:00
Laurent Cozic
fab5ed165c CLI v1.5.1 2020-12-26 00:48:02 +00:00
Laurent Cozic
4897c763bd Releasing sub-packages 2020-12-26 00:45:11 +00:00
Laurent Cozic
17b9867bf2 Desktop release v1.5.10 2020-12-26 00:17:15 +00:00
Laurent Cozic
b8f14d50f5 Desktop, Cli: Add table captions when importing ENEX files 2020-12-25 17:44:51 +00:00
Laurent Cozic
9e2f60523f Desktop, Cli: Fixed issues when importing hidden tables within hidden sections in Enex files 2020-12-25 16:37:05 +00:00
Laurent Cozic
321ff4fced Merge branch 'dev' of https://github.com/laurent22/joplin into dev 2020-12-24 12:25:19 +00:00
Laurent Cozic
2a31f914bb Desktop: Update macOS icon for macOS Big Sur 2020-12-24 12:24:40 +00:00
Manuel Tassi
0b71c33d09
All: Translation: Update it_IT.po (#4247) 2020-12-23 21:39:26 -05:00
Laurent Cozic
502c812d9c Chore: remove debug code 2020-12-23 23:46:36 +00:00
Laurent Cozic
5dc3baa50c Desktop: Removed warning for Markdown editor spell checking 2020-12-23 23:19:35 +00:00
Laurent Cozic
a9af58146b Desktop: Fixes #4201: Fixed context menu when the UI is zoomed in or out 2020-12-23 23:17:12 +00:00
Laurent Cozic
17edebb6b1 Desktop: Fixes #4243: Prevent double paste when using Shift+Ctrl+V 2020-12-23 20:03:38 +00:00
Laurent Cozic
bb2855bd80 Desktop, Mobile: Display Katex parsing errors 2020-12-23 19:46:21 +00:00
Laurent Cozic
6cae8a7d20 Desktop release v1.5.9 2020-12-23 17:26:45 +00:00
Laurent Cozic
5826a8d373 Desktop, Cli: Improved error handling when importing ENEX files 2020-12-23 17:25:26 +00:00
Caleb John
18c5404cbc
Dedktop: Fix typo when passing generic editor commands to the editor (#4240) 2020-12-21 10:32:42 +00:00
Laurent Cozic
f16fd6462b Desktop release v1.5.8 2020-12-20 07:59:01 +00:00
Laurent Cozic
67c2998b9d Merge branch 'dev' of github.com:laurent22/joplin into dev 2020-12-20 07:58:25 +00:00
Laurent Cozic
db4f6e9ce5 Chore: Fixed mobile build 2020-12-20 07:52:28 +00:00
Caleb John
0a2364f917
Desktop: Fix End key behavior with Codemirror spellcheck (#4215)
* Manually fudge the codemirror cursor handling when in contenteditable mode
2020-12-19 18:04:02 -07:00
Laurent Cozic
1aebcbb27c Merge branch 'dev' of github.com:laurent22/joplin into dev 2020-12-19 22:17:48 +00:00
Caleb John
2529da5b09
Desktop: Fixes #4130: Register Markdown editor commands with the Keyboard Shortcut editor (#4136) 2020-12-19 17:57:41 +00:00
Laurent Cozic
d1a7d31335 Desktop: Use plugins whenever printing or exporting notes
Ref: https://discourse.joplinapp.org/t/external-css-per-note-is-being-ignored/13016/6
2020-12-19 17:42:18 +00:00
Laurent Cozic
b8493baa5e Desktop, Cli: Fixed import of ENEX files that contain invisible sections
Ref: https://discourse.joplinapp.org/t/code-block-imports-from-evernote/13113/4
2020-12-19 16:18:07 +00:00
Laurent Cozic
f53a7d3a8a Desktop, Cli: Fixed importing certain code blocks from ENEX
Ref: https://discourse.joplinapp.org/t/13113
2020-12-19 15:37:42 +00:00
Laurent Cozic
33c5037816 Desktop, Cli: Fixed importing ENEX files that contain resources with invalid mime type 2020-12-18 23:56:38 +00:00
Laurent Cozic
38b0702314 Android: Disable long press on images as it interferes with zoom in and out 2020-12-18 13:37:36 +00:00
Laurent Cozic
693f59d07a Tools: Fixed OneDrive test units 2020-12-16 11:19:35 +00:00
Laurent Cozic
59e2e65de0 Tools: Fixed auth for OneDrive test units 2020-12-16 01:00:53 +00:00
Laurent Cozic
4180d4bd28 Tools: Allow publishing all lib packages to @joplin 2020-12-14 14:55:31 +00:00
Laurent Cozic
e351564bec Fixed tests 2020-12-11 16:03:55 +00:00
Laurent Cozic
9f8e6a3060 Plugins: Add support for context menu items on notebooks and tags 2020-12-11 13:28:59 +00:00
Laurent Cozic
a1c08adb3e Merge branch 'dev' of github.com:laurent22/joplin into dev 2020-12-11 12:42:58 +00:00
Laurent Cozic
5cd9114334 Chore: access modifiers on classes 2020-12-11 12:29:21 +00:00
Laurent Cozic
65cc6853bd Plugins: Added a way to execute commands from Markdown-it content scripts 2020-12-11 12:00:24 +00:00
Danil Tolkachev
dca51cc7de
All: Translation: Update ru_RU.po (#4212) 2020-12-10 14:28:30 -05:00
Laurent Cozic
bc76e4a918 Plugins: Fixed disabling plugin files that start with "_" 2020-12-10 16:45:00 +00:00
Laurent Cozic
3ed0083e94 Plugins: Add support for content script asset files, for Markdown-it plugins 2020-12-10 16:09:31 +00:00
Laurent Cozic
5cafc8cea5 Chore: Fixed a few links that were broken after Lerna upgrade 2020-12-10 15:13:29 +00:00
Laurent Cozic
ff5e8ee7aa Chore: Fixed a few links that were broken after Lerna upgrade 2020-12-10 15:04:54 +00:00
Laurent Cozic
f1bbcea64b Desktop release v1.5.7 2020-12-10 10:07:40 +00:00
Laurent Cozic
8e874891c0 Tools: Fixed desktop dist script 2020-12-10 10:07:29 +00:00
Laurent Cozic
546ee354dd Desktop release v1.5.6 2020-12-09 22:33:43 +00:00
Laurent Cozic
afebce145f Doc: Fixed formatting 2020-12-09 22:04:10 +00:00
Laurent Cozic
7543d43428 Desktop release v1.5.5 2020-12-09 21:53:43 +00:00
Laurent
5737560e19
Desktop, Mobile: Restrict auto-detection of links, and added option to toggle linkify (#4205) 2020-12-09 21:52:52 +00:00
Helmut K. C. Tessarek
a278c2c32a
Desktop, Mobile: Update Mermaid: 8.8.1 -> 8.8.4 (#4193)
```
Release Notes 8.8.4

    Re-align gantt chart dateFormat table with spaces (#1764) @AloisMahdal
    Docs/update edit this page (#1774) @sy-records
    Fixed typo in the docs (#1780) @manicki
    Move babel-eslint to devDependencies (#1772) @glensc
    Add Doscy to list of integrations (#1784) @gwatts
    Changed regex for multi-line state notes (#1773) @tomatoman25
    Add different id generators (#1787) @julianbei
    Bump highlight.js from 9.18.1 to 9.18.5 (#1789) @dependabot
    Fixed markdown error in Relationship Syntax (#1796) @kciter
    remove classDiagram duplicate options (#1786) @JiChao99
    Update copyright years (#1805) @BastianZim

🐛 Bug Fixes

    Add sans-serif to default font settings (#1776) @GDFaber
    ignore build files in dist folder (#1777) @GDFaber
    Narrow down console logging when flowchart subgraphs are added (#1782) @GDFaber
    Apply style settings to subgraphs in "flowchart" diagrams (#1781) @GDFaber

Release Notes 8.8.3

    Fix styling of links for new beta flowchart (#1730) @knsv
    Fix typo in pie.md (#1705) @hwine
    Fixing broken links and misspellings (#1727) @deining
    Fixed empty code examples (#1729) @Eraledm
    README: use stateDiagram-v2 (#1728) @alexislefebvre
    #1724 Adding fontawesome to edge labels (#1731) @knsv
    Fix broken links in gantt.md (#1703) @wontonst
    Replace fregante/setup-git-token with setup-git-user (#1735) @fregante
    Updated docs (#1739) @BastianZim
    1740 nested subgraps directions (#1741) @knsv
    Switching to Docsify and adding search (#1746) @NeilCuzon
    Fixed bad tertiary operator (#1743) @lishid
    fix broken links in README (#1749) @levlas

Release Notes 8.8.2

    1704 Revert to original behavior of nodes and subgraphs (#1709) @knsv

    There is some ambiguity about what subgraph a node belongs to when it appears in several subgraphs. Should it stick to the first subgraph it appears in, or should the last subgraph it gets added to be the one it belongs to. With this change the original behavior is retained.
```
2020-12-09 21:44:38 +00:00
Laurent Cozic
13dbeb4b36 Desktop: Add support for media players (video, audio and PDF) 2020-12-09 21:30:51 +00:00
Gen Neko
a3f8b9027c
All: Translation: Update ja_JP.po (#4206) 2020-12-09 11:36:07 -05:00
Laurent Cozic
f436967779 Chore: Fixed dev dependencies 2020-12-09 16:15:13 +00:00
Laurent Cozic
f37224fc42 Desktop: Added doc about Rich Text editor and added way to dismiss warning banner 2020-12-09 15:58:15 +00:00
Laurent Cozic
a737a21185 Tools: Fixed another race condition in test units 2020-12-09 15:06:22 +00:00
Laurent Cozic
234c05a966 Desktop: Rich Text: Do not converts to markdown links URLs that would be linkified 2020-12-09 14:58:38 +00:00
Roman Musin
92b4795410
All: Fixed #4025: Fixed issue when searching for text that contains diacritic (#4152) 2020-12-09 13:02:54 +00:00
Laurent Cozic
3e21e9a334 Tests: Increased 'slow threshold' to 20 seconds, because we use Jest for integration testing too 2020-12-09 12:57:25 +00:00
Laurent Cozic
dc3e9178ef Desktop: Fixed issue with attachment paths being invalid when user has spaces in home directory path. Also fixed race condition in test units that could make them randomly fail. 2020-12-09 12:53:47 +00:00
Laurent Cozic
46ed1304f2 Desktop: Improved warning banner colors 2020-12-08 23:44:54 +00:00
Laurent Cozic
01cf0de974 Desktop: Fixed title input field width on small windows 2020-12-08 23:27:11 +00:00
Laurent Cozic
f21199a7f3 Chore: Convert test-utils to TypeScript 2020-12-08 20:01:33 +00:00
Laurent Cozic
cdf2873883 Plugins: Commands would not show up in keymap editor when no shortcut was associated with them
Ref: https://discourse.joplinapp.org/t/plugin-note-tabs/12752/39
2020-12-08 19:45:08 +00:00
Laurent Cozic
0390928fea Merge branch 'dev' of github.com:laurent22/joplin into dev 2020-12-08 19:04:03 +00:00
Laurent Cozic
efb3546675 Plugins: Add support for workspace.onSyncStart event 2020-12-08 19:03:22 +00:00
Ji-Hyeon Gim
169841dcc4
All: Translation: Update ko.po (#4200)
It updates fuzzy translations for Korean.

Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>
2020-12-07 11:49:22 -05:00
Helmut K. C. Tessarek
b780261153
Chore: moving the keycode map to a separate file (#4192)
/ref https://github.com/laurent22/joplin/pull/4022#issuecomment-726263640
2020-12-06 15:01:30 +00:00
Zhang YANG
c906354510
All: Translation: Update zh_CN (#4195) 2020-12-05 20:44:02 -05:00
Helmut K. C. Tessarek
6487fde09d
update: en_US.po 2020-12-05 19:33:58 -05:00
Helmut K. C. Tessarek
50f046ffc4
Update translations 2020-12-05 16:36:47 -05:00
Helmut K. C. Tessarek
ded14ff8db
move fi_FI.po to the correct path 2020-12-05 16:34:37 -05:00
Laurent Cozic
64bbd93f54 Tools: Skip electronRebuild in postinstall to make boostrap faster, but add it to dist script 2020-12-05 12:40:14 +00:00
Laurent Cozic
9a30b69610 Doc: Added comment about stapling macOS app 2020-12-05 12:18:31 +00:00
Laurent Cozic
046433a947 Tools: Fixed issue with gettext not knowing how to parse regex that includes backtick 2020-12-05 11:54:58 +00:00
Laurent Cozic
42232fac84 Desktop release v1.5.4 2020-12-05 11:06:54 +00:00
Laurent Cozic
245976f659 Chore: trying to fix notarization 2020-12-05 11:06:20 +00:00
Laurent Cozic
8d90cc234f Clipper: Fixes #4105: Handle certain types of code block 2020-12-02 15:43:44 +00:00
Manuel Tassi
5183767e43
Update it_IT.po (#4169) 2020-12-02 10:47:42 +00:00
Alexander Fischer
ceb625dbeb
updated german translations (#4168) 2020-12-02 10:47:11 +00:00
Caleb John
92fe5e2362
Desktop: Fixes #4036: Focus editor after pressing toolbar buttons (#4037) 2020-12-02 10:36:00 +00:00
Laurent Cozic
717b8da1f8 Tools: Cleaned up tests and splitted sync tests into smaller parts 2020-12-01 18:05:24 +00:00
Laurent Cozic
05e9000087 Plugins: Improved note change event handling. Also added tests and improved debugging plugins. 2020-12-01 14:08:41 +00:00
Laurent Cozic
eed3dc8617 Merge branch 'release-1.4' into dev 2020-12-01 11:29:07 +00:00