Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-26 18:38:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
36,196 Commits 205 Branches 553 Tags 445 MiB
cfd2db4e87
Commit Graph

3644 Commits

Author SHA1 Message Date
Germain
22375e2108
Update res/css/views/rooms/_EventBubbleTile.scss 2021-07-21 15:11:49 +01:00
Šimon Brandner
be52eba027
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-21 15:56:08 +02:00
Germain Souquet
0fb210cadb Increase hit area for timestamp in message bubbles 2021-07-21 15:31:10 +02:00
Germain Souquet
c155382445 Improve new layout switcher UI 2021-07-21 14:55:30 +02:00
Germain
32e7c58747
Merge branch 'develop' into gsouquet/fix-18099 2021-07-21 11:57:29 +01:00
Germain
a4ca52255d
Merge pull request #6421 from matrix-org/gsouquet/fix-18084 
Fix font slider preview for message bubbles
 2021-07-21 11:56:33 +01:00
Germain
e33163c837
Merge pull request #6419 from matrix-org/gsouquet/fix-18125 
Add spoiler support for message bubbles
 2021-07-21 11:54:30 +01:00
Michael Telatynski
d147aaa984 delint and fix min-height issue 2021-07-21 11:27:36 +01:00
Michael Telatynski
fd64d37305 Add iconography to Create Room Dialog dropdown 
Remove unused old stale feather-customised/globe.svg
 2021-07-21 11:20:41 +01:00
Michael Telatynski
390b05617c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/dialogs/RoomUpgradeDialog.tsx
	src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-07-21 10:46:41 +01:00
Germain
6308dabcfe
Remove forgotten code comment 2021-07-21 10:43:48 +01:00
Germain Souquet
ef002a2e22 Fix replies line clamping 2021-07-21 11:41:52 +02:00
Michael Telatynski
880dc26847 don't force height if the height can't change (no children edge) 2021-07-21 10:39:04 +01:00
Michael Telatynski
1b2d70d816 Prompt user to leave rooms/subspaces in a space when leaving space 2021-07-21 09:57:10 +01:00
Germain
dfa85b00d0
Merge pull request #6423 from matrix-org/gsouquet/fix-18077 2021-07-21 09:43:15 +01:00
Germain Souquet
a7cd5fc49b Shift thumbnail dislay to use object-fit to preserve aspect-ratio 2021-07-21 10:03:10 +02:00
Germain Souquet
6d9ac1de17 Fix font slider preview for message bubbles 2021-07-21 09:34:30 +02:00
Germain Souquet
fee69884a6 Reintroduce grouped events padding on modern layout 2021-07-21 08:57:09 +02:00
Germain Souquet
a6308229fb Add spoiler support for message bubbles 2021-07-21 08:42:42 +02:00
Šimon Brandner
3993e698bd
Put the call controls close togather 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 17:22:36 +02:00
Šimon Brandner
4546df7246
Update sidebar icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 17:13:54 +02:00
Travis Ralston
5994111e5d Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download 2021-07-20 08:55:53 -06:00
Šimon Brandner
0af64504b1
Reverse sidebar order 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 16:53:53 +02:00
Šimon Brandner
15406eaff2
Put the sidebar to the bottom rather than the top 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 16:18:48 +02:00
Šimon Brandner
e5563ac60b
Update the screen-sharing buttons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 16:11:55 +02:00
Šimon Brandner
fadb13e9fb
Center all buttons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 16:02:02 +02:00
Šimon Brandner
c25feb9b9f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-20 15:48:25 +02:00
Travis Ralston
4a877300da
Merge pull request #6405 from matrix-org/travis/files-hover 
Remove hover effect from files in the files panel
 2021-07-20 07:38:04 -06:00
David Baker
c47a05cc48
Merge pull request #6121 from SimonBrandner/feature/call-event-tile 
Add VoIP event tiles
 2021-07-20 13:31:53 +01:00
