Commit Graph

11988 Commits (fc0e61b6663a681573b4ac28c5d5e485606f15bc)

Author SHA1 Message Date
RiotRobot 45e6a716d9 v1.10.9-rc.3 2022-04-08 12:21:37 +01:00
RiotRobot 7e5beb8c7f Prepare changelog for v1.10.9-rc.3 2022-04-08 12:21:36 +01:00
RiotRobot 2a922e847b Upgrade matrix-react-sdk to 3.42.2-rc.3 2022-04-08 12:20:25 +01:00
RiotRobot 74fd8eea20 Upgrade matrix-js-sdk to 17.0.0-rc.2 2022-04-08 12:19:58 +01:00
Kat Gerasimova cec31d0e71
Don't label threads issues with Z-Labs (#21707)
Threads is out of labs now, so shouldn't be labelled as Z-Labs in our issue tracker any more
2022-04-07 14:59:25 +01:00
Robin ef1d90ad41
Handle forced disconnects from Jitsi (#21697) 2022-04-06 13:08:58 -04:00
RiotRobot 6b6ac94fd0 v1.10.9-rc.2 2022-04-06 11:57:11 +01:00
RiotRobot 1edeed1cf2 Prepare changelog for v1.10.9-rc.2 2022-04-06 11:57:11 +01:00
RiotRobot 4b184905e8 Upgrade matrix-react-sdk to 3.42.2-rc.2 2022-04-06 11:55:48 +01:00
Travis Ralston ecf1c41f7c Merge branch 'travis/remove-skinning' into develop 2022-04-05 11:27:43 -06:00
Travis Ralston 98ced973a9 Merge branch 'develop' into travis/remove-skinning 2022-04-05 11:27:37 -06:00
RiotRobot d9a77eb1c3 v1.10.9-rc.1 2022-04-05 18:22:07 +01:00
RiotRobot 4325930e21 Prepare changelog for v1.10.9-rc.1 2022-04-05 18:22:06 +01:00
RiotRobot ba0ea71cf7 Upgrade matrix-react-sdk to 3.42.2-rc.1 2022-04-05 18:20:49 +01:00
RiotRobot 2d4444fec1 Upgrade matrix-js-sdk to 16.0.2-rc.1 2022-04-05 18:20:29 +01:00
Element Translate Bot 95de3c1b04
Translations update from Weblate (#21688)
* Translated using Weblate (Frisian)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/fy/

* Translated using Weblate (Polish)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/

* Translated using Weblate (Indonesian)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/id/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/

* Translated using Weblate (Slovak)

Currently translated at 97.0% (33 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/sk/

* Translated using Weblate (Hebrew)

Currently translated at 97.0% (33 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/he/

* Translated using Weblate (Hebrew)

Currently translated at 97.0% (33 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/he/

* Translated using Weblate (Hebrew)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/he/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/sk/

* Translated using Weblate (Indonesian)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/id/

* Added translation using Weblate (Uzbek)

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/uk/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/sk/

* Translated using Weblate (Norwegian Nynorsk)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/nn/

* Translated using Weblate (Norwegian Nynorsk)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/nn/

* Translated using Weblate (Greek)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/el/

* Translated using Weblate (Vietnamese)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/vi/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/uk/

* Translated using Weblate (Indonesian)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/id/

* Translated using Weblate (Italian)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/it/

* Translated using Weblate (Czech)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/cs/

* Translated using Weblate (Albanian)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/sq/

* Translated using Weblate (Polish)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/

* Translated using Weblate (Polish)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/

* Translated using Weblate (Polish)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/

* Translated using Weblate (Hungarian)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/hu/

* Translated using Weblate (Polish)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/sv/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/zh_Hant/

* Translated using Weblate (Estonian)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/et/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pt_BR/

* Translated using Weblate (Danish)

Currently translated at 94.2% (33 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/da/

* Translated using Weblate (Danish)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/da/

* Translated using Weblate (German)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/de/

* Translated using Weblate (French)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/fr/

* Translated using Weblate (Portuguese)

Currently translated at 88.5% (31 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pt/

* Translated using Weblate (Portuguese)

Currently translated at 88.5% (31 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pt/

* Translated using Weblate (Hebrew)

Currently translated at 94.2% (33 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/he/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/sk/

* Translated using Weblate (Finnish)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/fi/

* Translated using Weblate (Turkish)

Currently translated at 97.1% (34 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/tr/

* Translated using Weblate (Galician)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/gl/

* Added translation using Weblate (Sorani)

* Translated using Weblate (Russian)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ru/

* Translated using Weblate (Estonian)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/et/

* Translated using Weblate (Japanese)

Currently translated at 94.2% (33 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/

* Translated using Weblate (Icelandic)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/is/

* Translated using Weblate (Japanese)

Currently translated at 94.2% (33 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/

* Translated using Weblate (Japanese)

Currently translated at 94.2% (33 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/

* Translated using Weblate (Galician)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/gl/

* Translated using Weblate (Japanese)

Currently translated at 94.2% (33 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/

* Translated using Weblate (Japanese)

Currently translated at 94.2% (33 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/

* Translated using Weblate (Icelandic)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/is/

* Translated using Weblate (Persian)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/fa/

* Translated using Weblate (Japanese)

Currently translated at 94.2% (33 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/

* Translated using Weblate (Persian)

Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/fa/

* Translated using Weblate (Hebrew)

Currently translated at 100.0% (31 of 31 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/he/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (31 of 31 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (31 of 31 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/

* Translated using Weblate (Hebrew)

Currently translated at 100.0% (31 of 31 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/he/

* Translated using Weblate (French)

Currently translated at 100.0% (31 of 31 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/fr/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (31 of 31 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/

* Translated using Weblate (Bosnian)

Currently translated at 100.0% (31 of 31 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/bs/

* Translated using Weblate (Icelandic)

Currently translated at 100.0% (31 of 31 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/is/

* Translated using Weblate (Hindi)

Currently translated at 100.0% (31 of 31 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/hi/

* Translated using Weblate (Hebrew)

Currently translated at 100.0% (31 of 31 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/he/

Co-authored-by: Weblate <translate@riot.im>
Co-authored-by: Fjoerfoks <fryskefirefox@gmail.com>
Co-authored-by: Adrian Środoń <adrian.srodon@gmail.com>
Co-authored-by: Linerly <linerly@protonmail.com>
Co-authored-by: jelv <post@jelv.nl>
Co-authored-by: Marek Ľach <graweeld@googlemail.com>
Co-authored-by: a5r0n <h98aaron@gmail.com>
Co-authored-by: Vulcan <element@zbug.anonaddy.com>
Co-authored-by: Jozef Gaal <preklady@mayday.sk>
Co-authored-by: Yorqinbek <yyoriqulov@mail.ru>
Co-authored-by: Ihor Hordiichuk <igor_ck@outlook.com>
Co-authored-by: Bjørn I.Svindseth <bjorni.svindseth@yahoo.com>
Co-authored-by: pkst-ellak <pkst@eellak.gr>
Co-authored-by: Bui Minh Duc <m.nhduc.bui1@gmail.com>
Co-authored-by: Johan Smits <johan@smitsmail.net>
Co-authored-by: random <dictionary@tutamail.com>
Co-authored-by: waclaw66 <waclaw66@seznam.cz>
Co-authored-by: Besnik Bleta <besnik@programeshqip.org>
Co-authored-by: Hexandcube <hexandcube@hexandcube.tk>
Co-authored-by: Skibbi <skibbi@gmail.com>
Co-authored-by: Norbert <norbertrom01@gmail.com>
Co-authored-by: Szimszon <github@oregpreshaz.eu>
Co-authored-by: TR_SLimey <tr_slimey@protonmail.com>
Co-authored-by: LinAGKar <linus.kardell@gmail.com>
Co-authored-by: Jeff Huang <s8321414@gmail.com>
Co-authored-by: Priit Jõerüüt <riot@joeruut.com>
Co-authored-by: lvre <7uu3qrbvm@relay.firefox.com>
Co-authored-by: Alfred Makne Poulsen <Alfredmakne@gmail.com>
Co-authored-by: libexus <libexus@gmail.com>
Co-authored-by: Paragoumba <paragoumba@gmail.com>
Co-authored-by: Helder Ferreira <woounn@gmail.com>
Co-authored-by: Eduardo Ervideira <ejcept@gmail.com>
Co-authored-by: SPiRiT <such.a.lost.spirit@gmail.com>
Co-authored-by: Shi-nobi <mika.lehtonen@mttl.xyz>
Co-authored-by: Mahmut Tuncer <asimbesir4242+elementtranslations@gmail.com>
Co-authored-by: Xose M <xosem@disroot.org>
Co-authored-by: ENIGMA <N0NVAL@protonmail.com>
Co-authored-by: Nikita Epifanov <NikGreens@protonmail.com>
Co-authored-by: Suguru Hirahara <ovestekona@protonmail.com>
Co-authored-by: Sveinn í Felli <sv1@fellsnet.is>
Co-authored-by: xmeta <x_metawork@yahoo.co.jp>
Co-authored-by: nafi3h <alireza.zarei@gmail.com>
Co-authored-by: Alexandre Franke <alexandre.franke@gmail.com>
Co-authored-by: Nermin <neercsys@gmail.com>
Co-authored-by: Arya Bhosale <arya2001bhosale@gmail.com>
2022-04-05 17:52:15 +01:00
Travis Ralston d39ae8a91b Merge branch 'develop' into travis/remove-skinning 2022-04-05 10:42:48 -06:00
Robin eab8a19ec7
Avoid flashing the Jitsi prejoin screen at the user before skipping it (#21665) 2022-04-05 11:32:26 -04:00
Robin b79133c694
Fix stuck persistence of Jitsi widgets (#21650)
The hangup event may or may not be handled, so we need to account for
cases where it throws an error.
2022-04-04 07:32:12 -04:00
Shivrani A. Jadhav b1a60b25b4
Fix typo in translation docs (#21653)
* Correct typo

* Removing extra lines
2022-04-04 00:05:37 -06:00
Robin aeb6cddc2f
Update video rooms to new design specs (#21623)
* "Voice room" → "video room"

* Customize Jitsi behavior in video rooms
2022-04-01 11:28:47 -04:00
Travis Ralston f7dea9421f Merge branch 'develop' into travis/remove-skinning 2022-03-31 19:21:12 -06:00
Robin 58cca0a77a
Update name of video rooms label (#21629) 2022-03-31 18:01:49 -04:00
Kat Gerasimova 8ce9488bb5
Add automation for "A-New-Search-Experience" label (#21622)
Add A-New-Search-Experience label for automation to Delight board and to add Z-Labs label.

This label is currently down as A-Spotlight-Search, but I will rename it.
2022-03-31 16:55:10 +01:00
Robin 5077157282
Remove React HMR (#21607) 2022-03-30 16:57:26 +01:00
Shreeya f029b68ad4
Updated 'Setting up a dev environment' in README.md (#21597) 2022-03-30 13:52:15 +01:00
Sven Mäder a8e914ad9f
Fix show_labs_settings config.md typo (#21600)
* Fix typo show_labs_settings

* Document latex_maths_delims developer option
2022-03-30 13:41:23 +01:00
Michael Kaye 5eecc768a3
Docs: Require creation of config.json as part of Getting Started (#21590)
* Require creation of config.json

Change the language from "If desired" to "Configure" to ensure people do not miss this step, as skipping this step will show the error "Invalid configuration: no default server specified."

* Update README.md

Rollback unintentioned bullet point `3` change
2022-03-29 16:40:07 +01:00
Travis Ralston 9c23f6c476 Step 14: Remove reskindex 2022-03-28 15:26:22 -06:00
Travis Ralston 7bd584abe0 Step 13: Update documentation for skinning 2022-03-28 15:17:56 -06:00
Travis Ralston 5b592eca4f Step 10.3: Use module replacement to achieve component overrides
This is the same system as the customisations override, however deliberately using a different JSON file to avoid conflicts. 

Forks would be expected to use the customisations file, not the components file, to override/add components.
2022-03-28 13:02:50 -06:00
Travis Ralston 5459c1eb96 Step 10.2: Move hacky welcome page replacement to react-sdk 2022-03-28 13:02:50 -06:00
Travis Ralston 0bcb1d18ce Step 10.1: Ensure the js-sdk browser bundle gets pulled
We no longer have implicit imports which would have called this path, so manually call it. We have to disable lint as it doesn't like us doing this, but we only end up with a single entry point.
2022-03-28 13:02:50 -06:00
Travis Ralston e1f9e9a8f8 Step 8.1: Remove skin-sdk.js 2022-03-28 13:02:50 -06:00
Travis Ralston 384903361d Step 4: Disable/remove bulk of skinner code 2022-03-28 13:02:50 -06:00
Travis Ralston 585c777878 Step 3.2: Stop using `getComponent` 2022-03-28 13:02:50 -06:00
Travis Ralston 1bbecdff6c Step 3.1: Stop using `getComponent` in tests 2022-03-28 13:02:50 -06:00
Travis Ralston 303f06cc61 Step 2: Remove the decorator 2022-03-28 13:02:50 -06:00
Robin 02a5789dd3
Fix typo in labs label workflow (#21582) 2022-03-28 16:44:25 +01:00
RiotRobot 951fdaf3ab Reset matrix-react-sdk back to develop branch 2022-03-28 16:29:08 +01:00
RiotRobot 7ce2538778 Reset matrix-js-sdk back to develop branch 2022-03-28 16:28:55 +01:00
RiotRobot 23608855c6 Merge branch 'master' into develop 2022-03-28 16:28:42 +01:00
RiotRobot d34b628583 v1.10.8 2022-03-28 16:23:24 +01:00
RiotRobot 6ceefe2a27 Upgrade matrix-react-sdk to 3.42.1 2022-03-28 16:22:21 +01:00
RiotRobot 33e515608f Upgrade matrix-js-sdk to 16.0.1 2022-03-28 16:21:39 +01:00
Travis Ralston 14f46a8ca9
Update location of Settings.ts in labs docs (#21562) 2022-03-25 10:43:03 -06:00
dependabot[bot] 6ae7d60f4a
Bump minimist from 1.2.5 to 1.2.6 (#21561)
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-25 15:23:00 +00:00
Travis Ralston fe6a9c257b
Fix style lint on Windows (#21557) 2022-03-25 09:13:22 -06:00
Michael Telatynski f2c3f880c7
Update Posthog URLs (#21559) 2022-03-25 10:34:25 +00:00
Robin e638abf7c2
Add voice rooms to labs labels (#21512) 2022-03-22 19:29:11 -04:00