d479373af9
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 09:21:45 +02:00
94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071
2021-07-29 15:57:26 +01:00
493cd01ed3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
...
Conflicts:
res/css/views/dialogs/_AddExistingToSpaceDialog.scss
src/utils/space.tsx
2021-07-29 15:22:52 +01:00
efd8a2f9b0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/components/views/spaces/SpaceCreateMenu.tsx
src/i18n/strings/en_EN.json
2021-07-29 15:16:53 +01:00
5d9e421de0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
2021-07-28 17:58:34 +01:00
6123ccb2eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
2021-07-28 17:45:15 +01:00
39d9ec3ced
Merge branch 'develop' into t3chguy/fix/18071
2021-07-27 15:02:59 +01:00
b762303102
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:10:01 +02:00
410928745f
IncomingCallBox -> IncomingCallToast
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:46:22 +02:00
7ccc429bea
Change spaces beta feedback to not be so beta-centric
2021-07-23 15:47:11 +01:00
010baabfe6
Improve subspaces and some utilities around room/space creation
2021-07-23 08:46:20 +01:00
2841383e82
rethemendex
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 17:10:57 +02:00
18bb4bce35
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/stores/SpaceStore.tsx
2021-07-22 12:44:27 +01:00
5386d23008
Fix voice message tile taking up a couple extra px at the bottom
...
... by returning it to the default block shape.
2021-07-21 14:43:26 -06:00
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
1b2d70d816
Prompt user to leave rooms/subspaces in a space when leaving space
2021-07-21 09:57:10 +01:00
c25feb9b9f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-20 15:48:25 +02:00
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
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
06c9a060b4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-20 10:16:21 +02:00
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
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
942cadc8a3
Merge branch 'develop' into travis/notifications-2
2021-07-16 16:20:23 -06:00
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
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
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
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
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
0bbdfefd0d
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-07-13 13:21:27 +02:00
ba3e7e24ba
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-13 10:15:27 +02:00
3ae76c84f6
Add a simple TagComposer for the keywords entry
2021-07-12 23:55:08 -06:00
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
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
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
9c67679b35
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-07-08 13:30:57 +02:00
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
10bdb3cefa
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-07 13:07:43 +02:00
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
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
df64a076d9
Deprecate unused PulsedAvatar
2021-07-02 15:24:30 +01:00
e8f0412fe3
Add way to manage Restricted join rule in Room Settings
2021-07-02 14:51:55 +01:00
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
5240209529
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-07-02 12:39:51 +03:00
d9eec1c03b
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-06-30 08:58:20 +01:00
9c752680ba
Tile styling and early behaviour
2021-06-24 13:56:11 -06:00
ffef2e58cb
Unify audio message types to new media body
2021-06-24 11:38:35 -06:00
470778cbb8
Move voice message components to audio-generic directory
2021-06-24 11:38:35 -06:00
9f2eba4351
Fix class identifiers
2021-06-24 11:38:35 -06:00
adb42b7927
Deprecate FormButton to use AccessibleButton everywhere
2021-06-21 14:16:37 +01:00
6271c5c3d8
first iteration for message bubble layout
2021-06-18 18:59:22 +01:00
Šimon Brandner