Commit graph

1800 commits

Author SHA1 Message Date
Šimon Brandner
33979b3354
Added a tooltip
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 08:18:27 +01:00
Šimon Brandner
27b2b5b65d
Make componentDidMount async
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-09 13:19:12 +01:00
Šimon Brandner
98e602f544
Avoid delayed displaying of sources
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-09 13:07:23 +01:00
David Baker
cf5ec7720c
Merge pull request #5525 from SimonBrandner/fix-screen-sharing
Fix desktop Matrix screen sharing and add a screen/window picker
2021-02-08 13:54:51 +00:00
Šimon Brandner
ffc0230ab4
Use resource as a fallback
This is useful mainly for the tests they would otherwise fail as there is no room name to display while the tests are run.

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-06 19:09:34 +01:00
Šimon Brandner
58ab5c36bb
Merge branch 'develop' into show-room-name 2021-02-06 15:27:04 +01:00
Šimon Brandner
cc38bcf333
Display room name
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-06 15:09:21 +01:00
Šimon Brandner
f2d236d429
Use LayoutPropType
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:17:30 +01:00
Travis Ralston
97584af947 Fix z-index of stickerpicker 2021-02-04 02:50:54 -07:00
Šimon Brandner
022781e9bc
Added a comment about updating thumbnails
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-01 16:03:20 +01:00
Šimon Brandner
28ff4e6955
Move DesktopCapturerSource
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-01 15:53:53 +01:00
J. Ryan Stinnett
89b835dd20
Merge pull request #5575 from matrix-org/jryans/no-event-pills
Remove pills from event permalinks with text
2021-02-01 10:53:22 +00:00
Michael Telatynski
62712159f6
Merge pull request #5578 from matrix-org/t3chguy/sso_fixes
Improve SSO auth flow
2021-01-29 13:28:53 +00:00
Michael Telatynski
0167c3cefb Iterate SSO auth ux styling 2021-01-29 13:04:05 +00:00
Michael Telatynski
1eb88c988c Add tooltips to mini sso buttons 2021-01-29 12:05:15 +00:00
Travis Ralston
41682fa8d2
Update src/components/views/elements/PersistedElement.js 2021-01-27 20:37:04 -07:00
Michael Telatynski
34ae766893 Wire up MSC2858 brand attribute
For better brand adherance.
Also removes old support for https IdP icons.
2021-01-27 16:15:47 +00:00
J. Ryan Stinnett
fa3ace8473 Rework message pilling to ignore event permalinks
This removes pills from event permalinks since they hide the text associated
with the link, which can cause nonsensical messages since words have been
removed. In addition, this moves away from fragile regexs to more
straightforward code to parse links and adds a test for this case.

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5188
Fixes https://github.com/vector-im/element-web/issues/15159
2021-01-27 11:46:20 +00:00
J. Ryan Stinnett
71921ad705 Remove unused isPillUrl 2021-01-26 14:11:09 +00:00
J. Ryan Stinnett
501c73ae4b Remove outdated comment 2021-01-26 14:08:39 +00:00
Šimon Brandner
02b552f958
Fixed 15221
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-24 12:56:44 +01:00
Šimon Brandner
972c947049
More generic layout setting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-23 10:35:35 +01:00
Šimon Brandner
e2abbf9a7c
Merge branch 'develop' into improve-image-view
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-23 08:12:32 +01:00
Michael Telatynski
bb50cd56ee
Merge pull request #5558 from matrix-org/t3hcguy/socialloginfixup
Improve styling of SSO Buttons for multiple IdPs
2021-01-22 10:37:46 +00:00
J. Ryan Stinnett
35bee5c5ea
Merge pull request #5522 from SimonBrandner/room-dialog-fixes
Fixes for the general tab in the room dialog
2021-01-22 10:34:37 +00:00
Michael Telatynski
928ddeb718 Improve styling of SSO Buttons for multiple IdPs 2021-01-21 13:33:25 +00:00
J. Ryan Stinnett
6d932e1352 Fix lint errors 2021-01-14 17:38:06 +00:00
J. Ryan Stinnett
658a8dfa99 Use device storage for allowed widgets if account data not supported
With guest accounts, account data is not available, so we use device storage to
hold allowed widgets as a good enough place.

