Jaiwanth
e404fa3cae
Apply suggestions
2021-06-29 10:57:02 +05:30
Jaiwanth
64b683a0df
Add cancel warning and progress completion modals
2021-06-28 12:20:41 +05:30
Jaiwanth
d8f763664b
Add warning modal during export
2021-06-27 22:18:43 +05:30
Jaiwanth
398d49245f
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-06-26 23:42:42 +05:30
Jaiwanth
46f34ba455
Add validation
2021-06-26 23:07:38 +05:30
Jaiwanth
e505646f21
Finish dialog implementation of export settings
2021-06-26 21:54:10 +05:30
Jaiwanth
92e34c7993
Format dropdown
2021-06-26 13:04:10 +05:30
Jaiwanth
c3dc51c452
Create export dialog and async import export utils
2021-06-26 12:14:18 +05:30
Jaiwanth
4d6ad91e52
Add export option to right panel
2021-06-25 22:45:14 +05:30
Michael Telatynski
6d6995e6fb
Merge pull request #6265 from matrix-org/t3chguy/fix/17770
2021-06-25 15:43:33 +01:00
Michael Telatynski
1f27049a5d
Merge pull request #6257 from SimonBrandner/feature/pinned-click
2021-06-25 14:42:18 +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
a8649ca091
i18n
2021-06-25 11:02:33 +01:00
Jaiwanth
c885cd719f
i18n
2021-06-25 14:58:59 +05:30
Jaiwanth
91b8b2ac5a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-24 22:54:40 +05:30
Šimon Brandner
430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click
2021-06-24 16:59:18 +02:00
Travis Ralston
006c6df205
Merge pull request #6253 from matrix-org/travis/leave-reasons
...
Update membership reason handling, including leave reason displaying
2021-06-24 08:52:34 -06:00
Jaiwanth
544761329c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-24 18:33:30 +05:30
Šimon Brandner
6333d4aa36
Iterate PR
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:02:06 +02:00
Michael Telatynski
26d8c4d2e6
Improve design of the multi inviter error dialog
2021-06-24 10:03:32 +01:00
Šimon Brandner
7eb3642692
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 10:42:01 +02:00
Jaiwanth
4bfac11911
i18n
2021-06-24 14:04:37 +05:30
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
Travis Ralston
72099c1a08
Update punctuation
2021-06-23 19:42:47 -06:00
Travis Ralston
e696a1d5dc
Update membership reason handling, including leave reason displaying
...
Incorporates ideas from https://github.com/matrix-org/matrix-react-sdk/pull/6198
2021-06-23 10:31:08 -06:00
Jaiwanth
b2162c3be9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-23 12:09:46 +05:30
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
Jaiwanth
36a69313cd
Display redactedBecauseUserId for redacted events
2021-06-22 14:53:48 +05:30
Jaiwanth
db875508d8
Add text for room avatar events and skip empty text events
2021-06-22 12:50:15 +05:30
Jaiwanth
12ecaf30df
i18n
2021-06-22 12:14:31 +05:30
Jaiwanth
45be4a6d02
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-22 09:27:37 +05:30
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
35e68b8aa5
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
2021-06-17 15:45:32 +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
Jaiwanth
cff4521106
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-16 10:52:00 +05:30
Weblate
12f8e5b278
Merge branch 'origin/develop' into Weblate.
2021-06-15 14:40:39 +00:00
Besnik Bleta
6d56c9eab4
Translated using Weblate (Albanian)
...
Currently translated at 99.7% (2972 of 2979 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
2021-06-15 14:40:33 +00:00
