Michael Telatynski
9fb1c8e4cd
Iterate PR
2021-07-28 19:33:07 +01:00
Michael Telatynski
ac800ad94d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
2021-07-28 19:24:26 +01:00
Michael Telatynski
67ef263940
Refactor SpaceButton to be more reusable and add context menu to Home button
2021-07-28 17:40:33 +01:00
Michael Telatynski
07b9d6b30b
Fix styling of setting flag descriptions in preferences
...
and add description to spaces all/home setting
and make it an account setting rather than device one
and hide it from the Beta card
2021-07-28 14:39:19 +01:00
Michael Telatynski
f91a20cb02
Merge pull request #6484 from matrix-org/t3chguy/fix/18095
2021-07-28 13:51:45 +01:00
Michael Telatynski
52e50863f8
Fix CreateRoomDialog exploding when making public room outside of a space
2021-07-28 08:39:59 +01:00
Michael Telatynski
776435f620
Switch all-rooms toggle for spaces to non-feature settings key
2021-07-27 21:17:24 +01:00
Šimon Brandner
24f0c760ce
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 16:25:38 +02:00
Michael Telatynski
353c70ad75
i18n
2021-07-27 14:45:36 +01:00
Šimon Brandner
29b0d03fe4
Update copy
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 21:27:22 +02:00
Šimon Brandner
456800af21
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 10:57:51 +02:00
Šimon Brandner
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
Michael Telatynski
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
Travis Ralston
0bb0c8105d
Merge pull request #6434 from matrix-org/travis/voice-messages/upload-failed
...
Handle upload errors in voice messages
2021-07-22 03:40:26 -06:00
Travis Ralston
079e75aae9
Handle upload errors in voice messages
...
Fixes https://github.com/vector-im/element-web/issues/17148
Mostly adding some try/catch blocks, and a generic dialog.
2021-07-21 16:11:10 -06:00
Travis Ralston
3d72b9e227
Render error state for audio components
...
Fixes https://github.com/vector-im/element-web/issues/17148
Both `AudioPlayer` and `RecordingPlayback` got a fragment added to their DOM structure, to incorporate the rarely seen error message below it. Additionally, a missing try/catch was added to the `Playback` class to handle uncaught decoding issues.
The similarity of the components is tracked in https://github.com/vector-im/element-web/issues/18161
2021-07-21 15:47:52 -06:00
Travis Ralston
36d4eb85e1
Restore 'use default' naming on room notifications
...
Fixes https://github.com/vector-im/element-web/issues/18139
Following https://github.com/matrix-org/matrix-react-sdk/pull/6352
2021-07-21 13:01:19 -06:00
Šimon Brandner
ddd4b4bc12
Show a "Your camera is turned off" toast
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:22:47 +02:00
Šimon Brandner
51cf426179
Update the toast
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 16:08:18 +02:00
Šimon Brandner
be52eba027
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-21 15:56:08 +02:00
Šimon Brandner
e8760736ba
Merge remote-tracking branch 'upstream/develop' into fix/file-label-behaviour
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 15:33:06 +02: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
Michael Telatynski
a58edcb241
tweak copy
2021-07-21 10:43:12 +01: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
3751f04cef
Add "You are presenting toast"
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:17:07 +02:00
Šimon Brandner
c25feb9b9f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-20 15:48:25 +02: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
Michael Telatynski
b94886a291
i18n irc and fix lint from merge conflict
2021-07-20 11:18:27 +01:00
Germain Souquet
06c9a060b4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-20 10:16:21 +02:00
Travis Ralston
6862d97961
APPEASE THY JSON
2021-07-19 10:18:15 -06:00
Šimon Brandner
3250b35151
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-19 18:10:31 +02: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
James Salter
f9fbf6f210
Rename Copy Link to Copy Room Link
...
Being explicit is clearer when this context menu applies to DM rooms, to make it clear that the link will be to the room and not to the person
2021-07-19 15:05:04 +01: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
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
Š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
27b02617c2
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:16:14 +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
James Salter
767d97065d
Run i18n
2021-07-16 09:36:59 +01: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
7464900f95
Change menu label to Copy Link
2021-07-16 09:05:01 +01:00
Michael Telatynski
5986609731
i18n
2021-07-15 10:05:37 +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
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming
2021-07-15 08:07:03 +01:00
James Salter
e054af7f38
Run yarn i18n
2021-07-14 15:35:57 +01:00
Germain Souquet
789d078814
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-14 16:26:22 +02:00