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
d5581f00cc
Merge pull request #6239 from matrix-org/t3chguy/fix/17605
2021-06-22 22:56:49 +01:00
Michael Telatynski
9f20d6661d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17605
...
Conflicts:
src/components/views/spaces/SpaceTreeLevel.tsx
2021-06-22 22:49:28 +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
99e3aea1e5
i18n and regen yarn lock
2021-06-22 21:17:33 +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
Michael Telatynski
4a66794236
update copy
2021-06-22 17:26:19 +01:00
Michael Telatynski
3c9cd938d0
remove spurious full stop
2021-06-22 15:29:53 +01:00
Germain
5b72423ea3
Merge pull request #6230 from matrix-org/gsouquet/fix-17051
2021-06-22 15:07:04 +01:00
Michael Telatynski
847e3dcbce
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1
...
Conflicts:
src/dispatcher/actions.ts
2021-06-22 14:11:37 +01:00
Michael Telatynski
1f0fdb95cd
Improve accessibility of subspaces in the space panel
2021-06-22 11:59:04 +01:00
Germain Souquet
7825c30bf7
Improve event index initialisation failure message in search bar for supported platforms
2021-06-21 15:41:47 +01:00
David Teller
77a4d345bd
Submitting abuse reports to moderators ( #6213 )
...
This patch is part of MSC3215. It implements `feature_report_to_moderator`
to let end-users send report to room moderators instead of homeserver
administrators.
This only works if the room has been setup for moderation, something that
does not have a UX yet.
Signed-off-by: David Teller <davidt@element.io>
2021-06-18 18:09:02 +02:00
Germain
71ff5248fe
Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591
2021-06-17 16:41:00 +01:00
Michael Telatynski
7d90612371
Iterate PR
2021-06-17 16:22:40 +01:00
Michael Telatynski
100de336a1
i18n
2021-06-16 20:12:31 +01:00
Michael Telatynski
b4fbc791bb
Add experimental options to the Spaces beta
2021-06-16 09:01:13 +01:00
Michael Telatynski
89221bde0f
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1
...
Conflicts:
src/dispatcher/actions.ts
2021-06-15 13:58:13 +01:00
Michael Telatynski
83c30b2280
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
...
Conflicts:
src/components/views/spaces/SpaceCreateMenu.tsx
2021-06-15 12:24:26 +01:00
Michael Telatynski
539465ecb4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
...
Conflicts:
src/components/views/dialogs/InviteDialog.tsx
2021-06-14 22:22:30 +01:00
Germain Souquet
6606a1142d
Update unencrypted room warning copy
2021-06-10 11:29:10 +01:00
Germain Souquet
7f3173f170
Implement unencrypted warning slate in rooms
2021-06-10 11:14:43 +01:00
Germain Souquet
c2d1eb3e8e
Merge branch 'develop' into gsouquet-e2ee-warning
2021-06-10 10:25:20 +01:00
Germain
8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf
2021-06-09 09:13:56 +01:00
Michael Telatynski
2b99afc741
i18n
2021-06-08 17:05:56 +01:00
Michael Telatynski
f34a2e61bc
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
2021-06-08 16:54:49 +01:00
Michael Telatynski
34cc494a8e
Merge pull request #6140 from matrix-org/t3chguy/fix/17553
2021-06-08 16:45:35 +01:00
Michael Telatynski
90bb7c1482
Switch Space Settings for a tabbed view with a bunch more settings exposed
2021-06-08 16:33:47 +01:00
David Baker
399be4fa5d
Merge pull request #6161 from matrix-org/dbkr/widget_load_error
...
Better handling for widgets that fail to load
2021-06-08 16:28:44 +01:00
David Baker
90a58380fd
Make it translateable
...
And also the other one that I copied from
2021-06-08 16:15:20 +01:00
Robin Townsend
b97867271b
Merge branch 'develop' into improved-forwarding-ui
2021-06-07 19:09:36 -04:00
Michael Telatynski
f3aa505673
Add warning to private space creation flow
2021-06-07 14:14:31 +01:00
Michael Telatynski
8c34a8461e
Add way to specify address during public space creation
2021-06-07 08:57:39 +01:00
Michael Telatynski
b2b95257a8
Convert RoomAliasField to Typescript
2021-06-07 08:54:41 +01:00
Robin Townsend
21ff1f521f
Fix i18n strings
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 23:14:26 -04:00
Robin Townsend
a06306d560
Merge branch 'develop' into improved-forwarding-ui
2021-06-05 11:04:17 -04:00
Michael Telatynski
93f41ce0ab
Actually finish the empty state for the pinned messages card
2021-06-04 11:35:17 +01:00
Šimon Brandner
629201a074
Merge branch 'develop' into fix/mute-incoming-call/15591
2021-06-04 07:59:28 +02:00
Michael Telatynski
93010d34fd
Merge branch 'develop' into t3chguy/fix/6606
2021-06-03 19:33:09 +01:00
Michael Telatynski
4f50727010
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606
...
Conflicts:
src/components/structures/RoomView.tsx
src/components/views/right_panel/UserInfo.tsx
2021-06-03 08:42:05 +01:00
David Baker
58652152c1
Strings are now in a different place...
2021-06-02 17:52:26 +01:00
Robin Townsend
56714525f2
Merge branch 'develop' into improved-forwarding-ui
2021-06-01 17:28:55 -04:00
Michael Telatynski
d319768b2e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
...
Conflicts:
src/components/views/dialogs/InviteDialog.tsx
2021-05-28 13:06:48 +01:00
Nique Woodhouse
ea26393709
Styling amends to accommodate the invite dialog footer
2021-05-28 13:00:18 +01:00
David Baker
c4a26893a0
Handle user_busy in voip calls
...
Newly added to MSC2746
2021-05-27 18:57:22 +01:00
Michael Telatynski
f75fb3b349
Add footer and privacy note to the start dm dialog
2021-05-27 15:51:25 +01:00
Michael Telatynski
0758c09d9e
i18n
2021-05-26 14:06:12 +01:00
Michael Telatynski
27ad90760d
Iterate pinned messages
2021-05-26 13:51:17 +01:00
Michael Telatynski
fd74a946e0
add header
2021-05-25 17:24:43 +01:00
Michael Telatynski
42ffc5c9e8
Add support to keyboard shortcuts dialog for [digits]
2021-05-24 18:08:43 +01:00