Šimon Brandner
9e5b149291
Fix event highlighthing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 14:23:28 +02:00
Michael Telatynski
d8c4ab53e0
Merge pull request #6347 from robintown/emojibase-updates 2021-07-20 12:57:00 +01:00
Šimon Brandner
66a3b0fe5f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 13:24:05 +02:00
Šimon Brandner
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 13:15:04 +02:00
Germain
53ae7817bc
Merge pull request #6291 from matrix-org/gsouquet/message-bubbles-4635 2021-07-20 10:22:41 +01:00
Germain Souquet
06c9a060b4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-20 10:16:21 +02:00
Šimon Brandner
5db20d9431
Fix placeholder centering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 08:54:32 +02:00
Travis Ralston
097cc858ce Remove hover effect from files in the files panel 2021-07-19 10:07:16 -06:00
Michael Telatynski
de42a00ca4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/avatars/RoomAvatar.tsx
	test/stores/SpaceStore-test.ts
	test/test-utils.js
 2021-07-19 16:47:31 +01:00
Michael Telatynski
c1ed023e17 Update Twemoji fonts for Unicode Emoji 13.1 2021-07-19 10:45:26 +01:00
David Baker
863f4d4f9f
Merge pull request #6394 from matrix-org/dbkr/exorcise_homeserver_checkbox 
Fix bug where 'other homeserver' would unfocus
 2021-07-19 10:09:03 +01:00
Šimon Brandner
e3eac48d05
Cleanup _ReplyPreview.scss 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 15:25:54 +02:00
Šimon Brandner
96acd6c9ef
Cleanup _ReplyThread.scss 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 15:06:31 +02:00
Šimon Brandner
75fc1299fb
Merge remote-tracking branch 'upstream/develop' into task/cleanup-replies 2021-07-17 08:26:28 +02:00
Šimon Brandner
5c5b79a972
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 08:13:51 +02:00
Travis Ralston
d2de9b432c
Apply suggestions from code review 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-16 23:50:06 -06:00
Travis Ralston
942cadc8a3 Merge branch 'develop' into travis/notifications-2 2021-07-16 16:20:23 -06:00
Travis Ralston
31d7de628e Small tweaks 2021-07-16 16:04:23 -06:00
Travis Ralston
b57fff5739 Update visual style and sandbox properly 2021-07-16 15:55:07 -06:00
David Baker
f9b45677d6 Fix bug where 'other homeserver' would unfocus 
It turns out the answer to this was not all that complex: we had
two nested <label>s: one for the radio button and one for the Field,
which presumably causes both of them to generate click events and
focus something and what ends up focused is some kind of race condition
depending on, apparently, how fast you click.

Notes: Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked.
 2021-07-16 22:27:31 +01:00
Šimon Brandner
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 21:43:33 +02:00
Šimon Brandner
18ba7a280d
Give sources a little padding 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 21:30:50 +02:00
Šimon Brandner
31f5d012b8
Improve the look and feel of the picker 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 21:16:07 +02:00
Šimon Brandner
d512a83a6c
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 19:37:57 +02:00
Šimon Brandner
41d5865dd7
Cleanup _ReplyTile.scss 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 19:26:04 +02:00
James Salter
9cb3c71afe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room 2021-07-16 09:34:30 +01:00
James Salter
a1c658f187 Set Menu icon to link 2021-07-16 09:07:52 +01:00
Šimon Brandner
a3792b75e2
Fix IRC layout replies 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 07:53:20 +02:00
Šimon Brandner
5d0afdb706
Don't show line number in replies 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 15:38:07 +02:00
Šimon Brandner
88da0f4dcf
Give audio and video replies an icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 15:17:41 +02:00
Šimon Brandner
68640a4dbd
Fix icon postion 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 15:16:05 +02:00
Šimon Brandner
375e279825
Add speaker icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 15:15:48 +02:00
Šimon Brandner
7f9f2dbbcb
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 14:54:06 +02:00
Michael Telatynski
dcb9b9b777 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/elements/MiniAvatarUploader.tsx
	src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
	src/i18n/strings/en_EN.json
	src/settings/handlers/RoomSettingsHandler.ts
	src/stores/SpaceStore.tsx
 2021-07-15 10:04:48 +01:00
