Robin Townsend
c9c53dbcd7
Add tooltips to message previews
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-13 12:02:22 -04:00
Michael Telatynski
ae5b6ef831
Merge pull request #5854 from matrix-org/t3chguy/toml/hooks1
...
Fix useRoomPowerLevels hook
2021-04-13 11:29:02 +01:00
Michael Telatynski
1572a53af9
Fix useRoomPowerLevels hook
2021-04-13 10:39:09 +01:00
Michael Telatynski
c25df51534
Prevent state events being rendered with invalid state keys
2021-04-13 09:40:44 +01:00
Michael Telatynski
e79ad34fbd
EventTile make use of EventType enum
...
Removes m.room.encryption from non-state list as it makes no sense
2021-04-13 09:34:37 +01:00
Šimon Brandner
f9fde3670d
Set target to _blank
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:15:42 +02:00
Šimon Brandner
b1091a22a3
Don't render context menu button if mxEvent is missing
...
The button is useless and doesn't work if we're viewing an avatar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:11:09 +02:00
Šimon Brandner
e1446f01e4
Make ImageView static
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:07:17 +02:00
Šimon Brandner
f1c80fcede
Call onCloseDialog straigh away
...
This avoids some delay in the dialog disappearing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:04:50 +02:00
Travis Ralston
72a9bda3b7
One less try/catch
2021-04-12 14:57:21 -06:00
Travis Ralston
106de5f7ba
Merge branch 'develop' into travis/reset-passphrase
2021-04-12 14:55:31 -06:00
Travis Ralston
ee9e1a72cb
Merge pull request #5838 from matrix-org/travis/add-acl-pl
...
Give server ACLs a name in 'roles & permissions' tab
2021-04-12 14:13:30 -06:00
Šimon Brandner
56b15edc58
Properly handle media
...
This might have resulted in the wrong speaker being used or worse
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-12 16:19:05 +02:00
Michael Telatynski
187eef4f2d
Merge pull request #5843 from matrix-org/t3chguy/fix/16896
...
User Info hide disambiguation as we always show MXID anyway
2021-04-12 14:49:19 +01:00
J. Ryan Stinnett
098a8711a7
Merge pull request #5847 from matrix-org/jryans/reason-message-tweaks
...
Tweak appearance of invite reason
2021-04-12 13:36:20 +01:00
J. Ryan Stinnett
8a1180bd50
Rename toggle to view
2021-04-12 13:19:13 +01:00
J. Ryan Stinnett
798a891d83
Tweak appearance of invite reason
...
This adjusts the display of invite reasons to match design feedback.
Fixes https://github.com/vector-im/element-web/issues/16869
2021-04-12 12:28:42 +01:00
Michael Telatynski
591c8ffd83
User Info hide disambiguation as we always show MXID anyway
2021-04-12 11:10:51 +01:00
J. Ryan Stinnett
bef5c6593e
Remove key sharing feature flag
2021-04-09 17:05:55 +01:00
Šimon Brandner
86dd81cda0
Fix rotation animation when rotating 360 deg
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-09 08:16:52 +02:00
Šimon Brandner
829bef45a2
Close dialog on redact
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-09 08:13:42 +02:00
Šimon Brandner
b723092ed2
Add null check
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-09 08:05:49 +02:00
Šimon Brandner
90f9d20f45
Add comment about refs to functional components
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-09 08:03:10 +02:00
Šimon Brandner
4a40f67e75
Make private
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-09 08:02:38 +02:00
Šimon Brandner
cb02c39d7f
Add name to copyright
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-09 08:01:14 +02:00
Travis Ralston
073c05543c
Give server ACLs a name in 'roles & permissions' tab
...
The default power levels event includes them, so this helps avoid them showing up as "Send m.room.server_acl events".
2021-04-08 19:20:08 -06:00
Travis Ralston
28d12016b7
Convert to using EventType enum
2021-04-08 19:18:30 -06:00
Travis Ralston
f2e2f1699b
Add some catches
2021-04-08 18:09:41 -06:00
Travis Ralston
01c5f84f60
Merge branch 'develop' into travis/reset-passphrase
2021-04-08 18:07:46 -06:00
Šimon Brandner
a3da5ee6e6
Don't play audio if the feed is local
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-08 14:32:53 +02:00
Germain Souquet
bf34e37dcc
fix hiding read receipts animation
2021-04-08 11:43:13 +01:00
Germain Souquet
86d2e577cf
Animate read receipts for all component updates
2021-04-08 10:36:38 +01:00
Germain Souquet
8d60d85570
replace velocity-animate with CSS transitions
2021-04-08 10:36:14 +01:00
Šimon Brandner
adb0877591
Merge branch 'develop' into feed
2021-04-07 19:17:35 +02:00
Travis Ralston
6e6a26f86a
Merge pull request #5710 from SimonBrandner/resizable-call-view
...
Resizable CallView
2021-04-07 11:02:46 -06:00
J. Ryan Stinnett
4462ac6203
Merge pull request #5826 from maunium/fix-no-thumbnail-video
...
Add fake fallback thumbnail URL for encrypted videos
2021-04-07 12:12:41 +01:00
Šimon Brandner
715fff6f0c
Redo and fix trailing characters in user pills
...
This removes the handling of trailing chars from createMentionParts as we need to determine whether or not to insert the trailing char differently in different situations
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-07 11:52:07 +02:00
Šimon Brandner
c2b66d0dbe
Fix inserting trailing colon after mention/pill
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-06 14:29:20 +02:00
J. Ryan Stinnett
5d027ffcf4
Merge pull request #5694 from robintown/show-invite-reasons
...
Show invite reasons
2021-04-06 10:48:54 +01:00
Travis Ralston
4d72af7916
Merge pull request #5744 from panoschal/forgot-password-validation
...
Require strong password in forgot password form
2021-04-05 00:46:47 -06:00
Šimon Brandner
202ead40c4
Merge branch 'develop' into resizable-call-view
2021-04-04 11:35:26 +02:00
Šimon Brandner
16e6f84f89
Display local feeds when connecting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-04 09:04:17 +02:00
Šimon Brandner
9324dec0d6
Rename audioOnly to videoMuted
...
This makes more sense and will match a possible mute events MSC
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-04 08:50:25 +02:00
Šimon Brandner
346784e530
Add getMember() to CallFeed
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-04 08:33:53 +02:00
Šimon Brandner
c5952f7e23
Remove VideoFeedType
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-04 08:02:51 +02:00
Šimon Brandner
88a881baec
ZOOM_DISTANCE into a const
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-03 16:19:22 +02:00
Šimon Brandner
fd8e785a5e
Why don't I convert this to Typescript while I am here?
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-03 16:14:27 +02:00
Šimon Brandner
4c64dacba4
Fix class
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-03 09:16:08 +02:00
Šimon Brandner
27ec3af03a
Merge branch 'develop' into feed
...
Looking forward to merging again! :D
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-03 09:15:55 +02:00
Tulir Asokan
522d58eb57
Add fake fallback thumbnail URL for encrypted videos
...
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2021-04-02 20:27:26 +03:00
Šimon Brandner
429c945bbf
Don't allow translation when zoomed out
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 10:37:42 +02:00
Šimon Brandner
722178e26e
Don't return false
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 10:22:10 +02:00
Šimon Brandner
2ff34000fd
Reset translation with zoom out
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 10:16:42 +02:00
Šimon Brandner
7068996b60
Animate zooming
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 10:09:53 +02:00
Šimon Brandner
33a1006488
Iterate mouse actions and cursor behaviour
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 10:01:41 +02:00
Šimon Brandner
eb83ae0a9f
Use MIN_ZOOM in contructor
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 09:40:13 +02:00
Šimon Brandner
80854ab6bb
Don't show seconds in ImageView
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 09:25:21 +02:00
Šimon Brandner
535ae086b4
Make sender bold
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 08:31:42 +02:00
Šimon Brandner
e5a563f887
Close ImageView after forward click
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 08:17:05 +02:00
Šimon Brandner
9606297f7c
Merge branch 'develop' into improve-image-view
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 08:15:51 +02:00
David Baker
cd39474d26
Merge pull request #5798 from matrix-org/dbkr/attended_transfer
...
Attended transfer
2021-04-01 17:34:30 +01:00
Travis Ralston
f86e090b8a
Update src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-04-01 08:23:32 -06:00
Panagiotis
901d5a86d0
Merge branch 'develop' into forgot-password-validation
2021-04-01 12:39:25 +03:00
Panagiotis
d2f40a859b
define PASSWORD_MIN_SCORE in one place and import from there
2021-04-01 12:30:49 +03:00
Germain Souquet
a4345811b0
Merge branch 'develop' into gsouquet-seshat-reset
2021-04-01 09:06:35 +01:00
Germain Souquet
85f9e43f01
Update seshat reset dialog copy
2021-04-01 09:03:50 +01:00
Germain Souquet
4fcb258981
Refactor SeshatResetDialog props interface to use IDialogProps
2021-04-01 08:58:39 +01:00
Travis Ralston
2ab304189d
Merge pull request #5816 from aaronraimist/redact-re-request
...
Prevent Re-request encryption keys from appearing under redacted messages
2021-03-31 18:23:47 -06:00
Robin Townsend
2477258249
Merge branch 'develop' into show-invite-reasons
2021-03-31 16:13:29 -04:00
Robin Townsend
f0333b5b1c
Show invite reasons
...
Displays the reason for invitation in the invitation dialog, requiring a
click to reveal the message.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-03-31 15:46:09 -04:00
J. Ryan Stinnett
7c4437ac9b
Merge pull request #5815 from czeidler/keybindings-follow-up
...
Keybindings follow up
2021-03-31 17:54:05 +01:00
Germain
5e21a86da9
Merge pull request #5817 from matrix-org/gsouquet-docs
...
Change copy to point to native node modules docs in element desktop
2021-03-31 12:51:36 +01:00
J. Ryan Stinnett
58343c7699
Fix search error typo
...
This fixes a typo in the recently added search error message.
2021-03-31 11:55:21 +01:00
David Baker
299467c515
Merge remote-tracking branch 'origin/develop' into dbkr/attended_transfer
2021-03-31 10:14:48 +01:00
Travis Ralston
262475f96e
Add a button to reset personal encryption state during login
2021-03-30 15:37:06 -06:00
Travis Ralston
b68fabb44b
Merge pull request #5801 from matrix-org/travis/voice-messages/waveform
...
Show waveform and timer in voice messages
2021-03-30 12:16:19 -06:00
J. Ryan Stinnett
b089f3d2f9
Merge pull request #5585 from ndarilek/label-base-avatar
...
Label unlabeled avatar button in event panel
2021-03-30 12:21:17 +01:00
Travis Ralston
54412878a1
Merge branch 'develop' into travis/voice-messages/waveform
2021-03-29 22:59:51 -06:00
Travis Ralston
9998f18d67
Stop React complaining about componentShouldUpdate()
2021-03-29 21:59:45 -06:00
Travis Ralston
e523ce6036
Fix float operations to make a little more sense.
2021-03-29 21:25:06 -06:00
Germain Souquet
2a4e327dbf
Change copy to point to native node modules docs in element desktop
2021-03-29 16:03:06 +01:00
Germain Souquet
b38f5c9459
Simplify event index store reset flow
2021-03-29 15:46:58 +01:00
Germain
096d4102b8
Merge pull request #5793 from matrix-org/gsouquet-warn-before-exit
...
Add user settings for warn before exit
2021-03-29 12:11:55 +01:00
Germain Souquet
e53a8ad992
Refactor SeshatResetDialog in TypeScript
2021-03-29 08:44:27 +01:00
Aaron Raimist
4974cb43af
Prevent Re-request encryption keys from appearing under redacted messages
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-03-28 22:35:12 -05:00
Clemens Zeidler
57cd8afbc4
Split ApplySelection into CompleteOrPrevSelection and CompleteOrNextSelection
...
When moving through the autocomplete selection list distinguish between
the following cases:
1) When there is no autocomplete window open, only open one and select
the first item when the CompleteOrPrevSelection /
CompleteOrNextSelection actions are emitted (e.g. by pressing SHIFT +
TAB, TAB)
2) Otherwise navigate through the selection list (e.g. SHIFT + TAB, TAB,
UP, DOWN)
- Remove references to raw keyboard events in autocomplete.ts
- Clarify the purpose of startSelection (previously onTab)
Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
2021-03-29 13:38:03 +13:00
J. Ryan Stinnett
33e8edb3d5
Merge pull request #5720 from czeidler/key-bindings
...
Decouple key bindings from event handling
2021-03-26 15:14:38 +00:00
Michael Telatynski
83612dd4ad
Merge pull request #5792 from matrix-org/t3chguy/spaces4.12
...
Fixing spaces papercuts
2021-03-26 15:01:31 +00:00
Michael Telatynski
a64e0d7611
delint
2021-03-26 14:45:10 +00:00
Hubert Chathi
e23583db40
Merge pull request #5763 from uhoreg/room-history-key-sharing2
...
Share keys for historical messages when inviting users to encrypted rooms
2021-03-26 10:41:54 -04:00
David Baker
989d69ba16
Get tbe transfer target / transferee the right way around
...
and also switch to the transfer target's room when we call them
2021-03-26 14:21:58 +00:00
Travis Ralston
22b7081475
Merge pull request #5803 from matrix-org/travis/s-sso-login-crash
...
Fix crash on login when using social login
2021-03-26 08:06:34 -06:00
Michael Telatynski
9b4af91014
delint
2021-03-26 13:25:06 +00:00
Michael Telatynski
eff0e6fcc3
Add facepile to Space landing page and tweak layout slightly
2021-03-26 13:11:57 +00:00
J. Ryan Stinnett
ce19d07850
Merge pull request #5805 from matrix-org/travis/ts/access-ss-dialog
...
Convert AccessSecretStorageDialog to TypeScript
2021-03-26 12:37:24 +00:00
J. Ryan Stinnett
5f70c625ab
Merge pull request #5807 from matrix-org/jryans/tweak-cs-text
...
Tweak cross-signing copy
2021-03-26 12:12:25 +00:00
Michael Telatynski
4341dfb314
Iterate facepiles, fix default avatar alignment and sort explicit avatars first
2021-03-26 11:55:22 +00:00
J. Ryan Stinnett
aed247f44c
Move toast detail to a new line
2021-03-26 11:43:41 +00:00
Michael Telatynski
9fb653e522
Fix room space invite button for public spaces
2021-03-26 11:43:01 +00:00
Michael Telatynski
3cee8b2baa
fix space creation button busy state
2021-03-26 11:34:41 +00:00
J. Ryan Stinnett
fd59a66523
Tweak cross-signing copy
...
This makes some Design-approved copy tweaks to the recent cross-signing flow
changes.
2021-03-26 11:13:39 +00:00
Michael Telatynski
8c6d92cc99
Move space room discovery & management into the space room view
2021-03-26 09:54:15 +00:00
Germain Souquet
c40f97fa25
Add reset option for corrupted event index store
2021-03-26 09:44:52 +00:00
Travis Ralston
264e24fc35
Merge pull request #5791 from thermaq/patch-1
...
Fix password change popup message
2021-03-26 00:07:50 -06:00
Travis Ralston
60e05d2e8c
Revert back to using sdk.getComponent()
2021-03-25 23:41:35 -06:00
Travis Ralston
550fba49f7
Appease the eternal linter
2021-03-25 23:37:23 -06:00
Travis Ralston
92ee1ad3cc
Convert AccessSecretStorageDialog to TypeScript
...
This is to make upcoming changes a bit easier to do.
2021-03-25 23:34:45 -06:00
Travis Ralston
8bc2356fd0
Fix crash on login when using social login
...
We weren't passing a matrix client through, and the peg wasn't set at this point. Just need to thread it through to the media endpoints.
Fixes https://github.com/vector-im/element-web/issues/16765
2021-03-25 22:22:43 -06:00
Michael Telatynski
09601f1071
Add display name tooltip to the facepile avatars
2021-03-26 00:05:05 +00:00
Travis Ralston
a848febd3d
Definitely didn't copy/paste these
2021-03-25 17:45:00 -06:00
Travis Ralston
101679f647
Adjust some settings
2021-03-25 17:30:44 -06:00
Hubert Chathi
db2f573410
Merge branch 'develop' into room-history-key-sharing2
2021-03-25 19:28:50 -04:00
Hubert Chathi
46fd549ace
update with new suggested design
2021-03-25 19:27:14 -04:00
Travis Ralston
1419ac6b69
Hook up a clock and implement proper design
2021-03-25 17:12:26 -06:00
Robin Townsend
f1a9c5ae93
Fix line numbers when missing trailing newline
...
_addLineNumbers expected code blocks to contain a trailing newline, but
this is not always the case.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-03-25 17:38:34 -04:00
David Baker
82ba546142
WIP attended transfer
2021-03-25 19:56:21 +00:00
Panagiotis
97c7f3753b
fix: save editor state when reply is open
2021-03-25 20:58:39 +02:00
Michael Telatynski
5061db259a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces4.12
2021-03-25 16:37:56 +00:00
Michael Telatynski
ea77ab125e
Show a face pile on a space preview
2021-03-25 16:15:34 +00:00
Germain
356e4bc6fc
Merge pull request #5785 from matrix-org/gsouquet-failed-invites
2021-03-25 14:54:21 +00:00
Germain
80013a2efa
Merge pull request #5787 from matrix-org/gsouquet-event-indexing-settings
...
Improve error reporting when EventIndex fails on a supported environment
2021-03-25 14:53:15 +00:00
Germain Souquet
25a47b463e
Add user settings for warn before exit
2021-03-25 14:14:38 +00:00
Michael Telatynski
7316eb052b
delint
2021-03-25 14:10:01 +00:00
Marek Matys
b5bc6251cf
fix password change popup message
...
Fixed bad error message when providing bad old password during password change.
Signed-off-by: Marek Matys <themarcq@gmail.com>
2021-03-25 14:26:00 +01:00
Michael Telatynski
5e00818d70
Fix new space invite button in the room intro
2021-03-25 11:38:14 +00:00
Germain Souquet
510f08e9f1
Update failed invites copy
2021-03-25 10:11:52 +00:00
Michael Telatynski
e31fc91a03
Fix space setting public/private join rule switch
2021-03-25 09:41:05 +00:00
Michael Telatynski
760b11f214
Merge pull request #5789 from matrix-org/t3chguy/spaces4.11
...
Tweak and fix some space features
2021-03-25 09:02:11 +00:00
Travis Ralston
449e028bbd
Actually use a waveform instead of the frequency data
2021-03-24 23:31:02 -06:00
Travis Ralston
8ddd14e252
Early concept for rendering the frequency waveform
2021-03-24 22:17:45 -06:00
Michael Telatynski
d3cdd38ff4
delint some more
2021-03-24 20:11:23 +00:00
Michael Telatynski
20ea1436fc
Update iconography for spaces
2021-03-24 19:43:33 +00:00
Michael Telatynski
8369d42dd0
Hoist activeSpace tracking from RoomList to LeftPanel
2021-03-24 19:43:09 +00:00
Michael Telatynski
ee5d0d6842
Fix alignment bug with space panel on spaces with subspaces in Chrome
2021-03-24 17:05:21 +00:00
Michael Telatynski
f340b8f7ed
Set invite PL requirement for public spaces to 0 explicitly
2021-03-24 16:42:21 +00:00
Travis Ralston
da7d31aeb6
Merge pull request #5686 from robintown/reply-commands
...
Support replying with a message command
2021-03-24 09:56:56 -06:00
Travis Ralston
8587ec888b
Merge pull request #5769 from matrix-org/travis/voice-messages/exp
...
Labs feature: Early implementation of voice messages
2021-03-24 09:56:34 -06:00
Michael Telatynski
11fbd081f1
Iterate space panel context menu
2021-03-24 15:30:36 +00:00
Michael Telatynski
65a7d0621d
Add invite to space button to room intro
2021-03-24 15:30:03 +00:00
Michael Telatynski
3df3baea14
Tweak behaviour during space creation
2021-03-24 14:19:10 +00:00
Michael Telatynski
a2a1e37fa3
Add prompt to bottom of room list to invite to space
2021-03-24 14:18:06 +00:00
Michael Telatynski
6e0ab86168
Small usability tweaks to the add existing to space dialog
2021-03-24 14:10:26 +00:00
Michael Telatynski
4e9a2df3b0
Spaces autofocus and prefill the search box
2021-03-24 14:00:52 +00:00
Michael Telatynski
fb46815b6a
Spaces move away from Form Buttons
2021-03-24 13:15:31 +00:00
Germain Souquet
5104d7bed8
Improve error reporting when EventIndex fails on a supported environment
2021-03-24 11:51:39 +00:00
Travis Ralston
b7e653268b
Rename function
2021-03-23 18:19:14 -06:00
Germain Souquet
b8692bdf17
Prevent state to be toggled whilst a request is pending
2021-03-23 18:25:03 +00:00
Nolan Darilek
e5d5e1cce2
Label unlabeled avatar button in event panel.
...
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
2021-03-23 10:00:34 -05:00
Travis Ralston
edcd7c4426
Merge branch 'develop' into Discovery
2021-03-22 23:04:41 -06:00
Travis Ralston
e352ed1908
Run audio through the Web Audio API instead
...
This leads to more reliable frequency/timing information, and involves a whole lot less decoding.
We still maintain ongoing encoded frames to avoid having to do one giant encode at the end, as that could take long enough to be disruptive.
2021-03-22 19:32:37 -06:00
Germain Souquet
0db31dfeae
fix: CIDER formatting buttons on Safari
2021-03-22 15:05:22 +00:00
Michael Telatynski
03ab2dc8e0
Merge pull request #5776 from matrix-org/t3chguy/spaces4.10
...
Improve discovery of rooms in a space
2021-03-22 13:24:23 +00:00
Michael Telatynski
128c7db28e
Merge pull request #5777 from matrix-org/t3chguy/spaces4.9
...
Spaces improve creation journeys
2021-03-22 13:24:10 +00:00
Šimon Brandner
4bb279b632
Merge branch 'develop' into resizable-call-view
2021-03-22 07:57:52 +01:00
Šimon Brandner
9a2036c212
Add semicolons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-22 07:44:37 +01:00
Šimon Brandner
b257c25c2c
Make functions private
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-22 07:40:36 +01:00
Ayush PS
f5911e6446
Fixing the minor UI issues in the email discovery
2021-03-22 00:33:09 +05:30
Hubert Chathi
727c189456
apply changes from review
2021-03-19 16:55:07 -04:00
Jaiwanth
495cbadb08
Update src/components/views/rooms/RoomTile.tsx
2021-03-19 22:46:19 +05:30
Jaiwanth
70e0b77fc4
Changed invite phrases in context menu and invite dialog
2021-03-19 21:32:52 +05:30
Jaiwanth
b2a72565d3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into add-invite-to-context-menu
2021-03-19 20:28:10 +05:30
Travis Ralston
6ce0c17455
Merge pull request #5774 from matrix-org/travis/js-sdk-imports
...
Convert a bunch more js-sdk imports to absolute paths
2021-03-19 07:23:45 -06:00
Michael Telatynski
76dffdcb2c
Tweak space creation copy and auto focus fields
2021-03-19 13:20:30 +00:00
Michael Telatynski
1fbbb67e74
Consolidate button styles in Space creation flows
2021-03-19 13:20:30 +00:00
Michael Telatynski
3718d550c5
Fix space creation menu shade width
2021-03-19 13:20:30 +00:00
Michael Telatynski
88b7c8f53d
Fix add existing to space dialog showing all spaces additionally as rooms
2021-03-19 13:20:30 +00:00
Michael Telatynski
90d87122bc
Tweak copy on space creation flows
2021-03-19 13:20:30 +00:00
Michael Telatynski
d04c8b3fb4
Improve discovery of rooms in a space
2021-03-19 11:54:10 +00:00
Travis Ralston
be8ee1a576
Appease the linter
2021-03-18 21:05:51 -06:00
Travis Ralston
1d9d0cd7be
Convert a bunch more js-sdk imports to absolute paths
...
Turns out a lot of the typescript warnings about improper warnings were correct. TypeScript appears to be pulling in two copies of the js-sdk when we do this, which can lead to type conflicts (or worse: the wrong code entirely). We fix this at the webpack level by explicitly importing from `src`, but some alternative build structures have broken tests because of this - jest ends up pulling in the "wrong" js-sdk, breaking things.
2021-03-18 20:50:34 -06:00
David Baker
f3ca75391d
Merge remote-tracking branch 'origin/develop' into dbkr/log_getusermedia_error
2021-03-18 17:15:07 +00:00
David Baker
84b6027d41
Log error when failing to list usermedia devices
...
So we can debug why this might be failing
2021-03-18 16:41:22 +00:00
Šimon Brandner
0917730f48
Merge branch 'feed' into feed-audio
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-17 16:14:59 +01:00
Šimon Brandner
431a2c033d
Merge branch 'develop' into feed
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-17 16:13:40 +01:00
Šimon Brandner
6c5a301094
Make sure video plays onNewStream
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-17 16:10:50 +01:00
Šimon Brandner
ec824c714a
Make sure video plays onNewStream
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-17 16:09:58 +01:00
Travis Ralston
0f09eb3214
Add more notes
2021-03-17 00:12:03 -06:00
Travis Ralston
c7b72bc4c4
Appease the linter
2021-03-16 23:57:27 -06:00
Travis Ralston
f0d5edbc37
Render voice messages as audio messages for now
2021-03-16 23:48:47 -06:00
Travis Ralston
9aa5348c7f
Show a stop button to stop the recording
2021-03-16 23:43:59 -06:00
Travis Ralston
dafa8786a1
Fix comments
2021-03-16 23:43:22 -06:00
Travis Ralston
b5d32d92f3
Wire up a simple record button
2021-03-16 22:58:44 -06:00
Travis Ralston
451a3aaa3f
Work around more cases where a rageshake server might not be present
...
We already do this for a number of other places (slash commands, help section of settings, etc) - these places appear to have been missed, though.
2021-03-16 13:50:43 -06:00
Šimon Brandner
c96d2621a0
Set max-width and MIN_ZOOM
...
This might have some side effects but as far as I can tell they shouldn't be too problematic
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-16 19:57:14 +01:00
Michael Telatynski
0ce78f469f
Merge pull request #5761 from matrix-org/t3chguy/spaces4.8
...
Iterate space panel visually and functionally
2021-03-16 17:41:14 +00:00
Šimon Brandner
787a62846e
Merge branch 'develop' into resizable-call-view
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-16 07:55:56 +01:00
Hubert Chathi
7f141276ff
initial work on room history key sharing, take 2
2021-03-15 22:56:56 -04:00
Šimon Brandner
8f6f9cd6fa
Remove some unnecessary CSS and set MIN_ZOOM to 95
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-15 20:37:39 +01:00
Šimon Brandner
e45035582d
Add ZOOM_COEFFICIENT with value of 10
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-15 19:28:21 +01:00
Šimon Brandner
7b6d393754
Add a missing space
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-15 19:24:44 +01:00
Šimon Brandner
67a57ead96
Export ZOOM_STEP into a variable
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-15 19:24:00 +01:00
Michael Telatynski
272f06d57a
Fix Space Panel exploding with cyclic hierarchies
2021-03-15 12:16:48 +00:00
Šimon Brandner
b27a8e3c3a
Merge branch 'develop' into improve-image-view
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-14 08:30:28 +01:00
Travis Ralston
d3541b78eb
Merge pull request #5714 from matrix-org/travis/media-customization
...
Support a media handling customisation endpoint
2021-03-12 11:01:59 -07:00
Clemens Zeidler
2a21d45ac0
Merge branch 'develop' into key-bindings
2021-03-12 16:44:12 +13:00
Travis Ralston
a9a4bd50ca
Merge branch 'develop' into travis/media-customization
2021-03-11 08:37:49 -07:00
Panagiotis
be7fb33a67
Merge branch 'develop' into edit-view-source
2021-03-11 17:07:56 +02:00
Travis Ralston
229a95f190
Merge pull request #5734 from matrix-org/travis/skinning/pt3-easy-comps
...
[SK-3] Decorate easy components with replaceableComponent
2021-03-11 07:26:20 -07:00
J. Ryan Stinnett
6a939c4de8
Merge pull request #5727 from matrix-org/matthew/rework-cross-signing-login
...
Rework cross-signing login flow
2021-03-11 12:53:55 +00:00
Travis Ralston
7f52e78748
Make styles dynamic
2021-03-10 21:08:01 -07:00
Travis Ralston
88a2bdb119
Change read receipt drift to be non-fractional
...
I suspect this is what is causing issues in Firefox for read receipts not falling down.
2021-03-10 16:47:27 -07:00
Travis Ralston
ebf1efe01b
docs
2021-03-10 12:32:18 -07:00
Travis Ralston
a7debdd946
Fix tinting for download icon
...
As shown in https://github.com/vector-im/element-web/issues/16546
2021-03-10 12:32:18 -07:00
Travis Ralston
af9f17219b
Fix MemberAvatar crash from EventTilePreview
2021-03-10 12:32:18 -07:00
Travis Ralston
125aef24b9
Convert edge cases of MXC URI conversion to new customisation endpoint
2021-03-10 12:32:18 -07:00
Travis Ralston
4688c887c4
Fix GroupAvatar crash
...
When we don't have an avatar we shouldn't explode.
2021-03-10 12:32:18 -07:00
Travis Ralston
2a40bc87cc
Fix ResizeMethod usage
2021-03-10 12:32:18 -07:00
Travis Ralston
533c9fed64
Appease the linter
2021-03-10 12:32:18 -07:00
Travis Ralston
fa5d98c319
Convert cases of getHttpUriForMxc to new media customisation
2021-03-10 12:32:18 -07:00
Travis Ralston
1ac12479ca
Convert cases of mxcUrlToHttp to new media customisation
2021-03-10 12:32:18 -07:00
Travis Ralston
e5180a472f
Merge branch 'develop' into travis/skinning/pt3-easy-comps
2021-03-10 12:30:06 -07:00
Šimon Brandner
8410411236
Handle audio
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-10 12:26:59 +01:00
Šimon Brandner
bb13dc49a6
Make CallView use CallFeed
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-10 12:18:57 +01:00
Michael Telatynski
98338f1505
Merge pull request #5736 from matrix-org/t3chguy/spaces4.5
...
Spaces suggested rooms support
2021-03-10 10:56:17 +00:00
Šimon Brandner
62e9d7f46b
Cleaner imports
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-10 09:24:47 +01:00
Travis Ralston
f25db38b2b
Add tooltips to sent/sending receipts
...
Fixes https://github.com/vector-im/element-web/issues/16649
2021-03-09 21:13:23 -07:00
Travis Ralston
71b8959d3c
Apply suggestions from code review
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-03-09 09:36:17 -07:00
Travis Ralston
5b3367d44e
Merge remote-tracking branch 'origin/develop' into travis/skinning/pt3-easy-comps
2021-03-09 09:33:19 -07:00
Travis Ralston
eb45731d2e
Merge pull request #5735 from matrix-org/travis/use-strict-no
...
Remove a bunch of useless 'use strict' definitions
2021-03-09 07:24:41 -07:00
Michael Telatynski
cf2c790699
Pass OOB data for suggested rooms
2021-03-09 13:41:06 +00:00
Michael Telatynski
dd0b0834e6
Fix React warning
2021-03-09 13:40:48 +00:00
Panagiotis
ef267829de
Merge branch 'develop' into edit-view-source
2021-03-09 14:49:05 +02:00
J. Ryan Stinnett
d33acaac95
Merge pull request #5713 from panoschal/improve-view-source
...
Display decrypted and encrypted event source on the same dialog
2021-03-09 11:36:53 +00:00
Michael Telatynski
81e1f36c4b
Tidy up TemporaryTile now that it isn't temporary
2021-03-09 11:19:41 +00:00
Travis Ralston
591ccabab9
Remove a bunch of useless 'use strict' definitions
2021-03-08 20:26:08 -07:00
Travis Ralston
41576954fd
Batch of views getting replaceableComponent decorators
2021-03-08 20:23:54 -07:00
Travis Ralston
c5935dbc61
Batch of views getting replaceableComponent decorators
2021-03-08 20:23:46 -07:00
Travis Ralston
fc5b1ed9d6
Batch of views getting replaceableComponent decorators
2021-03-08 20:23:39 -07:00
Travis Ralston
c359dff738
Batch of views getting replaceableComponent decorators
2021-03-08 20:23:34 -07:00
Travis Ralston
3e189d2728
Batch of views getting replaceableComponent decorators
2021-03-08 20:23:29 -07:00
Panagiotis
7963d7f49e
address PR comments
...
cleanup, change to isEncrypted, comments
2021-03-08 21:21:37 +02:00
Matthew Hodgson
1629b7e62a
s/IP/ip/; s/from/at/
2021-03-08 16:44:14 +00:00
J. Ryan Stinnett
b12cf7912a
Merge pull request #5624 from SimonBrandner/show-room-name
...
Display room name in pills instead of address
2021-03-08 16:27:43 +00:00
Travis Ralston
761ced13f2
Merge pull request #5719 from matrix-org/travis/file-representation
...
UI refresh for uploaded files
2021-03-08 08:52:43 -07:00
Travis Ralston
d35afe6fbb
Merge pull request #5699 from matrix-org/travis/message-states
...
Improve message sending states to match new designs
2021-03-08 08:52:26 -07:00
Michael Telatynski
6a5efad142
Show suggested rooms from the selected space
2021-03-08 15:52:21 +00:00
J. Ryan Stinnett
fca1639e0e
Merge pull request #5725 from HelderFSFerreira/addClipboardWritePermission
...
Add clipboard write permission for widgets
2021-03-08 14:38:23 +00:00
David Baker
0aea8b9efd
Merge pull request #5722 from matrix-org/dbkr/fix_widget_resize
...
Fix widget resizing
2021-03-08 13:47:29 +00:00
David Baker
d71999114b
Merge pull request #5707 from matrix-org/dbkr/audiostream
...
Option for audio streaming
2021-03-08 11:50:45 +00:00
Helder Ferreira
f545866572
add clipboard write permission
2021-03-08 08:08:02 +00:00
Matthew Hodgson
c02d03cc5b
Merge branch 'develop' of git+ssh://github.com/matrix-org/matrix-react-sdk into develop
2021-03-08 04:57:10 +00:00
Matthew Hodgson
aa0cca9306
report IP of self-verification reqs
2021-03-08 04:46:47 +00:00
Matthew Hodgson
5b48e13eb9
add explicit link to edit devices from one's own UserInfo
2021-03-08 04:46:15 +00:00
Matthew Hodgson
6df8157a40
cancel VRD at the Modal level, so clicking in the bg cancels it
2021-03-08 04:45:44 +00:00
Šimon Brandner
35a5442e0d
Increase minHeight
...
This is needed for on hold. Otherwise it feels like too much, tbc
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-07 15:05:13 +01:00
Panagiotis
51ac5421c9
chore: refactor code
...
pass only the mxEvent object to ViewSource
derive the necessary values inside the component
2021-03-06 11:30:31 +02:00
Panagiotis
ed6486aabb
Merge branch 'improve-view-source' into edit-view-source
2021-03-05 21:44:43 +02:00
Panagiotis
2c64dac514
fix: show decrypted source on EditHistory -> ViewSource
...
pass correct props to the component
2021-03-05 19:57:37 +02:00
Travis Ralston
ca63e937d3
Fix up logic to show sent receipts correctly
2021-03-05 10:56:13 -07:00
David Baker
e5b03488d8
Fix widget resizing
...
There was a line of CSS that set pointer-events: none on widget
iframes whilst they were being resized to stop iframes swallowing
the mousemove/up events while dragging the resize handle, but a)
all widgets are now in a persisted element wrapper and therefore
not in the right place in the DOM to get that CSS and b) that only
got set when resizing the whole aps drawer vertically, not dragging
the handle between apps to change the width distribution.
Add a pointer events prop to AppTile to allow the pointer-events
style to be set by the parent, and set it when dragging either
resize handle.
Fixes https://github.com/vector-im/element-web/issues/16473
2021-03-05 17:52:51 +00:00
Travis Ralston
017c2af663
Merge branch 'develop' into travis/message-states
2021-03-05 09:29:39 -07:00
David Baker
8bcf0f0838
console.error
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-03-05 10:34:03 +00:00
David Baker
c80cbc38dd
Use helper class
...
(It did not need imports)
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-03-05 10:32:54 +00:00
Clemens Zeidler
efc5d413c4
Fix missing import (from earlier merge conflict)
2021-03-05 22:13:47 +13:00
Travis Ralston
676259e78c
Merge pull request #5505 from SimonBrandner/improve-file-drop-ui
...
File drop UI fixes and improvements
2021-03-04 20:30:45 -07:00
Travis Ralston
8d143331a8
Appease the linter
2021-03-04 20:10:47 -07:00
Travis Ralston
5d6e3d5711
UI refresh for uploaded files
...
Fixes https://github.com/vector-im/element-web/issues/16557
Fixes https://github.com/vector-im/element-web/issues/9482 (technically)
There's two changes in this:
1. The actual file body in the timeline now has a placeholder thing.
2. We're intentionally dropping all the "Travis uploaded a file" sender profile states.
2021-03-04 20:07:48 -07:00
Panagiotis
288d98daed
chore: format, lint
2021-03-05 00:07:59 +02:00
Panagiotis
af5cfff51d
feat: edit button on View Source dialog
...
reuse component SendCustomEvent
swap it in place in the View Source dialog
the Back button takes you to the View Source dialog, not the DevTools dialog
do not display the flip toggle box for changing between State Event and Normal Event
2021-03-04 23:17:29 +02:00
Aaron Raimist
ff788ca3da
Merge branch 'develop' into warn-on-access-token-reveal
2021-03-04 13:33:01 -06:00
David Baker
0f1b7a001e
Better error handling for streams
...
Also use older youtubeStreamKey as it appears our jitsi doesn't
support the newer one.
2021-03-04 17:52:49 +00:00
Michael Telatynski
c73ad9e594
Merge pull request #5332 from Transfusion/trim_display_name
...
Trim spurious whitespace of nicknames
2021-03-04 16:26:09 +00:00
Clemens Zeidler
4a6f931782
Merge branch 'develop' into key-bindings
2021-03-04 21:10:35 +13:00
Panagiotis
ae08f74336
feat: improve "view source"
...
display encrypted and decrypted event source on the same dialog
keep only one "View Source" action on event context menu
2021-03-03 22:38:30 +02:00
Šimon Brandner
c638ced21e
Remove unused consts
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-03 16:59:39 +01:00
Šimon Brandner
d244ea3b14
Don't use onResize
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-03 16:42:27 +01:00
Michael Telatynski
77cf4cf7a4
Merge pull request #5706 from matrix-org/t3chguy/spaces4.4
...
Space room hierarchies
2021-03-03 15:25:00 +00:00
Michael Telatynski
a8ff0fa75f
Merge pull request #5705 from matrix-org/t3chguy/spaces4.3
...
Iterate Space view and right panel
2021-03-03 13:37:40 +00:00
Michael Telatynski
d9a801910a
Tweak spaces copy
2021-03-03 11:34:29 +00:00
Travis Ralston
c7d4dfa4f5
Merge pull request #5692 from SimonBrandner/scroll-to-bottom-setting
...
Add a scroll to bottom on message sent setting
2021-03-02 17:41:15 -07:00
Šimon Brandner
5877b3e00d
Add resizing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-02 20:33:19 +01:00
Šimon Brandner
69cdbef3d6
Remove maxHeight prop
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-02 20:31:39 +01:00
Travis Ralston
08d35073de
Improve commentary
2021-03-02 11:04:12 -07:00
Travis Ralston
c74224a1b7
Merge branch 'develop' into travis/message-states
2021-03-02 10:40:49 -07:00
Michael Telatynski
49fc053b94
Merge pull request #5704 from matrix-org/t3chguy/spaces4.2
...
Initial Space Room View and Creation UX
2021-03-02 17:17:39 +00:00
David Baker
20e57d15fd
Option for audio streaming
2021-03-02 15:20:54 +00:00
J. Ryan Stinnett
a5ee029c62
Merge pull request #5452 from SimonBrandner/feature-multi-language-spell-check
...
Add multi language spell check
2021-03-02 14:38:21 +00:00
Michael Telatynski
716268b2f9
Add context menu to spaces in the space panel
2021-03-02 14:35:29 +00:00
Travis Ralston
303ea16492
Merge pull request #5697 from matrix-org/travis/fix-tetris
...
Fix tetris effect (holes) in read receipts
2021-03-02 07:35:04 -07:00
Michael Telatynski
ca1bd78921
Add space specific variant of the dropdown on "Rooms +" sublist
2021-03-02 14:20:29 +00:00
Michael Telatynski
e479edd47a
Add an add existing room to space CTA to Space View
2021-03-02 13:34:53 +00:00
Michael Telatynski
a687b9883c
Add a create room in space CTA to Space View
2021-03-02 13:29:34 +00:00
Michael Telatynski
ab4b7b73ea
Add a basic Space Settings view
2021-03-02 13:26:00 +00:00
Šimon Brandner
4e9d19d3b0
Pass resizeNotifier into CallViewForARoom
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-02 14:09:11 +01:00
Šimon Brandner
4476843264
Remove unused _t
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-02 12:12:10 +01:00
Šimon Brandner
0a4c0b69b0
Move fileDropTarget to RoomView
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-02 12:07:33 +01:00
Michael Telatynski
926e226a78
Add Invite CTA to Space View
2021-03-02 10:12:49 +00:00
Michael Telatynski
8efe7dcaa1
Decorate Right Panel cards with Space header for when viewing it in that context
2021-03-02 09:54:32 +00:00
Šimon Brandner
ebedd3cbcb
Remove space
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-03-02 07:41:14 +01:00
Šimon Brandner
6fcb4c7cd2
Fix quote
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-03-02 07:37:00 +01:00
Travis Ralston
db8978580c
Improve special read receipt checking
...
See comments in code
2021-03-01 16:25:25 -07:00
Travis Ralston
9cec382865
Change sending->sent state to match new designs
...
For https://github.com/vector-im/element-web/issues/16424
2021-03-01 16:25:19 -07:00
Michael Telatynski
c10512fd56
Initial SpaceRoomView work
2021-03-01 18:53:11 +00:00
Michael Telatynski
483d56320c
Beginning of space creation UX from space panel
2021-03-01 17:47:40 +00:00
Michael Telatynski
ea61b18c18
Iterate Space Panel alignments
2021-03-01 17:02:02 +00:00
Michael Telatynski
d248a5fa5d
Merge pull request #5689 from matrix-org/t3chguy/spaces2
...
Space Store and Space Panel for Room List filtering
2021-03-01 09:42:04 +00:00
Clemens Zeidler
601be50b71
Split KeyAction into multiple enums
...
This gives some additional type safety and makes enum member usage more
clear.
2021-03-01 21:43:00 +13:00
Clemens Zeidler
32ec8b7dc8
Add key bindings for RoomList, Room and Navigation
2021-02-28 20:13:34 +13:00
Travis Ralston
e43853d6b0
Use a small fractional value instead
2021-02-27 12:02:24 -07:00
David Baker
11ba9e0601
Merge pull request #5690 from matrix-org/dbkr/call_maxheight_nan
...
Null check for maxHeight in call view
2021-02-27 15:05:07 +00:00