self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-27 10:32:58 +02:00
Code Issues Releases Activity
10,364 Commits 244 Branches 1,267 Tags 543 MiB
97248035b1
Commit Graph

1231 Commits

Author SHA1 Message Date
Laurent Cozic
3e2676a8c6 Doc: Removed number from GSoC ideas 2019-12-16 16:51:36 +00:00
Laurent Cozic
0f88c947f1 Doc: Cleaned up GSoC projects and added spec for OCR 2019-12-16 16:47:06 +00:00
Laurent Cozic
f98dc4e576 Update website 2019-12-14 10:56:13 +00:00
Laurent Cozic
1b31525773 Doc: Update Nextcloud app doc 2019-12-14 10:36:30 +00:00
Laurent Cozic
34f0a2951a
Desktop: Add ability to share a note publicly using Nextcloud (#2173) 
* Moved button row to separate component file and started Sharing dialog

* Adding Sharing dialog

* Applied "npx react-codemod rename-unsafe-lifecycles"

* More UI

* Tools: Improved TypeScript integration

* Improved share dialog

* Tools Added support for translation validation in CI, and added support for plural translations

* Improved UI and sharing workflow

* Share workflow

* Cleaned up and improved sharing config error handling

* Fixed build scripts and doc for TypeScript

* Run linter
 2019-12-13 01:16:34 +00:00
Laurent Cozic
4640b65b85 finished renaming 2019-12-10 15:23:43 +00:00
Laurent Cozic
1615c6bdc8 renaming 2019-12-10 15:23:29 +00:00
Laurent Cozic
4e708ea021 Doc: More GSoC 2019-11-20 19:01:01 +00:00
Laurent Cozic
49898d01b5 Doc: Added GSoC to website 2019-11-20 18:47:32 +00:00
PackElend
37fc42eb73 Doc: GsoC first public draft of documentation (#2092) 
* GSoC root file

This is the root file for the Google Summer of Code program

* Fixed TOC

* Introduction to GSoC with Joplin

The first draft cloned from https://community.kde.org/GSoC

* Joplin's Application at GSoC template

Cloned from https://wiki.openstreetmap.org/wiki/Google_Summer_of_Code/2019/Organisation_application

* GSoC 2019, idea #1: deeper Nextcloud integration

* GSoC 2019, idea #2: sharing notes

* GSoC 2019, idea #2: tag handling

* GSoC 2019, idea #4: search improvements

* GSoC 2019, idea #5: per note password protection

* Update GSoC_Idea#1.md

* Update GSoC_Idea#2.md

* Rename GSoC_Idea#2.md to GSoC_Idea#2_sharing.md

* Rename GSoC_Idea#1.md to GSoC2019_Idea#1_Nextcloud.md

* Rename GSoC_Idea#2_sharing.md to GSoC2019_Idea#2_sharing.md

* Update and rename GSoC_Idea#3.md to GSoC2019_Idea#3_tagging.md

* Rename GSoC_Idea#4.md to GSoC2019_Idea#4_Search.md

* Rename GSoC_Idea#5.md to GSoC2019_Idea#5_Password per Note.md

* Update GSoC2019_Idea#1_Nextcloud.md

* Create GSoC2019.md

cloned from https://community.kde.org/GSoC/2019/Ideas

* Rename Introduction.md to GSoCIntroduction.md

* Rename GSoCIntroduction.md to GSoC_Introduction.md

* Rename Application.md to GSoC_Application.md

* first draft of a public introduction and project idea page, plus first (filled) template for ideas

* added idea

* started to update org details

* Delete GSoC_Application.md

moved to forum

* Update summer_of_code.md

put the template in a <details> block. little improvements where to publish ideas and applications

* Update summer_of_code.md

put application in quote
 2019-11-20 18:17:51 +00:00
taw00
69b185ff5e Documentation: correct and expand the markdown instructions for a link (#2106) 
* correcting and expanding the markdown instructions for a link
- "some content" in `[some content](https://somelink/)` is called the
    content of an entity (or alt text for an image link)
- "some title" in this example is the the title element of the
    entity: `[some content](https://somelink/ "some title")`

* link description: Fixed a typo, restructured a line break I screwed up, and I cleaned up the language a bit
 2019-11-20 12:09:03 -05:00
Laurent Cozic
7baeb223f3
Update markdown.md 2019-11-18 10:26:07 +00:00
Laurent Cozic
ca2446aef0 Update website 2019-11-12 18:21:28 +00:00
Helmut K. C. Tessarek
bac546c090
CLI v1.0.150 2019-11-11 14:21:07 -05:00
Laurent Cozic
9a2a223650 Update website 2019-11-11 08:33:56 +00:00
Laurent Cozic
d0ce79d81b Update website 2019-11-11 07:57:33 +00:00
luzpaz
d3ba6798d7 Doc: Fix documentation and source comment typos (#2037) 
* Misc. typo and whitespace fixes

Found via `codespell -q 3 -S *.po,*.pot,./ElectronClient/app/locales,./ReactNativeClient/locales,./CliClient/locales -L adresse,ba,fonction,te,whet`

* Revert a previous change
 2019-10-29 09:02:42 +00:00
Helmut K. C. Tessarek
78b8648945
add FAQ entry on how to restart Joplin on Windows 2019-10-28 20:22:45 -04:00
Helmut K. C. Tessarek
d91b3624e9 Desktop, Mobile: Add typographer support (#1987) 
* add typographer support

* add info to readme/markdown.md
 2019-10-15 00:01:58 +02:00
Laurent Cozic
ba3abf7c4c Update website 2019-10-14 23:28:24 +02:00
Laurent Cozic
cc24398e71 Doc: Add mhchem doc 2019-10-14 23:28:00 +02:00
FoxMaSk
5cbae74086 update API doc related to issue #1956 (#1982) 
* update doc related to issue #1956

* Space line
 2019-10-14 04:21:51 -04:00
Laurent Cozic
9796630aa2
Update markdown.md 2019-10-04 09:14:18 +01:00
Laurent Cozic
7230cdea33
Doc: Added table example to Markdown cheatsheet 2019-10-04 09:13:24 +01:00
Laurent Cozic
8856456afd Doc: Update Markdown page 2019-10-02 08:12:03 +01:00
Laurent Cozic
a58316b24c Doc: Fixed Markdown cheat sheet so that it looks better on GitHub 2019-10-01 22:33:19 +01:00
Laurent Cozic
0f04ea4f70 Doc: Various changes and added Markdown cheat sheet 2019-10-01 22:27:57 +01:00
Laurent Cozic
2c522637ef Update website 2019-09-29 15:32:11 +01:00
Laurent Cozic
75b7e7d999 Update website 2019-09-29 15:30:19 +01:00
Laurent Cozic
e92741edd6 CLI v1.0.149 2019-09-27 22:19:13 +01:00
Laurent Cozic
58e299383d CLI v1.0.148 2019-09-27 19:43:22 +01:00
Laurent Cozic
f0f6e7c856 Update website 2019-09-26 00:53:57 +01:00
Laurent Cozic
cd518776a9 Update website 2019-09-25 22:28:48 +01:00
Laurent Cozic
391f7d22a3 CLI v1.0.147 2019-09-25 22:27:58 +01:00
Laurent Cozic
1578188fde Update website 2019-09-11 11:18:44 +01:00
Laurent Cozic
45a820bb35 Update website 2019-09-09 19:03:22 +01:00
Laurent Cozic
bb0bf46f81 CLI v1.0.146 2019-09-08 20:12:49 +01:00
Laurent Cozic
05e0a2c29d CLI v1.0.145 2019-09-08 17:24:00 +01:00
archont00
4488a1b95f Doc: Update explanation of enabling E2EE (#1859) 
As per https://discourse.joplinapp.org/t/totally-confused-re-e2ee/3295, I tried to improve the explanation of the process to avoid multiple encryption keys.
 2019-09-08 16:35:10 +01:00
archont00
e2808a90c6 Doc: Update re. impossibility to delete unused Master Keys (#1858) 
As per discussion at https://discourse.joplinapp.org/t/totally-confused-re-e2ee/3295/2, I propose to add info about Master Keys persistence.
 2019-09-08 16:34:37 +01:00
Laurent Cozic
038efa10f2 Update website 2019-09-06 18:34:47 +01:00
Laurent Cozic
69f75a1520 Doc: Updated old links 2019-07-10 17:00:10 +01:00
Laurent Cozic
91f700ad54 Doc: Updated email addresses 2019-07-10 16:41:13 +01:00
Laurent Cozic
fd150b5b9d Update website 2019-06-28 16:08:50 +01:00
Laurent Cozic
7863e1dffe Update website 2019-06-15 10:27:44 +01:00
Laurent Cozic
7535f1a8c6 Update website 2019-06-10 23:41:32 +01:00
Laurent Cozic
7a85628f46 Doc: added Twitter feed and Product Hunt page 2019-06-06 16:05:14 +01:00
Laurent Cozic
6a56a6ccf0 Doc: Added more technical info for revision history 2019-05-24 09:05:16 +01:00
Laurent Cozic
d00bfa997e Doc: Fixed more links 2019-05-22 16:57:45 +01:00
Laurent Cozic
1a8590e9b9 Update website 2019-05-22 16:49:57 +01:00
Laurent Cozic
6bcbedd6a4 CLI v1.0.137 2019-05-19 12:05:02 +01:00
Laurent Cozic
1924ea062c CLI v1.0.136 2019-05-19 11:20:17 +01:00
Laurent Cozic
5c069c38f5 CLI v1.0.135 2019-05-13 23:59:27 +01:00
Laurent Cozic
451b9c0ae9 CLI v1.0.133 2019-05-13 23:55:53 +01:00
Laurent Cozic
52e5cec585 Update website 2019-05-13 23:41:31 +01:00
Laurent Cozic
bc98b65efa Update website 2019-05-13 23:23:57 +01:00
Laurent Cozic
e705e6e990 CLI v1.0.129 2019-05-13 23:18:57 +01:00
Laurent Cozic
f8d20b61ea Update website 2019-05-12 16:18:30 +01:00
Krešimir Klas
7e9972d99f Android: Resolves #680: New: Allow self-signed certificates (#1466) 
* Allow User-added CAs in Android

This will enable connecting to servers with self-signed certificates on
android as per issue #680.

Implemented as per:
- https://android-developers.googleblog.com/2016/07/changes-to-trusted-certificate.html
- https://github.com/facebook/react-native/issues/20488

* Allow User-added CAs in Android

This will enable connecting to servers with self-signed certificates on
android as per issue #680.

Implemented as per:
- https://android-developers.googleblog.com/2016/07/changes-to-trusted-certificate.html
- https://github.com/facebook/react-native/issues/20488
 2019-05-10 01:15:13 +01:00
Laurent Cozic
68268cb35d Merge branch 'master' of github.com:laurent22/joplin 2019-05-09 23:46:41 +01:00
Laurent Cozic
8e58ed12af Clipper: Resolves #1379: Improved: Display warning icon when a page might not render well in simplified mode 2019-05-09 23:41:52 +01:00
Laurent Cozic
0b98632336 Update website 2019-05-02 23:54:52 +01:00
Laurent Cozic
475467c41c Update website 2019-04-30 18:29:43 +01:00
Laurent Cozic
e280a02643 Update doc 2019-04-30 18:26:58 +01:00
Laurent Cozic
01f2759a62 Added CLI changelog 2019-04-29 18:39:43 +01:00
Laurent Cozic
155d38d24a Update website 2019-04-26 19:06:17 +01:00
Laurent Cozic
c40c6428d7 Merge branch 'master' of github.com:laurent22/joplin 2019-04-26 08:30:51 +01:00
Laurent Cozic
e708ecccee Updated FAQ 2019-04-26 08:30:40 +01:00
Helmut K. C. Tessarek
e394034678
restore the content of API.md 2019-04-21 14:49:12 -04:00
Laurent Cozic
a974eb5d9f Fixing links 2019-04-18 15:11:56 +01:00
Laurent Cozic
6a3f04274d Update website 2019-04-18 15:00:32 +01:00
Laurent Cozic
f8e1395087 joplin.cozic.net => joplinapp.org 2019-04-18 14:59:17 +01:00
Laurent Cozic
252d937405 Update website 2019-04-02 17:46:39 +01:00
Helmut K. C. Tessarek
49936ef095
update download links, stats, website 2019-03-24 17:50:27 -04:00
Laurent Cozic
379ff5163b Merge branch 'master' of github.com:laurent22/joplin 2019-03-08 17:18:31 +00:00
Laurent Cozic
d9538ccb08 No longer using fixed IDs 2019-03-08 17:17:37 +00:00
Laurent Cozic
9289dbdf77
All: Refactor Markdown rendering (#1315) 
* Refactoring MdToHtml to avoid manually rendering tokens

* Minor fix

* Fixed loading of resources

* Handle clicking on checkboxes

* Added back Katex support

* Fixed issues with Katex and note rendering

* Added back support for links

* Restored code block highlighting support

* clean up

* Applying update to mobile

* Fixed handling of links and cleaned up to share more code between mobile and desktop

* Restored content caching and improved handling of additional assets

* Clean up and a few fixes

* Applied more updates to mobile and added code highlighting support
 2019-03-08 17:14:17 +00:00
Laurent Cozic
a0e5947ba4 All: Resolves #163: Added Mermaid support to desktop and mobile 2019-02-28 00:22:53 +00:00
Laurent Cozic
770a435029 Revert "Revert "Update website"" 
This reverts commit 49b56e84a7.
 2019-02-27 23:38:50 +00:00
Laurent Cozic
49b56e84a7 Revert "Update website" 
This reverts commit ff1a6fdbbd.
 2019-02-27 23:38:21 +00:00
Laurent Cozic
ff1a6fdbbd Update website 2019-02-27 23:37:16 +00:00
Laurent Cozic
08f2f982cf Update website 2019-02-27 15:04:34 +00:00
Laurent Cozic
849cb4456c Update website 2019-02-24 12:38:20 +00:00
Laurent Cozic
22cacd2c5b Update website 2019-02-23 15:54:49 +00:00
Laurent Cozic
1333c35389 Update website 2019-02-14 23:13:32 +00:00
Ladislav Benc
0b4650f355 Suggesting some language improvements for the Welcome page (#1199) 
I'm not sure about the "Joplin has three main columns" part. While it would be more correct to put definite articles
 2019-02-10 15:44:43 +00:00
Laurent Cozic
0567188fa8 Desktop: Select Welcome notebook the first time it is created 2019-02-08 23:38:29 +00:00
Laurent Cozic
dd4b46a88b All: Finished Welcome notebook 2019-02-07 23:17:58 +00:00
Laurent Cozic
0d6443c30a All: Improve styling and layout of notes in note viewer 2019-02-05 23:55:09 +00:00
Laurent Cozic
c2bd453e8c Updated welcome notes 2019-02-05 21:14:32 +00:00
Laurent Cozic
9f575101d2 Updated doc 2019-02-05 18:46:32 +00:00
Laurent Cozic
4de7815f31 doc 2019-02-05 17:08:25 +00:00
Laurent Cozic
dd6b43035e Link between notes on Welcome notes 2019-02-03 20:30:59 +00:00
Laurent Cozic
e76094c546 Also set tags on Welcome notes 2019-02-03 20:19:17 +00:00
Laurent Cozic
9c00dc4cab All: Added script to build welcome assets and to import them on startup 2019-02-03 18:58:44 +00:00
Laurent Cozic
fd251cd9a9 Desktop: started writing welcome notes 2019-02-02 10:53:57 +00:00
Laurent Cozic
f5a824b1e6 Removing CLI demo 2019-01-15 19:12:19 +00:00
Laurent Cozic
8d16ad7035 Updated dates 2019-01-15 19:10:27 +00:00
Laurent Cozic
d1a316032d Update website 2019-01-12 00:02:23 +00:00
Laurent Cozic
8ff2418b02 Desktop: Added support for pre-releases 2019-01-11 23:40:05 +00:00
Laurent Cozic
53478056de Update website 2019-01-10 21:43:25 +00:00
Laurent Cozic
685845e097 Update website 2018-12-17 23:47:35 +01:00
Laurent Cozic
6bb09c9c30 Updated FAQ with info about F-Droid and how to fix Nextcloud issues 2018-12-16 14:30:56 +01:00
Mats Estensen
56432dc773 [Documentation] Add example editor config to FAQ (#1036) 
* add external editor example config to faq

* add external editor to feature list
 2018-12-14 18:04:53 +00:00
Mats Estensen
3fb35d043b Revise and complete Norwegian translation (no) and rename to correct locale: nb_NO (#1013) 
* update norwegian translation and correct locale name to nb_NO

* set no to nb_NO in documentation

* Add name, email and completion to README

Norwegian translation
 2018-12-05 23:21:40 +01:00
Laurent Cozic
879b556845 Update website 2018-11-24 12:05:49 +00:00
Laurent Cozic
de01606bff Update website 2018-11-20 19:09:47 +00:00
Laurent Cozic
a3d64d0a90 Update website 2018-11-16 16:53:37 +00:00
Laurent Cozic
2bcddd38b2 Update API doc 2018-11-08 01:17:46 +00:00
Ben Fisher
f92546d6eb Adding some tips for building and debugging Joplin on Windows (#938) 2018-11-02 01:06:48 +00:00
Laurent Cozic
4b4d0e8b25 Update website 2018-10-24 21:14:38 +01:00
Laurent Cozic
720927f488 All: Fixes #832: Enex import: Don't add extra line breaks at the beginning of list item when it contains a block element 2018-10-01 20:55:24 +01:00
Laurent Cozic
36c3521f40 Update website 2018-09-30 21:15:21 +01:00
Laurent Cozic
a0a6bdb684 Update website 2018-09-29 13:15:36 +01:00
Laurent Cozic
eb4aa2c026 API: Added more calls 2018-09-29 12:54:44 +01:00
Laurent Cozic
e98575643c API: Added documentation generator and built documentation 2018-09-28 21:03:28 +01:00
Laurent Cozic
c83391e624 Update website 2018-09-27 19:02:01 +01:00
Laurent Cozic
9680ab74a3 All: Allow loading image resources in IMG html tags 2018-09-27 18:42:34 +01:00
Laurent Cozic
e7a12bb0dd Clipper: Fixes #809: Saves full URL with note, including query parameters 2018-09-22 17:41:09 +01:00
Laurent Cozic
e31ffc9474 Update website 2018-09-16 20:51:28 +01:00
Laurent Cozic
3b2dcb37a6 CLI: Updated Readme 2018-09-16 20:03:29 +01:00
Laurent Cozic
7d1f61e47b Electron release v1.0.106 2018-09-08 15:47:15 +01:00
Laurent Cozic
3a2d62f6c7 Update website 2018-09-05 12:30:37 +01:00
Laurent Cozic
afe4fd70cc Update FAQ 2018-09-05 11:22:04 +01:00
Laurent Cozic
b58c30889e Updated FAQ and contribution guide 2018-09-05 11:17:47 +01:00
Laurent Cozic
8c1b592a51 Updated translations 2018-09-03 11:49:41 +01:00
Laurent Cozic
a801f8d8ed Update website 2018-06-28 21:27:54 +01:00
Laurent Cozic
424c8a2723 Clipper: Support 'author' property 2018-06-27 20:14:20 +01:00
Laurent Cozic
6d8941c005 Update website 2018-06-21 22:14:47 +01:00
Laurent Cozic
aa7da784fc All: Fixes #343, Fixes #191: Added options to ignore TLS cert errors to allow self-signed certificates on desktop and CLI 2018-06-20 00:28:50 +01:00
Laurent Cozic
617ed42d8c Update website 2018-06-18 19:08:13 +01:00
Laurent Cozic
5848e7d90d Doc: Fixed image 2018-06-18 19:08:07 +01:00
Laurent Cozic
54d06646aa Update website 2018-06-18 19:01:52 +01:00
Laurent Cozic
81da46035a Doc: Fixed image 2018-06-18 19:01:42 +01:00
Laurent Cozic
74d0f75802 Update website 2018-06-18 19:00:07 +01:00
Laurent Cozic
21ef8da45f Clipper: Completed doc and simplified logic to get clipper port to make it easier to use by third-party 2018-06-18 18:54:48 +01:00
Laurent Cozic
44f9b35d93 Update website 2018-06-17 19:35:25 +01:00
Laurent Cozic
cf4331c5af Electron: Fixes #623: Improved handling of text selection and fixed infinite loop 2018-06-17 02:44:37 +01:00
Laurent Cozic
553b086ba2 Update website 2018-06-15 19:56:17 +01:00
Laurent Cozic
ff89537899 Update website 2018-06-15 19:28:58 +01:00
Laurent Cozic
ee22a7ff73 Update website 2018-06-15 18:23:23 +01:00
Laurent Cozic
f4f9e25e6b Update website 2018-06-15 18:14:55 +01:00
Laurent Cozic
cb9e8d4f76 Update website 2018-06-14 18:41:57 +01:00
Laurent Cozic
c748281d86 Update website 2018-06-13 19:22:49 +01:00
Laurent Cozic
f79326b2d5 Updated website 2018-06-11 22:10:04 +01:00
Laurent Cozic
41017b9ab8 Update website 2018-06-10 15:18:07 +01:00
Laurent Cozic
80b0773618 Update website 2018-06-10 14:18:50 +01:00
Laurent Cozic
f47610e6fd Update website 2018-06-09 20:23:52 +01:00
Laurent Cozic
8d25b8075d Update website 2018-05-26 17:37:17 +01:00
Laurent Cozic
d6c6ef20d4 Update website 2018-05-26 12:58:44 +01:00
Laurent Cozic
6cb6e9541f Clipper: started doc 2018-05-26 12:57:14 +01:00
Laurent Cozic
a2da2f681c Update website 2018-05-25 14:04:48 +01:00
Laurent Cozic
4b376ec5c2 Update website 2018-05-21 21:53:13 +01:00
Laurent Cozic
30bfd82683 Update website 2018-05-14 12:47:51 +01:00
Laurent Cozic
c4ad9019aa Update website 2018-05-14 12:42:06 +01:00
Laurent Cozic
cc57de60c0 Update website 2018-05-10 15:48:16 +01:00
Laurent Cozic
f4ad777bbf Update website 2018-05-10 14:32:33 +01:00
Laurent Cozic
e4a7851e57
Update debugging.md 2018-05-09 16:33:16 +01:00
Laurent Cozic
7f41bc5703 Update website 2018-05-09 14:10:13 +01:00
Laurent Cozic
567596643c Electron: Handle drag and dropping notebooks to change the parent 2018-05-09 09:53:47 +01:00
Laurent Cozic
d4a28f48c9 Update website 2018-05-06 11:17:34 +01:00
Stefan Weil
40a34a7c05 Fix typos in documentation (found by codespell) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-05-05 16:23:48 +02:00
Laurent Cozic
238268884e
Update debugging.md 2018-05-02 20:16:08 +01:00
Laurent Cozic
5f32c6466a Update website 2018-05-02 15:33:18 +01:00
Laurent Cozic
71bd39a8a3 Update website 2018-05-02 15:31:17 +01:00
Laurent Cozic
363632ffa7 Doc: Added Arch Linux package info 2018-04-19 19:42:44 +02:00
Laurent Cozic
5d69f7a0a7 Doc: Added link to AUR package 2018-04-19 11:13:33 +02:00
Laurent Cozic
a6e4f47adf All: Resolves #389: Documented method being used to encrypt master keys 2018-04-16 16:16:31 +02:00
Laurent Cozic
fb6dee32ac All: Resolves #380: Fixed documentation inconsitencies for webdav url 2018-04-16 16:09:38 +02:00
Laurent Cozic
a58f1e9b4b Update Galician translation 2018-03-31 19:19:11 +01:00
Laurent Cozic
ecd07f1209 Update website 2018-03-29 20:42:11 +01:00
Laurent Cozic
bfb9b77b6e Update website 2018-03-29 20:25:37 +01:00
Laurent Cozic
3a921720d6 Update website 2018-03-29 20:17:11 +01:00
Laurent Cozic
9961fb64bb Updated website 2018-03-29 00:52:27 +01:00
Laurent Cozic
3137c355cf Added stats and changelog document 2018-03-28 17:41:14 +00:00
Laurent Cozic
ed638612aa Moved to https:// domain 2018-03-24 20:13:52 +00:00
Laurent Cozic
f0ca8e1e31
Update debugging.md 2018-03-24 15:37:33 +00:00
Laurent Cozic
86a0e34975
Update faq.md 2018-03-16 14:19:24 +00:00
Laurent Cozic
1141074745
Update faq.md 2018-03-16 14:19:10 +00:00
Laurent Cozic
083ab0c788 Updated website 2018-03-09 08:53:26 +00:00
Laurent Cozic
003c4c4e26 Moved readme files to own folder 2018-03-09 08:47:21 +00:00