Fixes https://github.com/vector-im/element-web/issues/16145
2021-01-14 17:30:25 +00:00
Šimon Brandner
eca8ef3b35
Update thumbnails
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-14 12:44:48 +01:00
Šimon Brandner
8f91b04eb3
Use contextBridge
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-14 08:35:04 +01:00
Šimon Brandner
b2850e11db
Merge remote-tracking branch 'upstream/develop' into fix-screen-sharing 2021-01-13 19:47:07 +01:00
Šimon Brandner
20b1720258
Added a line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 21:08:25 +01:00
Šimon Brandner
b1010189be
Tabbed copyright link
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 20:41:33 +01:00
Šimon Brandner
bb7e76f69e
Hopefully fixed copyrights
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 20:36:54 +01:00
Šimon Brandner
99dc829369
Fixed translation
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 20:27:11 +01:00
Šimon Brandner
d497594a6f
Remove unnecessary line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 19:55:08 +01:00
Šimon Brandner
8652c2e653
Fixed class names
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 19:49:09 +01:00
Šimon Brandner
efd889c09a
Remove commented line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 19:32:59 +01:00
Šimon Brandner
4185d53468
Disable add button if the field is empty
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-29 16:30:20 +01:00
Šimon Brandner
7912091bc5
Revert "Hide add button when new item field is empty"
This reverts commit fa99c2e8c5.

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-29 16:08:54 +01:00
Šimon Brandner
14a3b88497
Consistent formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-28 08:15:54 +01:00
Michael Telatynski
7af1471052 delint2 2020-12-27 21:46:56 +00:00
Michael Telatynski
ce5b244a24 delint 2020-12-27 21:25:48 +00:00
Michael Telatynski
8ee65258be Unfloat the MiniAvatarUploader "tooltip" 2020-12-27 21:13:01 +00:00
Michael Telatynski
f4190ccae2 Fix mini avatar uploader "working" even without permissions 2020-12-27 21:01:51 +00:00
Šimon Brandner
5779a543c9
Type cleanup
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-26 18:10:50 +01:00
Šimon Brandner
322afe6450
Remove log
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-26 18:00:08 +01:00
Šimon Brandner
675ca58eef
Improve UI
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-26 16:56:25 +01:00
Šimon Brandner
eae3c1c496
Get screen-sharing working, somehow
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-26 08:32:51 +01:00
Šimon Brandner
fa99c2e8c5 Hide add button when new item field is empty
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-22 13:14:55 +01:00
Šimon Brandner
997e08f21e Reorganize buttons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-21 10:07:46 +01:00
Šimon Brandner
f771b7ac98 Added zoom button
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:37:31 +01:00
Šimon Brandner
3d62138cbd Set max zoom
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:28:19 +01:00
Šimon Brandner
096fb33397 Always allow moving
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:19:32 +01:00
Šimon Brandner
61c5e7e8f1 Reorder label items
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:15:39 +01:00
Šimon Brandner
f0abd52130 Remove the need to press ctrl while zooming
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:09:01 +01:00
Šimon Brandner
776b0e8198 Change comment styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:05:27 +01:00
Šimon Brandner
18de342fa1 Fixed translation issue while the image is rotated
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:00:11 +01:00
Šimon Brandner
6758734593 Remove panel element
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 19:48:24 +01:00
Šimon Brandner
7dd7aeffed Remove imageBox
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 18:19:11 +01:00
Šimon Brandner
f9884b1cc7 Implement translation
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 17:40:16 +01:00
Šimon Brandner
be9b68a4dd Use height and width properties for scaling again
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 10:07:03 +01:00
Šimon Brandner
ec5fcaf59b Added a comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 09:51:57 +01:00
Šimon Brandner
ae25ff8216 Switched to scale
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-19 15:54:26 +01:00
Šimon Brandner
2c5f3f31b1 Fixed Chromium issues - made listner non-passive
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-19 13:30:56 +01:00
Šimon Brandner
3c306bc54b Added icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-19 12:54:55 +01:00
Šimon Brandner
2040815f66 Implement zooming
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-19 10:20:15 +01:00
Šimon Brandner
8aabe1f330 Reorganized elements
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-19 09:26:09 +01:00
Michael Telatynski
2567fcd045 add brackets for operator precedence 2020-12-17 12:02:16 +00:00
Michael Telatynski
1b2cfa5f05 Social Login support both https and mxc icons 2020-12-17 10:34:49 +00:00
Michael Telatynski
940fdb8e2f Better adhere to MSC process 2020-12-16 10:07:07 +00:00
Michael Telatynski
5be65a525d Improve identifiers and code readability 2020-12-09 11:14:06 +00:00
Michael Telatynski
e896b009f1 Handle manual hs urls better 2020-12-08 10:58:16 +00:00
Travis Ralston
603a1c8ffb Fix linter 2020-12-07 15:37:26 -07:00
Travis Ralston
550a5220d9 Undocumented linter cleanup 2020-12-07 15:12:26 -07:00
Travis Ralston
2c992c456e Merge remote-tracking branch 'origin/develop' into feature_confetti#14676 2020-12-07 14:58:56 -07:00
Michael Telatynski
1afece9a14 Fix React complaining about unknown DOM props 2020-12-03 12:20:48 +00:00
Michael Telatynski
0fd9b55b95 Fix SSO buttons for Social Logins 2020-12-03 11:08:16 +00:00
Šimon Brandner
19d9ea3477 Merge branch 'develop' into feature-multi-language-spell-check 2020-12-03 12:06:43 +01:00
Šimon Brandner
db5bc0cb7a Fix formatting 2020-12-01 20:36:25 +01:00
nurjinn jafar
111515e794 fixed linter problem 2020-12-01 17:37:28 +01:00
Michael Telatynski
eb25c39318 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
 Conflicts:
	src/i18n/strings/en_EN.json
