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

1508 Commits

Author SHA1 Message Date
Helmut K. C. Tessarek
74c3d2c9fb
Update translations 2024-06-07 14:27:47 -04:00
renovate[bot]
3a780b9490
Update dependency @types/node to v18.19.22 (#10543)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-06 11:44:32 +00:00
Henry Heino
06f42e8246
Mobile: Implement plugin screen redesign (#10465) 2024-06-04 09:57:52 +01:00
Henry Heino
ac7165461a
Chore: AsyncActionQueue: Support changing which tasks can be skipped (#10506) 2024-06-04 09:54:06 +01:00
Henry Heino
0938dc9d52
Desktop: Fix importing completed tasks (#10528) 2024-06-04 09:52:34 +01:00
Henry Heino
96850b7b98
Chore: Migrate mime-utils.js to TypeScript (#10536) 2024-06-04 09:50:18 +01:00
Henry Heino
f938d5f489
Chore: Markdown + fontmatter import and export: Extract frontMatter logic into a separate file (#10508)
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
2024-05-30 08:40:52 +01:00
Henry Heino
99b840da34
Desktop: Fixes #10284: Sort the note list soon after changing a note's title (#10512) 2024-05-30 08:40:32 +01:00
Henry Heino
789d19b18c
Chore: Remove unused NoteTypeToggle event (#10521) 2024-05-30 08:31:54 +01:00
renovate[bot]
59b26f2c63
Update dependency @types/node to v18.19.21 (#10517)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-05-30 02:48:06 +00:00
renovate[bot]
f1eeeabdc5
Update dependency @types/node to v18.19.20 (#10513)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-05-29 02:58:46 +00:00
Henry Heino
4e3326b12f
Desktop: Fixes #10230: Fix new note and to-do buttons greyed when initial selection is "all notes" or a tag (#10434) 2024-05-28 13:43:33 +01:00
Henry Heino
34092d8491
Desktop: Fixes #10381: Fix plugin settings stored in settings.json are lost on startup (#10458) 2024-05-28 13:42:52 +01:00
Henry Heino
b8caf08fac
Desktop: Re-render note when resources are changed (#10459) 2024-05-28 11:30:56 +01:00
Henry Heino
97274c95a5
Chore: Strengthen eventManager types (#10505) 2024-05-28 11:24:20 +01:00
renovate[bot]
300d0e3ca5
Update dependency @types/node to v18.19.19 (#10509)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-05-28 11:13:24 +01:00
renovate[bot]
111385f1ef
Update dependency tesseract.js to v5.0.5 (#10490)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-05-27 08:57:21 +01:00
renovate[bot]
f36d395a84
Update react monorepo (#10491)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-05-27 08:56:49 +01:00
renovate[bot]
554894e910
Update dependency @types/node to v18.19.18 (#10467)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-05-24 19:03:14 +00:00
Laurent Cozic
8445ffaa86 Merge branch 'release-2.14' into dev 2024-05-21 10:10:29 +01:00
Henry Heino
9fcaf5bd18
Desktop: Disable eval in pdf.js (#10450) 2024-05-21 10:00:17 +01:00
Henry Heino
652add9af2
Chore: Desktop: Fix eslint issues and strengthen types in NoteEditor.tsx (#10449) 2024-05-21 01:28:19 +01:00
pedr
1040675781
Chore: Improve logs to help debugging (#10432) 2024-05-17 09:42:16 +01:00
renovate[bot]
8faf5148a6
Update dependency @types/node to v18.19.17 (#10435)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-05-16 11:58:31 +01:00
Henry Heino
27c5dd1852
Mobile: Fixes #10409: Fix accepting encrypted shared notebooks (#10429) 2024-05-16 09:54:24 +01:00
Laurent Cozic
f39021d373 Chore: Make API note.source optional 2024-05-12 11:14:11 +01:00
Henry Heino
09d088b2b5
Mobile,Desktop: Fix nonbreaking spaces and CRLF break search for adjacent words (#10417) 2024-05-12 10:01:12 +01:00
Henry Heino
3312bd27c9
Mobile: Simplify Dropbox sync workarond (#10415) 2024-05-12 10:01:02 +01:00
Laurent Cozic
6b0e1598ed Chore: Fixed types 2024-05-11 19:45:42 +01:00
Laurent Cozic
a747828276 Api: Add support for note.source property 2024-05-11 16:21:07 +01:00
renovate[bot]
487f01d2ec
Update dependency @types/node to v18.19.15 (#10421)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-05-11 09:34:40 +01:00
Laurent Cozic
a9fecb31c3 iOS 12.14.8 2024-05-08 14:57:03 +01:00
Henry Heino
3042e615ac
iOS: Fixes #10396: Fix Dropbox sync for large file collections (#10411) 2024-05-08 14:25:06 +01:00
Henry Heino
5245c06ed3 Mobile: Fixes #10396: Fix Dropbox sync (#10400) 2024-05-07 22:38:45 +01:00
Henry Heino
90ec1f5bc6
Chore: Fix failing Dropbox sync test (#10408) 2024-05-07 17:29:23 +01:00
Henry Heino
d6480e50d2
Mobile: Fixes #10396: Fix Dropbox sync (#10400) 2024-05-07 16:49:39 +01:00
Psy-Q
95b73b5f41
Doc: Fix plural of parenthesis (#10405) 2024-05-07 10:59:06 +01:00
LightTreasure
548ba7d712
Desktop: Resolves #1752: Added capability to toggle visibility of the Menu Bar from the View menu (#10324) 2024-05-07 10:57:02 +01:00
Laurent Cozic
57c316a591 Api: Exclude deleted and conflicted notes when calling /notes 2024-05-03 16:14:04 +01:00
Laurent Cozic
f1691b7743 Update translations 2024-05-02 23:12:06 +01:00
Henry Heino
d5fa8d0216
Mobile: Fix plugins aren't visible after switching to a new profile (#10386) 2024-05-02 17:05:25 +01:00
renovate[bot]
1f74a42dfa
Update dependency @types/node to v18.19.14 (#10393)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-05-02 17:05:07 +01:00
Henry Heino
569b567f21
Desktop: Fixes #10382: Fix default values for plugin settings stored in settings.json not applied (#10383) 2024-05-02 15:00:12 +01:00
Henry Heino
85f890e7c5
Mobile: Plugins: Make panel opening/closing more consistent with desktop (#10385) 2024-05-02 14:59:50 +01:00
Henry Heino
4056fc2281
Mobile: Plugins: Show information page before enabling plugin support (#10348) 2024-05-02 14:58:29 +01:00
renovate[bot]
70c2f0a70a
Update dependency @types/node to v18.19.12 (#10390)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-05-02 14:57:57 +01:00
renovate[bot]
a0dd7f58ac
Update dependency @types/node to v18.19.11 (#10387)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-30 17:56:48 +00:00
Laurent Cozic
443e04b369 Doc: Fixed share notebook link 2024-04-27 21:20:59 +01:00
Laurent Cozic
431ce430a0 Chore: Fixed sorting logic for search API 2024-04-27 12:11:40 +01:00
Henry Heino
5cdc1e93b3
Mobile: Fix quickly enabling/disabling multiple plugins can lead to errors and missing plugins (#10380) 2024-04-27 11:45:39 +01:00
Henry Heino
03617eb8a7
Mobile: Resolves #10360: Make most plugins default to being desktop-only (#10376) 2024-04-27 11:43:25 +01:00
Laurent Cozic
034e568d26 Desktop: Resolves #10334: Support URLs in plugin API imaging.createFromPath 2024-04-27 11:35:49 +01:00
Laurent Cozic
a5f118bc26 All: Fixes #10189: After deleting the last note from the conflicts folder, the application state is invalid 2024-04-27 09:54:47 +01:00
Laurent Cozic
10978781cd Desktop: Fixes #10088: Search results from API change when fields param is used 2024-04-27 09:23:09 +01:00
Laurent Cozic
8bdec4c2b4 Desktop: Add context menu item to view OCR text of an attachment 2024-04-27 08:46:48 +01:00
Laurent Cozic
be58fced93 Desktop: Fixes #10056: Fixed error when processing certain PDF files for OCR 2024-04-27 08:45:52 +01:00
Henry Heino
97b5276f81
Desktop: Resolves #4251: Refactor sidebar to better handle thousands of tags and notebooks (#10331) 2024-04-25 15:31:18 +01:00
renovate[bot]
c6c7de286a
Update dependency @types/node to v18.19.10 (#10373)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-25 13:07:53 +00:00
Henry Heino
aec77b543c
Mobile: Plugin support: Simplify reporting plugin issues (#10319) 2024-04-25 14:02:10 +01:00
Henry Heino
34b265475d
Mobile: Support copying app information (#10336) 2024-04-25 13:53:46 +01:00
pedr
4e95486c5c
Clipper: Fix process stopping because one resource can't be created (#10337) 2024-04-25 13:53:34 +01:00
Henry Heino
65c47189f9
Mobile,Desktop: Fixes #10191: Do not invite user to create new notes in the trash folder (#10356) 2024-04-25 13:34:32 +01:00
Henry Heino
0670ad92d7
Chore: Add no-throw-literal and prefer-promise-reject-errors eslint rules (#10371) 2024-04-25 13:32:37 +01:00
Henry Heino
83b50aaa8e
Chore: Migrate file system sync to TypeScript (#10361) 2024-04-25 13:31:48 +01:00
renovate[bot]
4978a473a1
Update dependency @adobe/css-tools to v4.3.3 (#10364)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-24 10:47:19 +00:00
renovate[bot]
15770e9298
Update dependency @types/node to v18.19.9 (#10358)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-23 15:42:57 +00:00
Henry Heino
b69bf84ab6
Desktop: Fixes #10345: Linux: Allow passing --enable-wayland-ime flag to fix input method issues on startup (#10349) 2024-04-22 18:28:26 +01:00
Abdelrrahman Elhaddad
7ec02fc8d8
Desktop: Added search list for configuration font input fields (#10248) 2024-04-20 14:23:07 +01:00
wljince007
294cc4a440
Desktop: Fixes #5626: When web clipper clipping code blocks, keep code in multiline and delete code number lines (#10126)
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
Co-authored-by: Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com>
2024-04-20 13:48:44 +01:00
CoolCu
1d31f63947
Doc: remove repetitive words (#10317)
Signed-off-by: CoolCu <coolcui@qq.com>
2024-04-17 11:55:33 +01:00
Henry Heino
b638056150
Mobile: Support description banners on plugin-registered settings screens (#10286) 2024-04-15 18:18:22 +01:00
Henry Heino
ff86c253d3
Mobile: Support accepting Joplin Cloud shares (#10300) 2024-04-15 18:17:34 +01:00
Henry Heino
385fe7bbe0
Desktop: Fixes #10067: Fix dragging notebooks to the toplevel notebook (#10302) 2024-04-15 18:15:45 +01:00
Henry Heino
8393ccc7f8
Chore: Desktop: Use stronger types in Sidebar.tsx (#10305) 2024-04-15 18:15:18 +01:00
Henry Heino
87f7fb6841
Mobile: Fixes #10313: Fix error on retry or ignore attachment too large error (#10314) 2024-04-15 18:13:41 +01:00
Henry Heino
c0c3b4d23e
Mobile: Plugins: Fix event listener memory leak when disabling/uninstalling plugins (#10280)
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
2024-04-11 09:04:47 +01:00
Henry Heino
346f49fa66
Chore: Improve types for mobile and desktop themeStyle (#10297) 2024-04-11 08:35:20 +01:00
pedr
859d3e867e
Desktop, Mobile: Fixes #10292: Email to note address not presented in configuration screen before synchronisation (#10293) 2024-04-10 11:37:00 +01:00
Henry Heino
2ae08ff46e
Mobile: Support importing from JEX files (#10269) 2024-04-08 17:57:01 +01:00
Henry Heino
03c3feef16
Mobile: Resolves #10245: Allow marking items as "ignored" in sync status (#10261) 2024-04-08 12:35:57 +01:00
Laurent Cozic
1179de7c36 Destkop, Cli, Mobile: Resolves #6173: Do not repeat failed requests with ENOTFOUND error 2024-04-07 11:29:30 +01:00
Henry Heino
58ca1a938b
Chore: Refactor EventManager to use stronger types (#10272) 2024-04-06 18:08:16 +01:00
Laurent Cozic
2e2a2b3193 Tools: Implement @typescript-eslint/no-explicit-any rule 2024-04-05 12:16:49 +01:00
Laurent Cozic
42900bcc66 Desktop: Fixed sorting labels 2024-04-05 10:41:14 +01:00
Laurent Cozic
ce451c5850 Desktop: Resolves #5819: Allow sorting by due date and completion date in detailed note list 2024-04-05 10:34:05 +01:00
Laurent Cozic
5b4477f7bd Desktop: Fixed rendering of alarm time in detailed note list 2024-04-05 10:32:52 +01:00
cagnusmarlsen
6f76fe728f
Desktop: Fixes #10182: Detailed note list doesn't follow preferred date and time formats (#10204) 2024-04-04 11:38:38 +01:00
Henry Heino
8dc75efc4c
Desktop: Security: Make attachment and file links safer (#10250) 2024-04-03 18:57:52 +01:00
Henry Heino
f899c97c4c
Mobile,Desktop: Resolves #10206: Allow marking a plugin as mobile-only or desktop-only (#10229) 2024-04-03 18:51:09 +01:00
pedr
1e6cc11868
Desktop, Mobile, Cli: Avoid unnecessary requests if Joplin Cloud credentials are empty (#10256) 2024-04-03 15:43:22 +01:00
Laurent Cozic
b622f9b938 Chore: Fixed naming 2024-04-01 16:47:50 +01:00
Laurent Cozic
00084c5798 Desktop, Mobile: Improve focus handling 2024-04-01 15:34:22 +01:00
Laurent Cozic
04a6c36b5c Chore: Fixed populateDatabase tool 2024-04-01 13:44:07 +01:00
Henry Heino
bdb2e588f3
iOS: Resolves #10154: Allow installing recommended plugins (#10223) 2024-03-29 12:40:54 +00:00
Henry Heino
688d807eee
Mobile: Fixes #10188: Fix "new note" button is shown in the trash notebook (#10227) 2024-03-29 12:11:15 +00:00
Henry Heino
06aa64016f
Desktop: Resolves #9794: Plugin API: Add support for loading PDFs with the imaging API (#10177) 2024-03-27 18:53:24 +00:00
Mohamad Ashraf
7f34afcaea
Desktop: Fixes#10196: Added hover effect to detailed renderer (#10213) 2024-03-26 14:05:40 +00:00
Henry Heino
c4aa18a63e
Doc: Mark several desktop-only plugin API features as "desktop-only" (#10208) 2024-03-26 11:36:15 +00:00
Laurent Cozic
f85db1496e Desktop: Fixed error when exporting certain notes that contain plugin content 2024-03-25 12:52:06 +00:00
Henry Heino
a5419e61d5
Doc: Plugin API: Document how to add support for the Rich Text Editor to a renderer plugin (#10178) 2024-03-23 14:41:17 +00:00
Henry Heino
ec4d4141ef
Doc: Plugin API: Update editor content script documentation to include information about the mobile and beta editors (#10179) 2024-03-23 14:40:14 +00:00
Henry Heino
0c6df3dd73
Mobile: Fixes #10170, #8779: Fix shared data lost if Joplin is closed immediately after receiving a share (#10171) 2024-03-21 10:45:54 +00:00
Joplin Bot
55d72a8f68 Doc: Auto-update documentation
Auto-updated using release-website.sh
2024-03-20 12:20:52 +00:00
cagnusmarlsen
e9ebd845b9
Desktop: Fixes #10077: Special characters in notebooks and tags are not sorted alphabetically (#10085)
Co-authored-by: Martin Dörfelt <martin.d@andix.de>
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
2024-03-20 11:17:46 +00:00
pedr
ea29cf4e13
Clipper, Desktop: Prevent race condition when download limit is reached (#10124) 2024-03-20 11:11:57 +00:00
Siddhant Paritosh Rao
32141d4e23
Mobile: Fixes #10143: Shows only the real folders in the dropdown of parent folders. (#10147) 2024-03-20 10:53:36 +00:00
Henry Heino
7d068cfb87
Android: Allow debugging plugins (#10156) 2024-03-20 10:52:58 +00:00
Laurent Cozic
56b010ba0e Merge branch 'release-2.14' into dev 2024-03-18 16:03:58 +00:00
Laurent Cozic
40db753417 Deskop, Cli: Fixes #10125: ENEX does not import correctly when title of note matches the name of the attachment 2024-03-18 16:00:39 +00:00
Laurent Cozic
3d2c100fe9 Desktop: Fixes #10097: Fix OCR not working for certain languages 2024-03-18 12:16:17 +00:00
Laurent Cozic
fd4d7ead43 Merge branch 'release-2.14' into dev 2024-03-18 10:17:39 +00:00
Henry Heino
b3ec92a57e
Mobile: Add support for plugin panels and dialogs (#10121) 2024-03-14 19:04:32 +00:00
Henry Heino
a53a8d67a1
Mobile: Fix plugin API memory leak (#10115) 2024-03-14 18:42:13 +00:00
Henry Heino
49cd17e520
Chore: Allow disabling deletion logging (#10105) 2024-03-14 18:34:11 +00:00
Henry Heino
c16ce1c434
Desktop,Mobile: Resolves #10073, #10080: Fix conflicts notebook doesn't work with the trash feature (#10104) 2024-03-14 18:30:49 +00:00
Laurent Cozic
8eea3953f3 Update translations 2024-03-14 09:52:40 +00:00
Laurent Cozic
bc7a0fa095 Chore: Disable OCR language file caching on dev to fix bug 2024-03-12 17:40:53 +00:00
Laurent Cozic
298549e51a Update dictionary 2024-03-12 17:35:50 +00:00
Siddhant Paritosh Rao
da393f6c34
Mobile: Fixes #10065: New note button crashes app when there are no notebooks (#10087) 2024-03-11 15:22:26 +00:00
Henry Heino
55cafb8891
Android: Add support for Markdown editor plugins (#10086)
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
2024-03-11 15:02:15 +00:00
pedr
9e0a0468b2
Chore: Make resource creation from files faster by executing them in parallel (#9952) 2024-03-11 09:39:57 +00:00
Henry Heino
25cd5affca
Chore: Apply changes from mobile plugins to lib/ and app-desktop/ (#10079) 2024-03-09 11:03:57 +00:00
pedr
17a8ce5010
Api: Add capability of limiting downloads (#9788) 2024-03-09 10:45:21 +00:00
pedr
4d8fcff6d5
Desktop: Change Joplin Cloud login process to allow MFA via browser (#9445)
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
2024-03-09 10:35:54 +00:00
Henry Heino
75cb639ed2
Cli,Desktop,Mobile: Resolves #9465: Log user actions (deletions) (#9585) 2024-03-09 10:33:05 +00:00
Henry Heino
9d17ab429d
Chore: Mobile: Update fsDriver in preparation for mobile plugins (#10066) 2024-03-06 10:03:11 +00:00
cagnusmarlsen
5e4c35a18f
Desktop: Fixes #9960: Creating a profile changes the language of Joplin (#10038) 2024-03-05 18:09:23 +00:00
NightKnight
9a6484c488
Tools: Fix packages\lib\fsDriver.test.ts test file on Windows (#10053) 2024-03-05 18:08:47 +00:00
Laurent Cozic
a1cea6776f Desktop: Fixes #10058: OCR does not start when German language is selected 2024-03-05 16:36:27 +00:00
Laurent Cozic
d9a16b5c0f Desktop: Fixes #10050: Fixed OCR memory leak when processing PDF documents 2024-03-05 11:42:54 +00:00
Mr-Kanister
6494b74d0c
Desktop: Fixes #9453: Improve visibility of selected note in OLED dark theme (#10026) 2024-03-02 16:04:38 +00:00
Henry Heino
4c6969b17d
Chore: Plugin API: Rename CodeMirrorContentScriptModule to MarkdownEditorContentScriptModule (#10015) 2024-03-02 15:57:40 +00:00
Sagnik Mandal
9a2a251eec
Desktop: Fixes #9985: Filter Sync Target Info Logs (#10014) 2024-03-02 15:57:29 +00:00
Henry Heino
4827d0bf92
Desktop: Fixes #9982: Show focus indicator when navigating with keyboard (#9989) 2024-03-02 15:54:16 +00:00
Henry Heino
fa83d48141
Chore: Plugin generator: Update types (#10010) 2024-03-02 15:53:10 +00:00
pedr
ff1f1b190e
Desktop: Fixes #9264: Preserve indentation from plain text when pasting on Rich Text Editor (#9828) 2024-03-02 15:43:38 +00:00
Laurent Cozic
53d5cf55bc
Desktop: Add support for multiple columns note list (#9924) 2024-03-02 15:29:18 +00:00
Laurent Cozic
f19b1c5364
All: Resolves #483: Add trash folder (#9671) 2024-03-02 14:25:27 +00:00
Laurent Cozic
cb540a5abb Chore: Setup new release 3.0 2024-03-02 11:04:23 +00:00
Laurent Cozic
5aba5e544d Releasing sub-packages 2024-03-01 19:06:13 +00:00
Laurent Cozic
8bd6132398 Update translations 2024-03-01 18:04:19 +00:00
Najam Ul Saqib
b4cc6803e7
Doc: Fix a minor issue in comment (#10011) 2024-02-27 10:17:55 +00:00
Laurent Cozic
e5a643e796 Desktop, Mobile: Fixes #9996: Sort notebooks in a case-insensitive way 2024-02-26 19:27:29 +00:00
Laurent Cozic
28fd9c3039
Tools: Spellcheck Markdown documents (#10004) 2024-02-26 16:53:48 +00:00
Laurent Cozic
0b63ba1a28 Update translations 2024-02-26 10:23:31 +00:00
Laurent Cozic
47f95cb294
Chore: Implement cSpell to detect spelling mistakes in codebase (#10001)
Co-authored-by: Helmut K. C. Tessarek <tessarek@evermeet.cx>
Co-authored-by: Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com>
2024-02-26 10:16:23 +00:00
Henry Heino
fbeaf31a14
Desktop: Plugins: Allow commands registered within the beta markdown editor to take arguments (#9963) 2024-02-22 21:30:48 +00:00
Henry Heino
e5e191110c
Desktop: Resolves #9857: Back up to a subdirectory of the home directory by default (#9942) 2024-02-22 21:30:21 +00:00
Henry Heino
836e23c082
Desktop: Security: Disallow UNC file links (#9979) 2024-02-22 21:29:16 +00:00
Henry Heino
f1a833ef21
Desktop: Resolves #9964: Beta editor plugins: Allow fixing conflicts between plugins that add autocompletions (#9965) 2024-02-22 15:36:27 +00:00