Commit Graph

2939 Commits (72d8e6ccca4a214231c1a6cbbba8aab7bbc62ed7)

Author SHA1 Message Date
Matthew Hodgson b3cd6fcc9b vertically align labels in AccessibleButtons if their height is pushed out by wrapped text elsewhere 2021-03-08 17:59:02 +00:00
Travis Ralston 52621946de
Merge pull request #5723 from matrix-org/travis/uploads
Refresh UI for file uploads
2021-03-08 08:52:51 -07: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
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 1427aa4203 fix mx_EncryptionInfo_spinner padding in dialogs 2021-03-08 04:41:51 +00:00
Travis Ralston 757597e55f Fixed review concerns 2021-03-05 16:29:14 -07:00
Travis Ralston 08072aca9a Add upload icon, fix cancel button, refresh styles 2021-03-05 14:42:15 -07:00
Travis Ralston 711181cc69 Rough style for new upload bar
This repurposes ProgressBar which was not used anywhere in code.
2021-03-05 14:14:43 -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
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 65ac063a09
Merge pull request #5715 from 2580ayush2580/ayush258012
Fix Bottom border of state counters is white on the dark theme
2021-03-04 20:28:52 -07:00
Travis Ralston d7310bc5b3 Remove dead classes 2021-03-04 20:17:29 -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
Ayush Kumar dd792c3d73 Fix Clicking on the avatar for opening member info requires pixel-perfect accuracy 2021-03-04 19:24:35 +05:30
Jason Robinson f2d2a048e1 Ensure HostSignupDialog border colour matches light theme
Ensure dialog borders are always white as the HostSignupDialog
does not yet support dark mode or theming in general.
In the future we might want to pass the theme to the called
iframe, should some hosting provider have that need.
2021-03-04 11:07:14 +02:00
Ayush Kumar 1cb19554eb Fix Bottom border of state counters is white on the dark theme 2021-03-04 14:03:02 +05:30
Panagiotis 6d792cc08c feat: use <details> to hide encrypted block 2021-03-03 23:48:39 +02: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 0e5297fcb0
Fix local feed size
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-03 16:44:43 +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 85985db441 add comment 2021-03-03 11:50:41 +00:00
Šimon Brandner 2e535d2a99
Fix CSS to make it work with resizing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-02 20:33:34 +01:00
Šimon Brandner a3f7e5f031
Add CallViewForRoom
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-02 20:32:25 +01:00
Šimon Brandner f86e6fe643
Add resize CallViewForRoom CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-02 20:32:13 +01: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
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 43cc7deeda Show hierarchy of auto_join rooms in the space view 2021-03-02 14:37:28 +00:00
Michael Telatynski 716268b2f9 Add context menu to spaces in the space panel 2021-03-02 14:35:29 +00:00
Michael Telatynski ca1bd78921 Add space specific variant of the dropdown on "Rooms +" sublist 2021-03-02 14:20:29 +00:00
Michael Telatynski faf7a4b8bc Initial Space room directory view 2021-03-02 14:14:50 +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
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
Michael Telatynski 7b7c89e854
Merge pull request #5702 from matrix-org/t3chguy/spaces4.1
Iterate Space Panel
2021-03-01 23:56:54 +00:00
Travis Ralston 12161f9da2
Merge pull request #5700 from SimonBrandner/fix-read-receipts-in-compact
Fix read receipts for compact layout
2021-03-01 16:37:59 -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 89386b9b2e fix missing closing brace 2021-03-01 17:06:56 +00:00
Michael Telatynski ea61b18c18 Iterate Space Panel alignments 2021-03-01 17:02:02 +00:00
Michael Telatynski 70f1303544 Fix invite svg viewbox 2021-03-01 16:48:35 +00:00
Michael Telatynski ce64863326 Annotate User Menu handle with currently selected space 2021-03-01 15:53:16 +00:00
Michael Telatynski d679708058 Fix styling of disabled options in an Iconized menu 2021-03-01 15:40:46 +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
Šimon Brandner 188b728f53
Fix read receipts for compact layout
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-28 13:32:17 +01:00
Travis Ralston 678ec52035 Merge branch 'develop' into fix-4963 2021-02-26 14:41:28 -07:00
Travis Ralston 4e27b00cf3 Move call buttons to the room header
This is to make some room in the composer for voice messages. The hangup behaviour is intentionally lost by this change as the VOIP UX is intended to rely on dedicated hangup buttons instead.
2021-02-26 13:46:39 -07:00
Šimon Brandner 3a643e5b9d
Remove unnecessary changes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 11:46:54 +01:00
Michael Telatynski f21aedc6cf Add Space Panel with Room List filtering 2021-02-26 10:41:26 +00:00
Šimon Brandner 3bed37463f
Remove unnecessary code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 11:38:05 +01:00
Šimon Brandner 11c5aa02d2
Remove mx_RoomView_container
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 11:19:45 +01:00
Šimon Brandner 819a0b013f
min-width
We need to allow the container to be smaller

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 11:08:31 +01:00
Šimon Brandner e90ae2ea75
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 08:18:05 +01:00
Šimon Brandner 3e0558f4d9
Remove droptarget colors
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 08:12:38 +01:00
Šimon Brandner 172cc01f7d
Add background animation
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 08:12:10 +01:00
Šimon Brandner f0c26846c7
Fix formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 08:11:58 +01:00
Šimon Brandner 1a7f9091b4
Animate icon size
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 07:51:03 +01:00
Šimon Brandner 1c48804d96
Remove unnecessary class
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 19:28:08 +01:00
Šimon Brandner 6a7340e8be
Use new upload icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:46:48 +01:00
Šimon Brandner 26b70b6228
Remove label background
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:32:04 +01:00
Šimon Brandner a3001f77e4
Remove rounded corners of the drop area
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:30:39 +01:00
Šimon Brandner 8551855a56
Add $droptarget-bg-color to the dark theme
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:30:14 +01:00
Šimon Brandner aa4ec9fca1
Make $droptarget-bg-color more opaque
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:27:52 +01:00
Šimon Brandner ad85764a8e
Fix timeline expansion
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:23:32 +01:00
Šimon Brandner c1a105f071
Merge branch 'develop' into improve-file-drop-ui 2021-02-25 18:12:37 +01:00
Šimon Brandner 1955fff08c
CSS cleanup
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:50:50 +01:00
Šimon Brandner dc283241aa
Remove wrapper
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:28:42 +01:00
Šimon Brandner 984b4372db
Remove trash red icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 10:25:24 +01:00
Šimon Brandner 7fc3758056
Add newline
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 10:23:59 +01:00
Šimon Brandner a4130cb7f3
Revert trash icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 10:23:27 +01:00
Šimon Brandner 273753a42a
Fix hex formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 08:25:34 +01:00
Šimon Brandner 5a9e1a1482
Fix close icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 08:10:54 +01:00
Šimon Brandner d58c17ff3b
Show grabbing cursor
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 07:50:53 +01:00
Šimon Brandner 25873c8759
Remove rounded border 2021-02-24 20:41:20 +01:00
Šimon Brandner 983895289c
Update info
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 20:04:25 +01:00
Šimon Brandner 81698a2714
Fix pointer-events
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 19:31:19 +01:00
Travis Ralston dee7c7b556
Merge pull request #5567 from SimonBrandner/fix-read-receipts
Fix read receipts?
2021-02-24 11:21:42 -07:00
Šimon Brandner 83e1a7a707
Add more button
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 18:13:12 +01:00
Šimon Brandner 0a00ffa9d6
Add more icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 18:10:50 +01:00
Šimon Brandner a6bb203a4b
Redo icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 14:43:33 +01:00
Šimon Brandner fafb8d43a3
Fix padding according to the design
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 14:16:58 +01:00
Šimon Brandner 8454a2d440
Remove padding on lightboxes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 12:52:08 +01:00
Šimon Brandner 6aac8f1735
Change padding a bit
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 11:20:28 +01:00
Šimon Brandner 899ce1f605
Partially fix overflow issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 11:15:59 +01:00
David Baker bcc567cd86
Merge pull request #5676 from SimonBrandner/fix-portrait
Fix portrait videocalls
2021-02-24 09:26:57 +00:00
Šimon Brandner ab79deb88f
Update the looks a bit more
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 08:11:53 +01:00
Šimon Brandner 768d268189
Fix css
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 07:54:36 +01:00
Šimon Brandner 6cf19e8897
Update icons according to the design
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 21:04:21 +01:00
Šimon Brandner e5d68142c6
Remove zoom icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 20:47:42 +01:00
Šimon Brandner 87d5d73025
Merge branch 'develop' into improve-image-view 2021-02-23 20:42:16 +01:00
Šimon Brandner 3f0e8e4afc
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 19:16:52 +01:00
Šimon Brandner 64945d4ccf
Add a comment and use rems
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 19:14:36 +01:00
Šimon Brandner 2f2c5c9081
Merge branch 'develop' into fix-read-receipts 2021-02-23 18:43:58 +01:00
J. Ryan Stinnett 667c94b387
Merge pull request #5643 from SimonBrandner/move-icons
Tweak code block icon positions
2021-02-23 14:53:28 +00:00
J. Ryan Stinnett 3db6a45010 Revert "Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes"
This reverts commit 5c1b38a48c, reversing
changes made to ec4a39a694.
2021-02-23 12:03:08 +00:00
Šimon Brandner effb9666f2
Fix portrait videocalls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-22 20:10:30 +01:00
Travis Ralston 10b0051c02 Appease the linter 2021-02-18 15:30:03 -07:00
Travis Ralston 52c73a7a58 Add developer tool to explore and edit settings 2021-02-18 14:56:19 -07:00
Šimon Brandner 5de99c7708
Fix licenses
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-18 19:40:24 +01:00
Šimon Brandner bd0e5446c5
Merge branch 'develop' into feature-multi-language-spell-check 2021-02-18 18:16:16 +01:00
J. Ryan Stinnett 5c1b38a48c
Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes
Improve URL preview formatting and image upload thumbnail size
2021-02-17 11:37:37 +00:00
J. Ryan Stinnett ec4a39a694
Merge pull request #5641 from SimonBrandner/fix-rounded-resize
Fix border radius when the panel is collapsed
2021-02-17 11:12:03 +00:00
J. Ryan Stinnett d96043d5ab Use config for host signup branding 2021-02-15 17:37:33 +00:00
Jaiwanth 04d2bf1d6a Check whether user has permission to invite
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-02-15 20:55:15 +05:30
Jaiwanth f420c85985 Added invite option to room's context menu
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-02-15 19:21:26 +05:30
Šimon Brandner 7dc6029f19
Move icons
This tweaks the icon positions to look a bit better. Espacially with a scrollbar on the side

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-13 15:29:38 +01:00
Šimon Brandner 82474074f2
Fix scrollbar color for non-Firefox
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-13 13:03:26 +01:00
Šimon Brandner 8afb74d0e1
Fix border radius when the panel is collapsed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-13 08:53:25 +01:00
Šimon Brandner 3983c15302
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 17:11:24 +01:00
Šimon Brandner 130e4f7bfd
Added some styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 17:06:02 +01:00
Šimon Brandner 2b4859a858
Merge branch 'develop' into fix-4963 2021-02-12 16:30:01 +01:00
J. Ryan Stinnett a87e637666
Merge pull request #5630 from SimonBrandner/tweak-codeblock-colors
Fix codeblock scrollbar colors
2021-02-11 12:41:12 +00:00
Šimon Brandner 4aa3000894
Leverage our theme colours
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-11 13:31:06 +01:00
Jason Robinson 538272a827 Tweak the dialog dimensions
Make height/width max (as per design wish) and
actual based on viewport.
2021-02-10 15:13:01 +02:00
Jason Robinson 23140a84ff Remove host signup config strings, make translatable instead
Also replace the icon in the UserMenu and change the text, requested from design.
2021-02-10 13:38:32 +02:00
Jason Robinson c92a930d0a Fix positioning of minimize action and add titles 2021-02-09 12:40:12 +02:00
Jason Robinson 3ed6f1fe5d Fix maximise and minimise icon references 2021-02-09 12:22:58 +02:00
Jason Robinson d75e2d19dc Remove unnecessary host_signup.png 2021-02-09 11:33:16 +02:00
Jason Robinson 5fe3c83f27 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-09 11:18:51 +02:00
Šimon Brandner e2bf0c84d7
Move icons to the left
We do this because they would otherwise collide with the scrollbar

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-09 08:16:36 +01:00
Šimon Brandner 62939f1348
Fix scrollbar colors
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-09 08:14:19 +01:00
William Kray fec2309451 move cancel button to the right 2021-02-08 09:26:10 -08:00
William Kray e6da146b21 pad url preview close button a bit 2021-02-08 09:26:10 -08:00
William Kray 9260b031e9 oops missed a semicolon 2021-02-08 09:26:10 -08:00
William Kray 03c30b0338 change link previews to vertical flow 2021-02-08 09:26:10 -08:00
William Kray e72a7567f7 drop video preview max-height to 300px 2021-02-08 09:25:08 -08:00
J. Ryan Stinnett 6d9da1bad2
Merge pull request #5625 from SimonBrandner/fix-notif-jumpy-ui
Fix jumpy notifications settings UI
2021-02-08 15:10:27 +00:00
Šimon Brandner 3b6790fbf1
Merge branch 'develop' into fix-notif-jumpy-ui 2021-02-08 15:42:06 +01:00
Šimon Brandner c4a3906871
Fix positioning of spinner in a smarter way
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-08 15:38:43 +01:00
Šimon Brandner 84eba59afa
Merge branch 'develop' into improve-codeblock 2021-02-08 15:26:50 +01:00
Šimon Brandner 257b8819b3
Change icon size
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-08 15:22:30 +01:00
Šimon Brandner 9a97b40ce9
Remove old icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-08 15:22:17 +01:00
Šimon Brandner cdb0d1c12e
Move and use icons from widget dir
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-08 15:22:10 +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
J. Ryan Stinnett 5abced7049
Merge pull request #5551 from weeman1337/fix-15347-explore-rooms-spacing
Switch room explorer list to CSS grid
2021-02-08 11:18:01 +00:00
Šimon Brandner 4a282759c3
Fixed jumpy UI
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-06 16:38:07 +01:00
Michael Weimann f0f6e4678e
switch room explorer list to css grid
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-02-06 14:40:16 +01:00
Jason Robinson 03fe0f1f17 s not z 2021-02-04 23:17:48 +02:00
Jason Robinson f5f8050172 Add minimize button to HostSignupDialog.tsx 2021-02-04 23:09:58 +02:00
Jason Robinson b50ac0c096 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-04 18:32:16 +02:00
J. Ryan Stinnett a4318299ff
Merge pull request #5601 from weeman1337/fix-16325-timestamp-jump
Fix jumping timestamp if hovering a message with e2e indicator bar
2021-02-04 16:02:18 +00:00
Jason Robinson 6ccce7142c Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-03 22:35:22 +02:00
Šimon Brandner b73227eaca
Merge branch 'develop' into fix-icon-position 2021-02-03 18:46:45 +01:00
Šimon Brandner b8ee23cdf4
Make consistent for all events
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-03 18:41:09 +01:00