2020-12-01 16:33:29 +00:00
Šimon Brandner
e9203d7571 Removed unnecessary imports 2020-12-01 17:21:23 +01:00
nurjinn jafar
1bf7ff8994 null check added
path to confetti fixed after refactoring
2020-12-01 17:15:02 +01:00
Šimon Brandner
cf61d50df4 Added SpellCheckLanguagesDropdown 2020-12-01 16:59:21 +01:00
Šimon Brandner
5d9f5ba979 Fix indentation 2020-11-30 08:35:51 +01:00
nurjinn jafar
82023dcf42 Merge branch 'feature_confetti#14676' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676 2020-11-27 16:33:15 +01:00
nurjinn jafar
6ce5d3b044 refactored effects dir and changed effects exported name 2020-11-27 16:32:04 +01:00
Steffen Kolmer
d9c7148182 Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-11-27 16:20:35 +01:00
Travis Ralston
80f1df6d95 Don't needlessly persist user widgets
Fixes https://github.com/vector-im/element-web/issues/15842

We don't have a concept of a stickerpicker staying on screen, so don't make it a thing yet.
2020-11-26 15:09:08 -07:00
Steffen Kolmer
27312c3553
Merge branch 'develop' into feature_confetti#14676 2020-11-26 18:21:28 +01:00
Michael Telatynski
86025459f4 Remove unused dialog, todo comments and other tiny tweaks 2020-11-26 15:01:12 +00:00
Michael Telatynski
1b1c482f9c Iterate tests 2020-11-25 10:22:16 +00:00
Michael Telatynski
758b47c64d Replace *ServerConfig and SignInToText with ServerPicker 2020-11-25 09:46:56 +00:00
Michael Telatynski
225d541487 Extend Field and InfoDialog with more configurability 2020-11-25 09:19:08 +00:00
Michael Telatynski
b1ca1eb3f5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-11-24 11:30:51 +00:00
Michael Telatynski
1d53a5cf23 Initial support for MSC2858 2020-11-24 11:18:11 +00:00
Travis Ralston
054560b6a7
Merge pull request #5435 from matrix-org/travis/window-widgets
Support arbitrary widgets sticking to the screen + sending stickers
2020-11-23 08:32:46 -07:00
Michael Telatynski
56ffa17b89
Merge pull request #5433 from matrix-org/t3chguy/socials_preamble
Auth typescripting and validation tweaks
2020-11-23 14:14:25 +00:00
Michael Telatynski
2263280035 Improve no email warning during registration 2020-11-23 10:25:46 +00:00
Travis Ralston
107fa98180 Support arbitrary widgets sticking to the screen + sending stickers
Following https://github.com/matrix-org/matrix-react-sdk/pull/5385, it is now possible for a widget to request these capabilities without being a video conference or sticker picker. This commit actually enables this support for those kinds of widgets.

