e88edba650
Merge branch 'develop' into export-conversations
2021-08-12 17:10:13 +05:30
228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092
2021-08-12 11:28:14 +01:00
db951b43a3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-10 09:48:22 +01:00
45ce352d02
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-08-09 10:44:13 +05:30
0cad9ed14a
Add _CallViewButtons.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-08 11:15:18 +02:00
fe1dfa209a
rethemendex
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-07 10:13:27 +02:00
b6f7c4fe95
Merge pull request #6475 from matrix-org/jitsi-picture-in-picture
...
Refactor Calls components into smaller pieces for future Widgets work
2021-08-06 18:03:30 +02:00
3b002c4c1f
Merge remote-tracking branch 'origin/develop' into jitsi-picture-in-picture
...
* origin/develop: (100 commits)
Add comments to isRegionalIndicator
Stop voice messages that are playing when starting a recording
Properly set style attribute on shared usercontent iframe
Fix in-call context menus when in PiP mode (#6552 )
Extract tooltipYOffset to a const
Increase yOffset by 4px away
i18n
Post-merge conflict resolution and improve alignment of tooltips
Fix image & blurhash info when skipping thumbnail due to thresholds
Skip sending a thumbnail if it is not a sufficient saving over the original
Null guard space inviter to prevent the app exploding
Remove seams from pin icon
Appease Jest
Fix worklet reference for new webpack pipeline
i18n
Update copy
Fix wrong cursor being used in PiP
Fix voice feed cut-off
Use flex-start as it has more universal support
Wrap cases in {}
...
2021-08-06 13:25:14 +02:00
25c6b216b0
Move LayoutSwitcher CSS to a separate file
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 10:37:42 +02:00
2d3211ccf6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-04 12:14:29 +01:00
a6e5112be0
Offer a way to create a space based on existing community
2021-08-04 10:37:35 +01:00
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
3ab54bce6e
Move CallViewHeader css to separate file
2021-08-03 15:21:14 +02:00
17e9cf4d2a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-30 12:17:31 +05:30
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
b04bfeda33
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-07-26 00:18:56 +05:30
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
1ed316851a
Merge upstream and resolve conflicts
2021-07-21 11:35:27 +05:30
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
fe2cac56f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-19 12:57:27 +05:30
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
6a4e2672f6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-10 19:18:01 +05:30
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
Jaiwanth