Richard van der Hoff
d9bc8ebc53
de-lint MegolmExportEncryption + test
2017-06-08 14:29:53 +01:00
Richard van der Hoff
409d2d5d28
Merge pull request #1055 from matrix-org/rav/enforce_linting_of_clean_files
...
Make travis check for lint on files which are clean to start with
2017-06-08 14:24:19 +01:00
Matthew Hodgson
29e792b642
make mels emoji capable
2017-06-08 14:21:14 +01:00
Kegan Dougal
c57823a31d
Merge branch 'develop' into kegan/translation-tamarin
2017-06-08 14:19:56 +01:00
Luke Barnard
d3cf78ff5a
Control currently viewied event via RoomViewStore
...
Fix for https://github.com/vector-im/riot-web/issues/4224
Due to the way `MatrixChat` does a state update when the `view_room` dispatch fires and a second update when `RoomViewStore` sends an update, the current event ID and room ID were becoming out of sync. The solution devised was to have the event ID managed by the `RoomViewStore` itself and do any defaulting there (for when we revisit a room that we saved scroll state for previously).
This required a few changes:
- The addition of `update_scroll_state` in `RoomViewStore` allows the `RoomView` to save scroll state for a room before swapping to another one. Previously the caching of scroll state was done in `RoomView`.
- The `view_room` dispatch now accepts an `event_id`, which dictates which event is supposed to be scrolled to in the `MessagePanel` when a new room is viewed. It also accepts `event_offset`, but currently, this isn't passed in by a dispatch in the app, but it is clobbered when loading the default position when an `event_id` isn't specified. Finally, `highlighted` was added to distinguish whether the initial event being scrolled to is also highlighted. This flag is also used by `viewRoom` in `MatrixChat` in order to decide whether to `notifyNewScreen` with the specified `event_id`.
2017-06-08 14:17:49 +01:00
David Baker
6d1fa775a0
Formatting
2017-06-08 14:14:45 +01:00
Richard van der Hoff
8479a8f5ff
Update .eslintignore.errorfiles
2017-06-08 14:11:34 +01:00
Kegan Dougal
00df956ca2
Add remaining translations!
...
Every file has now been manually vetted by me. Due to the extent of
the changes, I've been unable to test all scenarios to make sure this
all works. :(
2017-06-08 14:08:51 +01:00
Richard van der Hoff
9bda212cb1
Make travis/jenkins check for lint on files which are clean to start with
2017-06-08 14:03:30 +01:00
David Baker
e2c68c1a93
Merge remote-tracking branch 'origin/develop' into dbkr/fix_login_error_message
2017-06-08 13:40:36 +01:00
Vladi
7e7b5a6dc0
Translated using Weblate (Russian)
...
Currently translated at 100.0% (853 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-06-08 11:47:13 +00:00
Kegan Dougal
1c58a9cd5e
Everything but src/components/views/rooms
2017-06-08 12:33:29 +01:00
RiotTranslate
c9f723b160
Update from Weblate. ( #1053 )
...
* Added translation using Weblate (Thai)
* Translated using Weblate (Thai)
Currently translated at 2.6% (22 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (Thai)
Currently translated at 8.9% (74 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.8% (826 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Swedish)
Currently translated at 35.4% (293 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/sv/
* Translated using Weblate (Thai)
Currently translated at 9.7% (81 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 100.0% (827 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Russian)
Currently translated at 76.9% (636 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (Hungarian)
Currently translated at 0.1% (1 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/
* Translated using Weblate (Thai)
Currently translated at 39.2% (325 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.8% (827 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 99.8% (827 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Thai)
Currently translated at 39.7% (329 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.8% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Hungarian)
Currently translated at 3.1% (26 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/
* Translated using Weblate (Russian)
Currently translated at 77.4% (641 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (Thai)
Currently translated at 39.7% (329 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (Russian)
Currently translated at 100.0% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (German)
Currently translated at 100.0% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Russian)
Currently translated at 100.0% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (German)
Currently translated at 100.0% (850 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (French)
Currently translated at 96.5% (821 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
* Translated using Weblate (Thai)
Currently translated at 39.0% (332 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (French)
Currently translated at 97.0% (825 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
* Translated using Weblate (German)
Currently translated at 100.0% (850 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Thai)
Currently translated at 40.8% (347 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (French)
Currently translated at 100.0% (850 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
* Translated using Weblate (German)
Currently translated at 100.0% (850 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Thai)
Currently translated at 49.5% (421 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (Thai)
Currently translated at 56.0% (476 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (Russian)
Currently translated at 100.0% (852 of 852 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (German)
Currently translated at 99.7% (850 of 852 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Thai)
Currently translated at 56.2% (479 of 852 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.7% (851 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 99.7% (851 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 100.0% (853 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-08 12:05:02 +01:00
David Baker
ec9a436625
Formatting
2017-06-08 11:56:48 +01:00
Bamstam
811901097d
Translated using Weblate (German)
...
Currently translated at 100.0% (853 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-08 10:18:48 +00:00
Bamstam
5686eb75d4
Translated using Weblate (German)
...
Currently translated at 99.7% (851 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-08 10:16:39 +00:00
Bamstam
2bed5bae17
Translated using Weblate (German)
...
Currently translated at 99.7% (851 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-08 10:16:29 +00:00
RiotTranslate
3e7ebcd3d6
Merge remote-tracking branch 'origin/develop' into develop
2017-06-08 09:57:08 +00:00
Pitchaya Boonsarngsuk
db647fa667
Translated using Weblate (Thai)
...
Currently translated at 56.2% (479 of 852 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-08 09:57:07 +00:00
Bamstam
96e471adc6
Translated using Weblate (German)
...
Currently translated at 99.7% (850 of 852 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-08 09:57:05 +00:00
Stanislav N
a5b1d2e05a
Translated using Weblate (Russian)
...
Currently translated at 100.0% (852 of 852 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-06-08 09:57:01 +00:00
Matthew Hodgson
bc0eb4294c
rename welcome page to home
2017-06-08 10:27:35 +01:00
Kegan Dougal
0f4028da07
Add more translations..
2017-06-08 09:44:58 +01:00
Luke Barnard
22a4325ca3
Merge pull request #1054 from matrix-org/rav/logging_for_timeline_load_fail
...
Add some logging around switching rooms
2017-06-08 09:41:41 +01:00
Richard van der Hoff
566fb2caeb
Add some logging around switching rooms
...
... which I wish had been there when I was staring at a rageshake.
2017-06-07 22:41:02 +01:00
RiotTranslate
2d64a95d3b
[WEBLATE] merge Develop
2017-06-07 18:56:41 +00:00
Pitchaya Boonsarngsuk
e21a8d384b
Translated using Weblate (Thai)
...
Currently translated at 56.0% (476 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-07 18:49:25 +00:00
Pitchaya Boonsarngsuk
6ae8172fa2
Translated using Weblate (Thai)
...
Currently translated at 49.5% (421 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-07 18:03:30 +00:00
Bamstam
8833dc64b7
Translated using Weblate (German)
...
Currently translated at 100.0% (850 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-07 18:03:29 +00:00
Amandine
93fcd0aa40
Translated using Weblate (French)
...
Currently translated at 100.0% (850 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-07 18:03:27 +00:00
RiotTranslate
ea02d8841c
Update from Weblate. ( #1052 )
...
* Added translation using Weblate (Thai)
* Translated using Weblate (Thai)
Currently translated at 2.6% (22 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (Thai)
Currently translated at 8.9% (74 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.8% (826 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Swedish)
Currently translated at 35.4% (293 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/sv/
* Translated using Weblate (Thai)
Currently translated at 9.7% (81 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 100.0% (827 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Russian)
Currently translated at 76.9% (636 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (Hungarian)
Currently translated at 0.1% (1 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/
* Translated using Weblate (Thai)
Currently translated at 39.2% (325 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.8% (827 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 99.8% (827 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Thai)
Currently translated at 39.7% (329 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (German)
Currently translated at 99.8% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Hungarian)
Currently translated at 3.1% (26 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/
* Translated using Weblate (Russian)
Currently translated at 77.4% (641 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (Thai)
Currently translated at 39.7% (329 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
* Translated using Weblate (Russian)
Currently translated at 100.0% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (German)
Currently translated at 100.0% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Russian)
Currently translated at 100.0% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
* Translated using Weblate (German)
Currently translated at 100.0% (850 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (French)
Currently translated at 96.5% (821 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
* Translated using Weblate (Thai)
Currently translated at 39.0% (332 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-07 18:48:48 +01:00
Matthew Hodgson
ca1c0e42b0
oops, merge correctly
2017-06-07 18:42:34 +01:00
Matthew Hodgson
5cf44454d2
fix more punctuation fails
2017-06-07 18:41:18 +01:00
Pitchaya Boonsarngsuk
8d7f40ed07
Translated using Weblate (Thai)
...
Currently translated at 40.8% (347 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-07 17:34:16 +00:00
Bamstam
ca5215a288
Translated using Weblate (German)
...
Currently translated at 100.0% (850 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-07 17:34:15 +00:00
Amandine
0170a12ad6
Translated using Weblate (French)
...
Currently translated at 97.0% (825 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-07 17:34:14 +00:00
David Baker
f7ab6a574c
Remove unused string
2017-06-07 18:32:52 +01:00
Matthew Hodgson
8228db88d2
oops, fix more i18n var name typos
2017-06-07 18:28:49 +01:00
Matthew Hodgson
ef2fedc3a9
fix missing translations and typos in i18n
2017-06-07 18:24:35 +01:00
Matthew Hodgson
fe487232ad
sync fullstops everywhere
2017-06-07 18:15:56 +01:00
Matthew Hodgson
74d680a952
sync fullstops everywhere
2017-06-07 18:15:56 +01:00
David Baker
0370b7c5e8
Merge pull request #1050 from matrix-org/luke/feature-user-directory-invite
...
Use user_directory endpoint to populate ChatInviteDialog
2017-06-07 18:06:35 +01:00
Luke Barnard
29da25529c
Make it backwards compatible
...
Hit the user_directory API and if M_UNRECOGNIZED, do a local search and continue to search locally therein.
2017-06-07 17:53:58 +01:00
RiotTranslate
0028ead955
Merge remote-tracking branch 'origin/develop' into develop
2017-06-07 16:47:53 +00:00
Pitchaya Boonsarngsuk
c11fd8c3b1
Translated using Weblate (Thai)
...
Currently translated at 39.0% (332 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-07 16:47:53 +00:00
Amandine
b2a17fea08
Translated using Weblate (French)
...
Currently translated at 96.5% (821 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-07 16:47:51 +00:00
Krombel
3db286f8f0
Translated using Weblate (German)
...
Currently translated at 100.0% (850 of 850 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-07 16:47:49 +00:00
Luke Barnard
68ddf35db4
Use then, catch, done and display any errors that occur during search
2017-06-07 17:33:15 +01:00
David Baker
bfa095184d
Merge pull request #1046 from matrix-org/t3chguy/piwik_fixes_1
...
Various Analytics changes/fixes/improvements
2017-06-07 17:17:47 +01:00
RiotTranslate
305d510c6e
Merge remote-tracking branch 'origin/develop' into develop
2017-06-07 15:58:04 +00:00