This commit also fixes an issue in the URL templating where some variables might get set to 'undefined' - this appears to be a scoping issue, so StopGapWidget now stores the definition alongside the superclass. 

Fixes https://github.com/vector-im/element-web/issues/15001
2020-11-20 16:53:15 -07:00
Travis Ralston
5f47077a30
Merge pull request #5385 from matrix-org/travis/msc-send-widget-events
Add new widget API actions for changing rooms and sending/receiving events
2020-11-20 09:17:18 -07:00
Michael Telatynski
3dcb58f108 Convert RegistrationForm to Typescript 2020-11-20 13:25:27 +00:00
Michael Telatynski
7397cebbea Convert PasswordLogin to Typescript 2020-11-20 13:23:10 +00:00
Travis Ralston
0104164d51 Approximate the design as proposed 2020-11-19 12:06:24 -07:00
Michael Telatynski
14391a7295 Post-merge fix 2020-11-19 11:11:57 +00:00
Michael Telatynski
9b2143742a
Merge pull request #5418 from matrix-org/t3chguy/fix/muggle-hustle
Small delight tweaks to improve rough corners in the app
2020-11-18 10:07:31 +00:00
Michael Telatynski
56d24fc723
Merge pull request #5419 from matrix-org/t3chguy/fix/15701
Fix New Room Intro invite to this room button
2020-11-11 18:32:45 +00:00
Michael Telatynski
bf62960e1a
Merge pull request #5413 from matrix-org/t3chguy/fix/11415
Change how we expose Role in User Info and hide in DMs
2020-11-11 18:15:46 +00:00
Michael Telatynski
2adc578d28 mark the onClick prop required on AccessibleButton 2020-11-11 17:31:30 +00:00
Michael Telatynski
d0513406ee Pass filter text when clicking explore/dm prompt 2020-11-11 17:04:09 +00:00
Matthew Hodgson
cb2ce6f90b
Merge pull request #5403 from matrix-org/matthew/username-tooltip
hide some validation tooltips if fields are valid.
2020-11-10 18:29:37 +00:00
Matthew Hodgson
36aa80fb64
Update src/components/views/elements/Validation.tsx
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2020-11-10 18:29:28 +00:00
Michael Telatynski
5fb86f74d7 Remove unused IconButton 2020-11-10 12:06:56 +00:00
Michael Telatynski
80bb091cc5 Iterate PR 2020-11-10 10:00:55 +00:00
Matthew Hodgson
99fb62cc68 fix lint yet again 2020-11-09 01:37:17 +00:00
Matthew Hodgson
ef09ff6615 lint again 2020-11-09 01:16:58 +00:00
Matthew Hodgson
2cac5f05a1 lint 2020-11-09 01:16:38 +00:00
Matthew Hodgson
5bde16ccbb hide some validation tooltips if fields are valid.
fixes https://github.com/vector-im/element-web/issues/9683
2020-11-09 01:07:15 +00:00
Michael Telatynski
6aeea3e38e Extract MiniAvatarUploader into a reusable component 2020-11-05 15:42:45 +00:00
David Baker
7ec1d5a881 Fix a bunch of silly lint errors
At some point the script to generate .eslintignore.errorfiles had
been run and added all these files to the ignore list, often because
they lacked a space before a brace or something equally mundane.

