toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
3491 commits 4 branches 163 tags 171 MiB
Commit graph

3491 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ashish Bhate
f74e94d6cd
[MM-30994] tweak emoji search options for better results (#5120) 
* [MM-30994] tweak emooji search options for better results

* Apply updated fuse options to emoji picker

Co-authored-by: Miguel Alatzar <this.migbot@gmail.com>
 2021-01-26 16:57:02 -07:00
Elias Nahum
9568a4592c
MM-32183 Fix in-app notification + Android ack (#5132) 
* MM-32183 Fix in-app notification + Android ack

* comment suggested change

Co-authored-by: Miguel Alatzar <migbot@users.noreply.github.com>

Co-authored-by: Miguel Alatzar <migbot@users.noreply.github.com>
 2021-01-26 14:21:02 -07:00
Weblate (bot)
ab12721499
Translations update from Weblate (#5134) 
* Translated using Weblate (Swedish)

Currently translated at 100.0% (658 of 658 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/sv/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (658 of 658 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/nl/

Translated using Weblate (Dutch)

Currently translated at 98.3% (647 of 658 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/nl/

* Translated using Weblate (Turkish)

Currently translated at 100.0% (658 of 658 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/tr/

* Translated using Weblate (Bulgarian)

Currently translated at 100.0% (658 of 658 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/bg/

Translated using Weblate (Bulgarian)

Currently translated at 100.0% (658 of 658 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/bg/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (658 of 658 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ja/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (658 of 658 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/es/

* Translated using Weblate (Romanian)

Currently translated at 100.0% (658 of 658 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ro/

Co-authored-by: majo <martinjohnson@bahnhof.se>
Co-authored-by: Tom De Moor <tom@controlaltdieliet.be>
Co-authored-by: Kaya Zeren <kayazeren@gmail.com>
Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com>
Co-authored-by: kaakaa <stooner.hoe@gmail.com>
Co-authored-by: Elias  Nahum <elias@mattermost.com>
Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net>
 2021-01-25 21:51:41 +01:00
Elias Nahum
5381062bfa
MM-31990 fix limit reacting to a post to 40 different emojis (#5121) 
* MM-31990 fix limit reacting to a post to 40 different emojis

* Fix selector
 2021-01-21 12:14:49 -07:00
Weblate (bot)
f64a7dc3ad
Translations update from Weblate (#5125) 
* Translated using Weblate (French)

Currently translated at 92.1% (599 of 650 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/fr/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (650 of 650 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ja/

* Translated using Weblate (Romanian)

Currently translated at 100.0% (650 of 650 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ro/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (650 of 650 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/sv/

* Translated using Weblate (Bulgarian)

Currently translated at 100.0% (650 of 650 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/bg/

* Translated using Weblate (Turkish)

Currently translated at 100.0% (650 of 650 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/tr/

* Translated using Weblate (Spanish)

Currently translated at 99.5% (647 of 650 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/es/

Co-authored-by: William Farelly <wfarelly@orange.fr>
Co-authored-by: kaakaa <stooner.hoe@gmail.com>
Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net>
Co-authored-by: majo <martinjohnson@bahnhof.se>
Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com>
Co-authored-by: Kaya Zeren <kayazeren@gmail.com>
Co-authored-by: Elias  Nahum <elias@mattermost.com>
 2021-01-19 20:43:41 +01:00
Anurag Shivarathri
d11d613815
OAuth through OS browser, added google login & open id methods (#5075) 
* Initialised SSO with linking

* Fixed lint errors

* Added translation and version check

* Added translation & detox file: WIP

* Added google logo and login button

* Added openid login option

* Added tests

* Added fallback support for google

* Added server check for openid

* Removed unwated memos

* Server support changed to 5.32

* Added try catch for Linking openurl

* Removed 'or'

* Changed test case version to 5.32

* Changed server version to 5.32

* Update assets/base/i18n/en.json

Co-authored-by: Katie Wiersgalla <39744472+wiersgallak@users.noreply.github.com>

* Update assets/base/i18n/en.json

Co-authored-by: Katie Wiersgalla <39744472+wiersgallak@users.noreply.github.com>

* Update assets/base/i18n/en.json

Co-authored-by: Katie Wiersgalla <39744472+wiersgallak@users.noreply.github.com>

* Update app/screens/sso/sso_with_redirect_url.tsx

Co-authored-by: Hossein <hahmadia@users.noreply.github.com>

* Update assets/base/i18n/en.json

Co-authored-by: Katie Wiersgalla <39744472+wiersgallak@users.noreply.github.com>

* Added new custom url scheme for auth

* Added custom url scheme based on app build type, custom user agent for only google & misc typo fixes

* Added check for Deviceinfo

* Reverted to openLink

* Using tryOpenURL instead of Linking.openURL

* Changed office365 url

* Handling cookie read error caused on localhost

* Fixed lint errors

* Updated version in tests

Co-authored-by: Anurag Shivarathri <anurag@13.local>
Co-authored-by: Katie Wiersgalla <39744472+wiersgallak@users.noreply.github.com>
Co-authored-by: Hossein <hahmadia@users.noreply.github.com>
 2021-01-19 21:15:24 +05:30
Rohitesh Gupta
5197332d02
Create codeql-analysis (#5123) 2021-01-18 13:22:07 -07:00
Elias Nahum
ceed579a68
MM-32008 Do not cache request body (#5117) 2021-01-15 11:26:39 -03:00
Joseph Baylon
e5104b8dd9
Fix CustomDetoxEnvironment constructor args (#5118) 2021-01-14 14:56:39 -08:00
Elias Nahum
a8a4d72075
Upgrade Dependencies (#5103) 
* Update fastlane

* Update detox & deps

* Upgrade cocoapods

* Upgrade dependencies
 2021-01-13 12:36:31 -07:00
Elias Nahum
e77bd566fc
MM-31196 Add missing "(you)" in at_mention autocomplete (#5105) 2021-01-13 12:18:46 -07:00
Elias Nahum
9fc49c2fe5
MM-31764 Fix image attachment layout when permanent sidebar is visible (#5115) 2021-01-13 14:57:04 -03:00
ctlaltdieliet
916e38c597
Added Bulgarian and Swedish translation (#5093) 
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2021-01-12 16:15:12 +01:00
Weblate (bot)
aaa45a1164
Translations update from Weblate (#5111) 
* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.5% (647 of 650 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/pt_BR/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (650 of 650 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/sv/

Co-authored-by: rodrigocorsi <rodrigocorsi@gmail.com>
Co-authored-by: majo <martinjohnson@bahnhof.se>
 2021-01-12 10:12:12 +01:00
Miguel Alatzar
3338511355
Bump app build number to 341 (#5112) 2021-01-11 16:00:55 -07:00
Ashish Bhate
aaba9fa472
[MM-30976] fix viewing/joining archived channels using channel links (#5106) 2021-01-11 15:51:14 -07:00
Elias Nahum
2e790212f9
MM-31705 allow file local path to use multiple dots (#5109) 
* MM-31705 allow file local path to use multiple dots

* Add unit test
 2021-01-11 12:53:06 -07:00
Elias Nahum
0d590c742f
MM-31873 fix race condition that prevented the device id to be registered on Android (#5104) 2021-01-11 11:30:11 -07:00
Joseph Baylon
7a1ede72e7
MM-31272 Detox/E2E - Add e2e tests for MM-T3232 and MM-T3234 (#5100) 2021-01-11 22:25:36 +08:00
Ashish Bhate
1a75eed6bc
MM-29104: Add avatars component (#5001) 
Summary
Adds an avatar list component. It is required for the new collapsed reply threads feature. The feature design is at https://www.figma.com/file/t2KIwZnxb7h94249k6XdOp/MM-18107-Mobile-Threads-Overhaul and https://mattermost.atlassian.net/wiki/spaces/Threads/pages/1003945985/Mobile+User+Experience

Ticket Link
https://mattermost.atlassian.net/browse/MM-29104
 2021-01-11 16:09:13 +05:30
Joseph Baylon
2fad44fae0
MM-31272 Detox/E2E - Add e2e test for MM-T3646 (#5092) 
* MM-31272 Detox/E2E - Add e2e test for MM-T3646

* Remove unnecessary async
 2021-01-11 17:10:59 +08:00
Ashish Bhate
c3f86d1797
[MM-31778]: fix false error message on channel join (#5098) 2021-01-08 10:56:09 -07:00
Weblate (bot)
86ae89d3eb
Translations update from Weblate (#5090) 
* Added translation using Weblate (Bulgarian)

Added translation using Weblate (Swedish)

* Translated using Weblate (Bulgarian)

Currently translated at 99.8% (645 of 646 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/bg/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (646 of 646 strings)

Translation: mattermost-languages-shipped/mattermost-mobile
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/sv/

Co-authored-by: Tom De Moor <tom@controlaltdieliet.be>
Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com>
Co-authored-by: majo <martinjohnson@bahnhof.se>
 2021-01-08 08:47:22 -03:00
Miguel Alatzar
407333b446
Bump app build number to 340 (#5096) 2021-01-07 15:29:38 -07:00
Miguel Alatzar
ac85110ce7
Default to an empty channel object (#5094) 2021-01-07 15:08:29 -07:00
Miguel Alatzar
7702c050bf
Revert "[MM-29225] Define LSApplicationQueriesSchemes so Linking.canO… (#5067) 
* Revert "[MM-29225] Define LSApplicationQueriesSchemes so Linking.canOpenURL can work (#5007)"

This reverts commit f3baaa6aa3.

* Create and use tryOpenURL

* Add missing onError functions

* Update app/components/markdown/markdown_link/markdown_link.js

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
 2021-01-06 09:11:27 -07:00
Weblate (bot)
c6c72ea610
Translations update from Weblate (#5088) 
* Translated using Weblate (Korean)

Currently translated at 100.0% (645 of 645 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ko/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (645 of 645 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/pt_BR/

* Translated using Weblate (Romanian)

Currently translated at 100.0% (645 of 645 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ro/

* Translated using Weblate (Ukrainian)

Currently translated at 97.9% (632 of 645 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/uk/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (645 of 645 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/zh_Hans/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (645 of 645 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ja/

Co-authored-by: Lee Dae-yeop <leedaeyeop@gmail.com>
Co-authored-by: rodrigocorsi <rodrigocorsi@gmail.com>
Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net>
Co-authored-by: Ivan Novikov <monah1744@gmail.com>
Co-authored-by: aeomin <lin@aeomin.net>
Co-authored-by: kaakaa <stooner.hoe@gmail.com>
 2021-01-05 13:36:46 +01:00
Miguel Alatzar
53885d2bf9
Bump app build number to 339 (#5086) 2021-01-04 15:45:18 -07:00
Miguel Alatzar
ff1901eb61
Bump app version number to 1.39.0 (#5084) 2021-01-04 15:34:35 -07:00
Daniel Espino García
7bb777f4b3
Handle go to location from CommandResponse (#4620) 
* First draft to handle go to location on mobile

* Fix lint

* Fix test

* Remove unnecessary change

* Add not handled cases

* Add i18n missing string

* Fix typo

* Extract handleGotoLocation into an action

* Fix minor issues and extract showPermalinkView to an action

* Fix minor issues and extract showPermalinkView to an action

* Add missing change

* Fix this reference

* Remove unneeded event handlers, sort imports, early handle errors, make group channel visible, remove duplications and move functions to the right place

* Fix tests

* Handle error when opening permalink
 2021-01-04 15:06:37 -07:00
Elisabeth Kulzer
8b8cd1ab4d
Add check for empty translation source strings (#5044) 
* Update sha

* Update check-deps cache

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2021-01-04 16:05:10 +01:00
Elias Nahum
367534df12
Bump app build number to 338 and version to 1.38.1 (#5058) 
* Bump app build number to 338

* Bump app version number to 1.38.1

* Update fastlane
 2020-12-18 20:59:58 -03:00
Miguel Alatzar
f577685264
Fix ChannelLoader prop warning (#5055) 
* Fix ChannelLoader prop warning

* Missing semicolon
 2020-12-18 13:48:28 -07:00
Elias Nahum
673f10770d
Set Tablet orientation explicitly to all (#5049) 2020-12-18 17:17:22 -03:00
Elias Nahum
be75a688de
Update Rudder (#5048) 2020-12-18 16:35:13 -03:00
Miguel Alatzar
8fb6510a32
[MM-31376] Do not subtract offset from accessories container (#5042) 
* Do not subtract offset from accessories container

* Missing space

* Adjust autcomplete offsetY

* Adjust placement of autocomplete

* Space fix

* Unused onLayout
 2020-12-17 19:14:00 -07:00
Joseph Baylon
7aebfd0b13
MM-30286 Detox/E2E: Add e2e test for MM-T3249 and added useful helpers (#4990) 
* MM-30286 Detox/E2E: Add e2e test for MM-T3249 and added useful helper functions

* Update app/components/sidebars/main/channels_list/channels_list.js

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>

* Add team icon content helper query

* Fixed reset for teams

* MM-30286 Detox/E2E: Add e2e test for MM-T3235 (#5003)

* MM-30286 Detox/E2E: Add e2e test for MM-T3255 (#5006)

* Fix merge issues

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-15 17:24:45 -08:00
Weblate (bot)
8d9ed361f8
Translations update from Weblate (#5040) 
* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/

* Translated using Weblate (Turkish)

Currently translated at 100.0% (645 of 645 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/tr/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (645 of 645 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/nl/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (645 of 645 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/es/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (645 of 645 strings)

Translation: mattermost-languages-shipped/mattermost-mobile_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/zh_Hans/

Co-authored-by: Kaya Zeren <kayazeren@gmail.com>
Co-authored-by: Tom De Moor <tom@controlaltdieliet.be>
Co-authored-by: Elias  Nahum <elias@mattermost.com>
Co-authored-by: aeomin <lin@aeomin.net>
 2020-12-14 21:49:42 +01:00
Miguel Alatzar
25d5b48db1
Bump app build number to 337 (#5035) 2020-12-11 12:05:55 -07:00
Miguel Alatzar
68d76af4dd
[MM-29381] Show an indicator if channel is still loading after 10 seconds (#5031) 
* Show still-loading indicator

* Update snapshot test

* Call retryLoadChannels on a 10 second interval

* Select default team on retryLoad if no currentTeamId

* Fix use of jest.useFakeTimers
 2020-12-11 11:32:56 -07:00
Guillermo Vayá
0ee7b60e84
[MM-30857] request postssince on reconnect (#5000) 
* [MM-30857] request postssince on reconnect

* [MM-30857] add test

* Address CR, add debounce in case of unstable connection

* remove leftovers

* Address review comments

* remove previous changes

* fix tests
 2020-12-10 20:49:44 -07:00
dependabot[bot]
ad6d3f42c3
Bump ini from 1.3.5 to 1.3.7 in /detox (#5023) 
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-11 09:33:15 +08:00
A C SREEDHAR REDDY
f0598dde54
MM-18998 Add emojis in the post to recent emojis (#4986) 
* add emojis available in the post to recent emojis

* made add recent reactions more performant

* lint fix

* added support for namedicons, update only if send post is success

* updated emojiUnicode function

* limit the number of recent emojis

* added e2e tests for MM-T3495

* filter out aliases

* Typo fix

* return data:true when success false when fails

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-10 20:20:40 -03:00
Miguel Alatzar
170ef360c1
Improve upload attachment error handling (#5026) 2020-12-10 16:08:13 -07:00
Miguel Alatzar
b3796e162c
[MM-31231] Fix gap between post list and draft input (#5024) 
* Update keyboard tracking view patch

* Always subtract bottomSafeArea if shown or will show

* Subtract bottomSafeArea if height is not 0 and is shown or will show
 2020-12-10 19:39:15 -03:00
Elias Nahum
9abc89129b
MM-31202 | MM-30866 fix: Video playback button & hide header footer on playback (#5014) 
* MM-31202 | MM-30866 fix: Video playback button & hide header footer on playback

* Feedback review
 2020-12-10 18:47:54 -03:00
Miguel Alatzar
7088481ac6
Check for undefined metadata images (#5021) 2020-12-10 13:55:49 -07:00
Ed Trist
c106e9f973
[MM-23391] Sort sidebar teams order by user preference (#4911) 
* [MM-23391] Sort sidebar teams order by user preference

* Update imports

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>

* Small changes to selector from review

* Select first ordered team in user preference on login

* Check teams length instead

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>

* Return early if teamsOrder is empty

* Return sorted copy of teams instead of mutating original array

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-10 17:35:05 -03:00
A C SREEDHAR REDDY
47b62daccb
filtered_list : removed deprecated lifecycles and memoized dataSource (#4989) 
* filtered_list: memoized dataSource instead of storing in a state

* removed deprecated lifecycles

* removed if
 2020-12-10 16:37:55 -03:00
Miguel Alatzar
77bc6257ac
[MM-31216] iOS - Only set badge to 0 if there are no delivered notifications or it is forced (#5015) 
* Only set badge to 0 if there are no delivered notifications

* Missing semicolon
 2020-12-10 12:29:47 -07:00