Граф коммитов

4521 Коммитов

Автор SHA1 Сообщение Дата
Matthew Birtch
3eb007fc82 MM-63704 Hide priority label if message is deleted (#30718)
* hide priority label if message is deleted

* added unit test

* fix lint issue

* Update panel_body.test.tsx.snap

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
2025-04-17 08:27:17 -04:00
Weblate (bot)
ecd92e4896 Translations update from Mattermost Weblate (#30727)
* Translated using Weblate (Polish)

Currently translated at 100.0% (2632 of 2632 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/pl/

* Translated using Weblate (Polish)

Currently translated at 100.0% (6117 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/pl/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (6117 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/sv/

* Translated using Weblate (Lithuanian)

Currently translated at 8.4% (222 of 2632 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/lt/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 76.3% (4673 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/

* Translated using Weblate (Japanese)

Currently translated at 99.1% (6062 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/ja/

* Translated using Weblate (Polish)

Currently translated at 100.0% (6117 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/pl/

* Translated using Weblate (German)

Currently translated at 100.0% (2632 of 2632 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/de/

* Translated using Weblate (German)

Currently translated at 100.0% (6117 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/de/

* Translated using Weblate (Polish)

Currently translated at 100.0% (6117 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/pl/

* Translated using Weblate (Polish)

Currently translated at 100.0% (6117 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/pl/

* Translated using Weblate (Finnish)

Currently translated at 48.5% (1277 of 2632 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/fi/

* Translated using Weblate (Finnish)

Currently translated at 48.5% (1277 of 2632 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/fi/

* Translated using Weblate (Finnish)

Currently translated at 48.5% (1277 of 2632 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/fi/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 76.5% (4684 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/

* Translated using Weblate (Russian)

Currently translated at 97.1% (2557 of 2632 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/ru/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2632 of 2632 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/uk/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (6117 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/uk/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 76.8% (4698 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/

* Translated using Weblate (Russian)

Currently translated at 97.5% (2568 of 2632 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/ru/

* Translated using Weblate (Japanese)

Currently translated at 99.1% (6068 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/ja/

* Translated using Weblate (Japanese)

Currently translated at 99.8% (2627 of 2632 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/ja/

* Translated using Weblate (Polish)

Currently translated at 100.0% (6117 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/pl/

* Translated using Weblate (Dutch)

Currently translated at 99.7% (2625 of 2632 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/nl/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (2632 of 2632 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/sv/

* Translated using Weblate (Dutch)

Currently translated at 99.9% (6116 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nl/

* Translated using Weblate (Polish)

Currently translated at 100.0% (6117 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/pl/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (6117 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/sv/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 77.1% (4722 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/

* Translated using Weblate (Lithuanian)

Currently translated at 77.7% (4754 of 6117 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/lt/

* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/

* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/

---------

Co-authored-by: master7 <marcin.karkosz@rajska.info>
Co-authored-by: MArtin Johnson <martinjohnson@bahnhof.se>
Co-authored-by: evituzas <evita.svegzdaite@gmail.com>
Co-authored-by: Frank Paul Silye <frankps@gmail.com>
Co-authored-by: Takuya N <takninnovationresearch@gmail.com>
Co-authored-by: Arusekk <floss@arusekk.pl>
Co-authored-by: jprusch <rs@schaeferbarthold.de>
Co-authored-by: Ricky Tigg <ricky.tigg@gmail.com>
Co-authored-by: Konstantin <eleferen@gmail.com>
Co-authored-by: Bohdan <bshumylo@yahoo.com>
Co-authored-by: Tom De Moor <tom@controlaltdieliet.be>
Co-authored-by: Mattermost Build <build@mattermost.com>
2025-04-16 16:05:19 -03:00
Scott Bishel
583ba80c7e revert css changes, add new css (#30699)
Co-authored-by: Mattermost Build <build@mattermost.com>
2025-04-16 08:21:00 -06:00
Nick Misasi
495a49b896 Feature/audit certificate upload (#30223)
* feat: Add certificate upload option for audit logging settings

* Commit current changes

* Additions

* MM-62944 Fix fileupload settings not being clickable

* Support for uploading a cert for experimental audit logging cert. Pre cloud implementation in the backend

* Forgot to add new hook

* Add support for setting custom audit log certifcates in Cloud

* Permissions

* I18n

* Change order

* Linter fixes

* Linter fixes, add openapi spec

* additions for openapi

* More openapi fixes because it won't run locally

* Undo, cursor went rogue

* newline fix

* Align types properly

* Fix i18n

* Fix i18n AGAIN

* Fix error

* Update api/v4/source/audit_logging.yaml

---------

Co-authored-by: Harrison Healey <harrisonmhealey@gmail.com>
Co-authored-by: Mattermost Build <build@mattermost.com>
2025-04-16 09:34:18 -04:00
Matthew Birtch
e113b3cfc8 MM-59038 Fix markdown inconsistencies in preview mode (#30719)
* fix inconsistency with markdown image sizes in preview mode

* fix preview mode in RHS so it shows HR

* Update _markdown.scss

* fix css linting issue

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
2025-04-16 08:48:28 -04:00
Felipe Martin
1140ee17d6 fix: allow plugins when embedding mattermost (#30739) 2025-04-15 17:18:57 +02:00
Julien Tant
77bf047c55 [MM-63664] Fix mentions not paginating (#30671) 2025-04-15 08:06:27 -07:00
Harrison Healey
964678fc45 MM-62005 Remove FloatingFocusManager from PluginLinkTooltip (#30663)
* MM-62005 Remove FloatingFocusManager from PluginLinkTooltip

* Update tests to define more realistic plugin components

* Revert "Update tests to define more realistic plugin components"

This reverts commit c23307112c2bc5091b931980885cc79e4b945ff8.

* Revert changes to DeepPartial

* Use class component for test component
2025-04-14 14:18:26 -04:00
Jesse Hallam
6f33b721de MM-63378: Test and fix permission issues with System Manager team access (#30672)
* test PermissionView semantics

* change required ancillary permissions

`PermissionSysconsoleReadReportingTeamStatistics` doesn't strictly need `PermissionViewTeam`, but can work with whatever teams the user has access to.

* remove unnecessary timeouts

* remove redundant comment

* update snapshots

* Update e2e-tests/playwright/specs/functional/system_console/permissions/team_access.spec.ts

Co-authored-by: Saturnino Abril <5334504+saturninoabril@users.noreply.github.com>

---------

Co-authored-by: Saturnino Abril <5334504+saturninoabril@users.noreply.github.com>
Co-authored-by: Mattermost Build <build@mattermost.com>
2025-04-14 12:43:56 -03:00
Nicolas Le Cam
f7976254bb MM-57097: Add a toggle to switch between plain and JSON logs format (#28806) 2025-04-14 11:38:48 +02:00
Lucas van Beek
698de05545 Implement backslash escaping for emoticons (#30101)
Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
Co-authored-by: Mattermost Build <build@mattermost.com>
2025-04-11 15:35:21 -04:00
David Krauser
88d5ad06b4 [MM-63583] Send websocket ping immediately after connecting (#30579) 2025-04-11 09:59:22 -04:00
Matthew Birtch
19bea2c8d7 MM-61891 Fix styles for attachment card overflow issue (#30544)
* Fix styles for attachment card overflow issue

* fixed style linter issues

* fix linting issues

* fixed positioning issue

* updated snapshots

* E2E fix for playwrite test

---------

Co-authored-by: Caleb Roseland <caleb@calebroseland.com>
Co-authored-by: yasserfaraazkhan <attitude3cena.yf@gmail.com>
2025-04-11 07:55:17 +00:00
Julien Tant
357aa58163 [MM-63597] Fix From: autocompletion (#30673) 2025-04-11 06:30:08 +00:00
enzowritescode
a534370010 Update permissions language to be more explicit (#29368)
* Update permissions language to be more explicit

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
2025-04-10 13:53:37 -06:00
Nick Misasi
725366472f Make trial form modal-body scrollable for small vertical screens (#30682) 2025-04-10 14:37:47 +00:00
Scott Bishel
27575d50c2 MM-62703 Implement cpa for ldap/saml in System Console (#30350)
* implement cpa for ldap/saml for System Console

* i18n-extract

* update tests for changes

* revert package-lock.json

* fixes from review commnts

* import link

* fix bad merge

* more fixes

* update tests

* put behind a featureflag

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
2025-04-09 10:36:51 -06:00
Matthew Birtch
b0c403f5d1 MM-62784 added tooltip to hidden formatting controls button (#30545) 2025-04-09 21:38:25 +05:30
Vishal
204fec42e9 [MM-63582] Recent Mentions Not Properly Handling Hyphenated Custom Keywords (#30578)
* quote all terms for better recent mentions accuracy

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
2025-04-09 10:38:25 +00:00
Saket Soni
64ff2434ee [MM-59051] : Email notification setting 'Immediately' is unclear given the help text description [Fixed] (#29940)
* Altered the forms, some little more work to go

* Adjusted the status rendering according to chosed options when email settings dialoge is closed

* addressed linting issues

* Update snapshots

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
Co-authored-by: Harrison Healey <harrisonmhealey@gmail.com>
2025-04-08 17:32:11 -04:00
Saturnino Abril
cf68cfdf4b bump playwright lib to 10.8.0, update dependencies and update snapshots (#30662) 2025-04-08 16:21:50 +08:00
MArtin Johnson
9b79dff123 Translated using Weblate (Swedish)
Currently translated at 99.8% (6092 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/sv/
2025-04-08 07:22:06 +00:00
MArtin Johnson
e08b0d20ca Translated using Weblate (Swedish)
Currently translated at 99.8% (6091 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/sv/
2025-04-08 07:22:06 +00:00
Hosted Weblate
46929ca69a Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/
2025-04-08 07:22:06 +00:00
MArtin Johnson
035af8e1c2 Translated using Weblate (Swedish)
Currently translated at 99.8% (6088 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/sv/
2025-04-08 07:22:06 +00:00
Tom De Moor
eddd486a60 Translated using Weblate (Dutch)
Currently translated at 99.9% (6099 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nl/
2025-04-08 07:22:06 +00:00
Frank Paul Silye
3421c62a7c Translated using Weblate (Norwegian Bokmål)
Currently translated at 76.5% (4669 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
2025-04-08 07:22:06 +00:00
Benjamin Danon
72bedf6c49 Translated using Weblate (French)
Currently translated at 82.3% (5025 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/fr/
2025-04-08 07:22:06 +00:00
Frank Paul Silye
ac96929073 Translated using Weblate (Norwegian Bokmål)
Currently translated at 76.0% (4639 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
2025-04-08 07:22:06 +00:00
Frank Paul Silye
fd1a4914aa Translated using Weblate (Norwegian Bokmål)
Currently translated at 75.9% (4632 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
2025-04-08 07:22:06 +00:00
Frank Paul Silye
29650e23f1 Translated using Weblate (Norwegian Bokmål)
Currently translated at 75.2% (4590 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
2025-04-08 07:22:06 +00:00
Frank Paul Silye
39bfc2ee47 Translated using Weblate (Norwegian Bokmål)
Currently translated at 75.1% (4587 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
2025-04-08 07:22:06 +00:00
Frank Paul Silye
000f4ef53e Translated using Weblate (Norwegian Bokmål)
Currently translated at 73.8% (4505 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
2025-04-08 07:22:06 +00:00
Frank Paul Silye
74646a1c8b Translated using Weblate (Norwegian Bokmål)
Currently translated at 72.4% (4417 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
2025-04-08 07:22:06 +00:00
Frank Paul Silye
2ec5858852 Translated using Weblate (Norwegian Bokmål)
Currently translated at 72.0% (4393 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
2025-04-08 07:22:06 +00:00
Bohdan
fb5b0051f2 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (6100 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/uk/
2025-04-08 07:22:06 +00:00
Benjamin Danon
c56ea61b4f Translated using Weblate (French)
Currently translated at 82.3% (5024 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/fr/
2025-04-08 07:22:06 +00:00
Frank Paul Silye
8f95ac7fd6 Translated using Weblate (Norwegian Bokmål)
Currently translated at 71.4% (4361 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nb_NO/
2025-04-08 07:22:06 +00:00
Bohdan
af8694a188 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (6100 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/uk/
2025-04-08 07:22:06 +00:00
master7
f5d9c9b7fc Translated using Weblate (Polish)
Currently translated at 100.0% (6100 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/pl/
2025-04-08 07:22:06 +00:00
jprusch
9cb1f0b93b Translated using Weblate (German)
Currently translated at 100.0% (6100 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/de/
2025-04-08 07:22:06 +00:00
Benjamin Danon
a83416ed76 Translated using Weblate (French)
Currently translated at 82.0% (5008 of 6100 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/fr/
2025-04-08 07:22:06 +00:00
Harshil Sharma
d2173eb664 Show channel banner in channel (#30514)
* Adde MySQL and Postgres migrations

* Replaced select * with column names

* removed all * from channel SQL store

* cleanup

* Fixed a duplicate column

* cleanup

* Added migrations and store support

* WIP

* used channelname slice in a missed place

* Handled patch

* Added app level tests

* Added API layer tests

* Added API layer tests

* WIP

* converted to query builder

* cleanupo

* added not null and default constraints

* Fixed test

* fixed file name

* review fixes

* review fixes

* updated migration file

* fixed text

* Review fixes

* WIP

* rendered banner

* WPI

* Fixed tooltip and markdown styling

* test: Add comprehensive tests for ChannelBanner component

* refactor: Use renderWithContext in channel_banner test

* WIP

* updated channel banner test

* Updated channel view test

* getContrastingSimpleColor tests

* Added tests

* rendered channel banner

* feat: Add comprehensive tests for ChannelBanner component

* Updated tests

* Made a lazy component

* Added underline to links in channel banner

* renamed param

* Created a selector for checking if channel banner is enabled or disabled

* addded test file

* test: Add tests for selectShowChannelBanner selector

* Added tests

* lint fix

* Used premium SKU constants

* Fixed a redux test
2025-04-04 14:53:03 +05:30
Maria A Nunez
e4124ed320 Input Field: Fix accessibility issues with errors not associated to proper form fields (#30430)
* Cursor first pass

* Iterating

* Updated snapshots

* Alert role only for error or warning

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
2025-04-03 15:08:36 -04:00
Harrison Healey
a4c745c97b MM-61589 Keep Help and Preview links visible on small screen sizes (#30604) 2025-04-03 14:28:16 -04:00
Devin Binnie
5156c8d836 [MM-63280] Forward ref properly through SwitchChannelSuggestion (#30580) 2025-04-03 14:26:28 -04:00
Harrison Healey
2dcf6bffb1 MM-63451 Rely on MUI's MenuList to handle focus when opening menus (#30585)
* MM-63451 Rely on MUI's MenuList to handle focus when opening menus

* MM-63451 Add E2E tests for keyboard accessibility in the account menu

* Run prettier on E2E tests

* And check in the rest of those changes

* Fix lint
2025-04-03 14:22:42 -04:00
Harshil Sharma
a9f09cadc2 Premium SKU (#30396)
* Added premium SKU

* removed duplicate enterprise license check functions

* Added license check on API layer

* lint fix

* lint fix

* refactured signature:

* test: Add comprehensive tests for license tier check functions

* fixed test

* text update

* optimised license checks

* fixedf test

* Updated license valid function

* webapp license checks

* handling prekium SKU in webappp:

* added plugin api method and general refactoring

* Updated tests

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
2025-04-03 13:07:54 +05:30
Scott Bishel
21ca303b5e MM-62698 Handles additional property types in the profile popover form. (#30318)
* fix for testing with server

* revert feature flag

* update profile popover for other property types

* lint fixes and test fixes

* src/components/user_settings/general/user_settings_general.tsx

* update from review

* lint fixes and type fixes

* review fixes

* fixes for property changes

* update properties

* fix tests

* fix tests

* update when_set and hidden

* update test for visiibility hidden

* add required fields to tests

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
2025-04-02 17:41:06 -06:00
Scott Bishel
c417ac1b57 MM-62699 Add additional property types to user profile form (#30317)
* fix for testing with server

* revert feature flag

* user settings to handle other property types

* lint fixes

* update css so container will grow with several multiselect values

* change CPASelectOption to PropertyFieldOption

* lint fix

* lint and style fix

* review fixes

* fixes for change in UserPropertyFields

* update url validation

* update url validation

* update unit test

* Update webapp/channels/src/components/user_settings/general/user_settings_general.tsx

Co-authored-by: Caleb Roseland <caleb@calebroseland.com>

* fix: Handle missing options in user settings attribute rendering

* update handling of single/multi values

* remove unused file

* partially update properties

* make attrs property required

* revert change to user_properties_utils.ts

* fix bad merge

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
Co-authored-by: Caleb Roseland <caleb@calebroseland.com>
2025-04-02 15:15:14 -06:00