These are the easiest bunch.
2020-10-30 18:18:17 +00:00
nurjinn jafar
19395f3c3c null checks added 2020-10-26 16:37:45 +01:00
MaHa-Nordeck
674060ed93 fixed spacing 2020-10-22 15:28:30 +02:00
MaHa-Nordeck
46eb5cdb1b Minor improvements
* Made color generation dependant on gradient usage.
* Changed a loop to use for of
2020-10-22 14:01:16 +02:00
Steffen Kolmer
1c556c97d3 Added some code documentation 2020-10-21 19:06:10 +02:00
Steffen Kolmer
3ea4560019 Moved effect options to configuration 2020-10-21 17:58:54 +02:00
Michael Telatynski
6196c03c0a Fix stickerpicker not having correct contexts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 16:05:20 +01:00
Steffen Kolmer
cb79e38377 Better initialization and check if canvas gets unmounted 2020-10-21 17:04:01 +02:00
Steffen Kolmer
335774b6ff Fixed more linter errors 2020-10-21 16:03:22 +02:00
Steffen Kolmer
2f83771eab Fixed more eslint errors 2020-10-21 15:15:26 +02:00
Steffen Kolmer
906686b640 Fixed more linter warnings 2020-10-21 15:06:05 +02:00
Steffen Kolmer
6f4c5d1b08 fixed build error 2020-10-21 14:56:04 +02:00
Steffen Kolmer
8847561795 Added additional module exports 2020-10-21 14:48:11 +02:00
Steffen Kolmer
8728e12242 Some code optimizations 2020-10-21 14:43:09 +02:00
Steffen Kolmer
c7d535d2d3 Fixed some formatting issues 2020-10-21 14:29:25 +02:00
Steffen Kolmer
daa03098f3 Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-10-21 14:21:25 +02:00
Steffen Kolmer
047c29731b Added missing translation 2020-10-21 14:15:27 +02:00
Steffen Kolmer
d4ec1dd775 Refactoring 2020-10-21 13:56:58 +02:00
Michael Telatynski
4e12aeca9e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets
 Conflicts:
	src/components/views/elements/AppTile.js
2020-10-21 12:48:51 +01:00
nurjinn jafar
1c6d28b861 refactoring roomView / slashCommands / SendMessageComposer with the new effects configurations and fix confetti animation timeout 2020-10-21 13:37:36 +02:00
Michael Telatynski
bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets
 Conflicts:
	src/components/views/elements/AppTile.js
	src/utils/WidgetUtils.ts
2020-10-19 20:50:16 +01:00
Steffen Kolmer
607e33feba Extensibility, TypeScript and lazy loading 2020-10-19 21:25:01 +02:00
Michael Telatynski
744a4abd1c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 13:08:17 +01:00
Steffen Kolmer
41160ff08e Render confetti the react way 2020-10-19 13:54:09 +02:00
Steffen Kolmer
c86964cd5e Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-10-19 13:15:33 +02:00
Steffen Kolmer
6e97baf09f Added license 2020-10-19 12:53:17 +02:00
Michael Telatynski
a6c81a903c Iterate with new buttons and resize locking
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-15 11:14:48 +01:00
Arsh Sharma
49d99c6dc7 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10 2020-10-14 16:58:05 +05:30
Michael Telatynski
d36fafd0c6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
 Conflicts:
	res/css/views/rooms/_AppsDrawer.scss
	src/components/views/elements/AppTile.js
	src/components/views/rooms/AppsDrawer.js
2020-10-14 10:23:44 +01:00
Travis Ralston
294c35347c Ensure widgets are destroyed cleanly when minimized
Fixes https://github.com/vector-im/element-web/issues/15444 (an artifact of joining a call then minimizing the widget)

Also fixes other issues relating to widgets not loading when being minimized/maximized.
2020-10-13 14:55:44 -06:00