Andrew Morgan
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements (#6363) 
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
 2021-07-15 09:55:58 +01:00
Germain Souquet
51c5094ca4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-14 17:47:22 +02:00
Šimon Brandner
acd37d2aad
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 16:53:05 +02:00
Travis Ralston
fe2eb5ebf0
Merge pull request #6370 from matrix-org/travis/voice_messages/right-panel 
Fix voice messages in right panels
 2021-07-14 08:46:55 -06:00
Germain Souquet
789d078814 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-14 16:26:22 +02:00
Germain Souquet
fc270b435c fix group layout 2021-07-14 15:32:35 +02:00
Šimon Brandner
782563af53
Override audio and video body with file body 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 10:47:29 +02:00
Šimon Brandner
f26c75bdcc
Use margin instead of padding 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 10:23:10 +02:00
Šimon Brandner
586e85cbff
Use MFileBody in replies 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 10:14:44 +02:00
Šimon Brandner
18355599e8
Fix senderProfile getting cutoff 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 10:07:41 +02:00
Šimon Brandner
6a285bed5a
Make the buttons easier to hit 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 09:06:41 +02:00
Travis Ralston
1f131db216 Set a max width on waveform-less tiles 2021-07-13 19:02:12 -06:00
Šimon Brandner
0bbdfefd0d
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-07-13 13:21:27 +02:00
Šimon Brandner
1bca5371d1
Fix redacted messages for the 100th #*&@*%^ time 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 13:18:01 +02:00
Šimon Brandner
8e456b062a
More unused CSS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 12:32:17 +02:00
Šimon Brandner
d149cead5f
Remove unused CSS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 12:27:03 +02:00
Šimon Brandner
b4ae54dcce
Remove unused CSS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 12:15:22 +02:00
Šimon Brandner
866a11d7e3
Fix image alignment issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 11:49:49 +02:00
Šimon Brandner
fca5125c5b
Improve redacted body look 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 10:36:44 +02:00
Germain Souquet
290174b031 fix group layout and IRC layout regressions 2021-07-13 10:36:35 +02:00
Germain Souquet
ba3e7e24ba Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-13 10:15:27 +02:00
Germain Souquet
1061cb0ffb Fix layout regressions in message bubbles 2021-07-13 10:15:12 +02:00
Šimon Brandner
562d43e81c
Font 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:36:31 +02:00
Šimon Brandner
43cf7bc611
Remove 0px 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:33:45 +02:00
Šimon Brandner
5f81cfe9d9
Nicer formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 08:24:18 +02:00
Travis Ralston
ff7a18da56 Rewrite Notifications component for modern UI & processing 2021-07-12 23:57:54 -06:00
Travis Ralston
3ae76c84f6 Add a simple TagComposer for the keywords entry 2021-07-12 23:55:08 -06:00
Šimon Brandner
4ddcb9a484
Make diffs look a bit better 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-12 16:59:16 +02:00
Šimon Brandner
3921e42e8a
Make diff colors in codeblocks more pleseant 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-12 12:32:30 +02:00
Germain
8a816bb096
Merge pull request #6331 from matrix-org/gsouquet/ghost-button-background 
Make ghost button background transparent
 2021-07-12 09:07:52 +01:00
Michael Telatynski
829169ec87
Merge pull request #6342 from matrix-org/t3chguy/fix/vrlp 
Fix small visual regression with the site name on url previews
 2021-07-09 18:05:48 +01:00
Michael Telatynski
8072007782 Fix small visual regression with the site name on url previews 2021-07-09 14:50:55 +01:00
Michael Telatynski
f412fb44a7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/SlashCommands.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
 2021-07-09 08:13:39 +01:00
Šimon Brandner
91d208d514
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-09 08:26:19 +02:00
Šimon Brandner
b7af39ffff
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 17:17:34 +02:00
Šimon Brandner
722c360de0
Use the correct color for silence button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 14:42:05 +02:00
Michael Telatynski
1c2bdf3cf4 delint 2021-07-08 13:35:26 +01:00
Šimon Brandner
2615ea7f3f
Add icons to buttons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 14:35:06 +02:00
Michael Telatynski
00a3f5d469 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494 2021-07-08 13:29:10 +01:00
Šimon Brandner
9ec3d93402
Better handling of call types 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 14:19:02 +02:00
Michael Telatynski
1cdae54880 Fix text wrapping for Link Preview Widget 2021-07-08 13:16:58 +01:00
Šimon Brandner
6f1fc3fc7e
Fix call button spacing issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 13:43:59 +02:00
Šimon Brandner
9c67679b35
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-07-08 13:30:57 +02:00
Šimon Brandner
6ef7ecbe08
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-08 13:22:56 +02:00
Germain Souquet
16dc3c47e1 Make ghost button background transparent 2021-07-08 10:37:40 +02:00
Michael Telatynski
b9a539eaa2 Improve URL Previews 
only show 2 by default with expand/collapse mechanism
show all hashes again, but dedup requests
clean up hide mechanism, instead of one `x` per preview have one per group
 2021-07-07 18:04:30 +01:00
Germain Souquet
55896223aa unbubble some type of events 2021-07-07 15:13:58 +02:00
Germain Souquet
6a03ab825f Fix style linting 2021-07-07 13:15:25 +02:00
Germain Souquet
10bdb3cefa Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-07 13:07:43 +02:00
Germain Souquet
870857f321 Right hand side border radius 2021-07-07 13:00:31 +02:00
Germain Souquet
7d946ee0db Restore action bar 2021-07-07 12:04:28 +02:00
Germain Souquet
b0a1fc7b97 Updated color scheme and spacing 2021-07-07 11:23:38 +02:00
Šimon Brandner
fc239ffd01
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 10:53:22 +02:00
Šimon Brandner
b5bad0cc23
Add comments 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 10:28:29 +02:00
Šimon Brandner
2cd2015e36
Use atom-one-light for light theme 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 10:24:59 +02:00
Šimon Brandner
f8307a92d8
Use atom-one-dark for dark theme 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 10:24:48 +02:00
Šimon Brandner
9d12439ee7
Give codeblocks a background color 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 09:22:56 +02:00
Šimon Brandner
8c1721fc35
Remove the old codeblock code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 09:22:50 +02:00
Michael Telatynski
eb9f4c609a Make CreateRoomDialog capable of creating restricted rooms in spaces 2021-07-06 10:10:47 +01:00
Michael Telatynski
c5ca98a3ad Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog 2021-07-06 10:10:25 +01:00
Michael Telatynski
82100df9ea Bring dropdown styling into closer line with rest of our styling 2021-07-06 10:08:57 +01:00
Germain Souquet
de875bbe1d fix avatar position and outline 2021-07-05 16:22:18 +02:00
Michael Telatynski
1b25ab930e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
 2021-07-05 13:06:22 +01:00
Germain
1b95762910
Merge pull request #6310 from matrix-org/gsouquet/faster-animations 2021-07-05 12:21:49 +01:00
David Baker
0cee0db9df Fix icon size in passphrase prompt 2021-07-02 20:38:07 +01:00
Germain Souquet
df64a076d9 Deprecate unused PulsedAvatar 2021-07-02 15:24:30 +01:00
Germain Souquet
a22baa1b2b move file drop image animation to compositor 2021-07-02 15:23:27 +01:00
Germain Souquet
a093ea6357 Move RightPanel animation to compositor 2021-07-02 15:23:03 +01:00
Germain Souquet
aac0989005 Make beta dot animation run on the compositor 2021-07-02 14:58:59 +01:00
Michael Telatynski
e8f0412fe3 Add way to manage Restricted join rule in Room Settings 2021-07-02 14:51:55 +01:00
Šimon Brandner
0d8f84c769
Delete lozenge effect 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 15:35:52 +02:00
Šimon Brandner
e582b1559b
Fix redacted messages (again) 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 15:09:02 +02:00
Šimon Brandner
0fe10e4502
Fix replies to deleted messages 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 14:22:46 +02:00
Šimon Brandner
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 13:14:14 +02:00
Tulir Asokan
5240209529 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-07-02 12:39:51 +03:00
Michael Telatynski
1f337b28ac Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash 
 Conflicts:
	src/ContentMessages.tsx
	src/components/structures/UploadBar.tsx
	src/components/views/messages/MImageBody.js
	src/components/views/messages/MStickerBody.js
	src/components/views/messages/MVideoBody.tsx
 2021-07-01 20:48:34 +01:00
David Baker
5e3c8fae5c put this just on the buttons 2021-07-01 15:22:44 +01:00
Germain Souquet
d90d1ca8db event list summary alignment in bubble layout 2021-07-01 14:56:34 +01:00
David Baker
66d95ed7b2 Fix button styling in verification bubbles 2021-07-01 14:51:20 +01:00
Germain Souquet
223b40c9d6 Add dark theme support 2021-07-01 14:23:00 +01:00
Travis Ralston
da8a783ca0 lint 2021-06-30 14:51:18 -06:00
Travis Ralston
12d7be2b6a Merge branch 'develop' into travis/new-audio 2021-06-30 13:25:41 -06:00
Germain Souquet
209344d443 improvements to bubble layout 2021-06-30 17:06:51 +01:00
Germain Souquet
d1c6cfe6b9 Improved message bubble layout (no reply) 2021-06-30 12:06:16 +01:00
Germain Souquet
d9eec1c03b Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-06-30 08:58:20 +01:00
Germain Souquet
fdced3da1b Remove reminescent references to the tinter 2021-06-30 08:09:55 +01:00
Germain Souquet
4cfdad8aa2 Add spacing between toast buttons with cross browser support in mind 2021-06-29 11:59:13 +01:00
Michael Telatynski
26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu 2021-06-29 08:18:07 +01:00
Travis Ralston
d6cf2346fe Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240 2021-06-28 21:00:36 -06:00
Travis Ralston
964a97d59e Merge remote-tracking branch 'origin/develop' into travis/new-audio 2021-06-28 20:52:44 -06:00
Travis Ralston
b6d9ecde8b
Merge pull request #6240 from matrix-org/gsouquet/voice-messages-waveform-perf 
Improve audio recording performance
 2021-06-28 20:49:21 -06:00
J. Ryan Stinnett
52b578fb3f
Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648 
Fix IRC layout regressions
 2021-06-28 16:10:02 +01:00
Michael Telatynski
494f4d3ab4
Merge pull request #6248 from matrix-org/t3chguy/fix/17731 2021-06-28 16:08:12 +01:00
Michael Telatynski
56514d51a6 Fix tiny scrollbar dot on chrome/electron in Forward Dialog 2021-06-28 15:37:28 +01:00
Germain Souquet
6cb86057c5 Merge branch 'develop' into gsouquet/voice-messages-waveform-perf 2021-06-28 09:29:11 +01:00
Šimon Brandner
43732e5c12
Inherit font-family 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-26 20:53:14 +02:00
Šimon Brandner
ed78bd9096
Remove explicitly set font-family in place where comments talk about FF 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-26 09:12:51 +02:00
Šimon Brandner
ffc6f96d45
Remove explicitly set font-family 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-26 09:12:45 +02:00
Šimon Brandner
fbe3eb7726
Remove unused class 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-26 09:00:42 +02:00
Michael Telatynski
1d374f6cbb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731 2021-06-25 14:50:24 +01:00
Michael Telatynski
2e940b7763
Update res/css/structures/_RoomStatusBar.scss 
Co-authored-by: Germain <germain@souquet.com>
 2021-06-25 14:47:17 +01:00
Michael Telatynski
1f27049a5d
Merge pull request #6257 from SimonBrandner/feature/pinned-click 2021-06-25 14:42:18 +01:00
Michael Telatynski
b371abe556
Merge pull request #6266 from matrix-org/t3chguy/fix/17768 
Fix space avatar management layout being broken
 2021-06-25 11:58:41 +01:00
Andrew Morgan
a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu (#6237) 
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
 2021-06-25 11:45:15 +01:00
Michael Telatynski
620e14eb4b Fix space avatar management layout being broken 2021-06-25 11:10:37 +01:00
Travis Ralston
7a6ee7d918 I know how CSS works. 2021-06-25 00:22:05 -06:00
Travis Ralston
e0a73a583e Increase clickable area of seek bar 2021-06-25 00:19:57 -06:00
Travis Ralston
dd53c25706 Fix right panel sizing 2021-06-24 20:37:34 -06:00
Travis Ralston
ebb6f1b602 Add seeking and notes about clock desync 2021-06-24 20:18:50 -06:00
Michael Weimann
086042f078
update message context texts and icons 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:53 +02:00
Michael Weimann
6ea79b297f
tweak message context icons 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:51 +02:00
Michael Weimann
8f6904ec1b
tweak the message menu cancel icon size 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:50 +02:00
Michael Weimann
74f61795eb
add _MessageContextMenu.scss license header 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:50 +02:00
Michael Weimann
62efea7e19
add message context menu icons 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:50 +02:00
Michael Weimann
e4eeafd485
migrate the message context menu to IconizedContextMenu 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:49 +02:00
Travis Ralston
9c752680ba Tile styling and early behaviour 2021-06-24 13:56:11 -06:00
Travis Ralston
ffef2e58cb Unify audio message types to new media body 2021-06-24 11:38:35 -06:00
Travis Ralston
8ce77e618f Reduce pointless CSS vars by 2 2021-06-24 11:38:35 -06:00
Travis Ralston
470778cbb8 Move voice message components to audio-generic directory 2021-06-24 11:38:35 -06:00
Travis Ralston
9f2eba4351 Fix class identifiers 2021-06-24 11:38:35 -06:00
Šimon Brandner
430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click 2021-06-24 16:59:18 +02:00
Michael Telatynski
6d3e7730ef Fix two PRs duplicating the css attribute 2021-06-24 11:40:49 +01:00
Michael Telatynski
71414904fc
Merge pull request #6201 from matrix-org/t3chguy/fix/15051 2021-06-24 11:20:12 +01:00
Michael Telatynski
26d8c4d2e6 Improve design of the multi inviter error dialog 2021-06-24 10:03:32 +01:00
Germain Souquet
09c22c37ff Add comment to specify variable origin 2021-06-24 10:01:44 +01:00
Šimon Brandner
0fe6a28853
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click 2021-06-24 10:57:09 +02:00
Germain Souquet
56467485f5 Merge branch 'develop' into gsouquet/voice-messages-waveform-perf 2021-06-24 09:42:47 +01:00
Šimon Brandner
8d47ea63c2
Make pinned message text clickable 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 10:41:55 +02:00
Michael Telatynski
0e2f617d94 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051 2021-06-24 09:33:39 +01:00
Michael Telatynski
47be728eb2 Fix invite dialog being cut off when it has limited results 2021-06-24 09:21:52 +01:00
Michael Telatynski
5d93216c94 Decrease e2e shield fill mask size so that it doesn't overlap 2021-06-23 16:10:47 +01:00
Michael Telatynski
cdb97d5494 Fix trashcan.svg by exporting it with its viewbox 
then fix sizing and alignment of consumers
 2021-06-23 12:30:23 +01:00
David Baker
f0ad70f0e7
Merge pull request #5786 from DantrazTrev/DialPad 
Dial Pad UI bug fixes
 2021-06-23 11:41:41 +01:00
Michael Telatynski
1286be1ffb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 
 Conflicts:
	src/components/views/room_settings/AliasSettings.tsx
 2021-06-22 22:02:09 +01:00
Michael Telatynski
6e3c647109 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 
 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock
 2021-06-22 21:15:53 +01:00
Michael Telatynski
e3e6b74272 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665 
 Conflicts:
	src/stores/SpaceStore.tsx
 2021-06-22 17:38:05 +01:00
Germain Souquet
27d255f30e Reduce audio waveform layout trashing 2021-06-22 12:27:54 +01:00