Commit graph

8406 commits

Author SHA1 Message Date
Šimon Brandner
27ec3af03a
Merge branch 'develop' into feed
Looking forward to merging again! :D

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-03 09:15:55 +02:00
David Baker
cd39474d26
Merge pull request #5798 from matrix-org/dbkr/attended_transfer
Attended transfer
2021-04-01 17:34:30 +01:00
Germain Souquet
a4345811b0 Merge branch 'develop' into gsouquet-seshat-reset 2021-04-01 09:06:35 +01:00
Germain Souquet
85f9e43f01 Update seshat reset dialog copy 2021-04-01 09:03:50 +01:00
J. Ryan Stinnett
58343c7699 Fix search error typo
This fixes a typo in the recently added search error message.
2021-03-31 11:55:21 +01:00
David Baker
299467c515 Merge remote-tracking branch 'origin/develop' into dbkr/attended_transfer 2021-03-31 10:14:48 +01:00
J. Ryan Stinnett
b089f3d2f9
Merge pull request #5585 from ndarilek/label-base-avatar
Label unlabeled avatar button in event panel
2021-03-30 12:21:17 +01:00
J. Ryan Stinnett
661202839c
Merge pull request #5696 from robintown/spoiler-command
Add /spoiler command
2021-03-30 11:58:33 +01:00
Germain
096d4102b8
Merge pull request #5793 from matrix-org/gsouquet-warn-before-exit
Add user settings for warn before exit
2021-03-29 12:11:55 +01:00
Michael Telatynski
83612dd4ad
Merge pull request #5792 from matrix-org/t3chguy/spaces4.12
Fixing spaces papercuts
2021-03-26 15:01:31 +00:00
Hubert Chathi
e23583db40
Merge pull request #5763 from uhoreg/room-history-key-sharing2
Share keys for historical messages when inviting users to encrypted rooms
2021-03-26 10:41:54 -04:00
Michael Telatynski
9b4af91014 delint 2021-03-26 13:25:06 +00:00
J. Ryan Stinnett
fd59a66523 Tweak cross-signing copy
This makes some Design-approved copy tweaks to the recent cross-signing flow
changes.
2021-03-26 11:13:39 +00:00
Michael Telatynski
8c6d92cc99 Move space room discovery & management into the space room view 2021-03-26 09:54:15 +00:00
Germain Souquet
c40f97fa25 Add reset option for corrupted event index store 2021-03-26 09:44:52 +00:00
Hubert Chathi
db2f573410 Merge branch 'develop' into room-history-key-sharing2 2021-03-25 19:28:50 -04:00
Hubert Chathi
46fd549ace update with new suggested design 2021-03-25 19:27:14 -04:00
Robin Townsend
8a709b3bf9 Merge branch 'develop' into spoiler-command 2021-03-25 18:20:29 -04:00
David Baker
82ba546142 WIP attended transfer 2021-03-25 19:56:21 +00:00
Michael Telatynski
5061db259a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces4.12 2021-03-25 16:37:56 +00:00
Michael Telatynski
ea77ab125e Show a face pile on a space preview 2021-03-25 16:15:34 +00:00
Germain
356e4bc6fc
Merge pull request #5785 from matrix-org/gsouquet-failed-invites 2021-03-25 14:54:21 +00:00
Germain
80013a2efa
Merge pull request #5787 from matrix-org/gsouquet-event-indexing-settings
Improve error reporting when EventIndex fails on a supported environment
2021-03-25 14:53:15 +00:00
Germain Souquet
25a47b463e Add user settings for warn before exit 2021-03-25 14:14:38 +00:00
Michael Telatynski
3ce9db162e Tweak some spaces copy 2021-03-25 13:24:16 +00:00
Germain Souquet
510f08e9f1 Update failed invites copy 2021-03-25 10:11:52 +00:00
Michael Telatynski
760b11f214
Merge pull request #5789 from matrix-org/t3chguy/spaces4.11
Tweak and fix some space features
2021-03-25 09:02:11 +00:00
Michael Telatynski
62172ba43d i18n 2021-03-24 19:43:42 +00:00
Travis Ralston
8587ec888b
Merge pull request #5769 from matrix-org/travis/voice-messages/exp
Labs feature: Early implementation of voice messages
2021-03-24 09:56:34 -06:00
Weblate
feca8ba072 Merge branch 'origin/develop' into Weblate. 2021-03-24 15:48:41 +00:00
Graeme Power
8e33e0343d Translated using Weblate (Irish)
Currently translated at 23.2% (671 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ga/
2021-03-24 15:48:38 +00:00
waclaw66
1f489662fb Translated using Weblate (Czech)
Currently translated at 100.0% (2889 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-03-24 15:48:36 +00:00
BinotaLIU
af0b4ef410 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2889 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-03-24 15:48:35 +00:00
RainSlide
563403cee8 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2889 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-03-24 15:48:35 +00:00
RainSlide
3ec45eda6a Translated using Weblate (Chinese (Simplified))
Currently translated at 86.4% (2497 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
2021-03-24 15:48:33 +00:00
Nikita Epifanov
3a401a3151 Translated using Weblate (Russian)
Currently translated at 95.6% (2763 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
2021-03-24 15:48:01 +00:00
Marcelo Filho
efa57e5121 Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.1% (2865 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
2021-03-24 15:47:57 +00:00
Balázs Meskó
d748460716 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2889 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-03-24 15:47:42 +00:00
Germain Souquet
5104d7bed8 Improve error reporting when EventIndex fails on a supported environment 2021-03-24 11:51:39 +00:00
Nolan Darilek
e5d5e1cce2 Label unlabeled avatar button in event panel.
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
2021-03-23 10:00:34 -05:00
Michael Telatynski
03ab2dc8e0
Merge pull request #5776 from matrix-org/t3chguy/spaces4.10
Improve discovery of rooms in a space
2021-03-22 13:24:23 +00:00
Michael Telatynski
128c7db28e
Merge pull request #5777 from matrix-org/t3chguy/spaces4.9
Spaces improve creation journeys
2021-03-22 13:24:10 +00:00
rkfg
90c3ca3a2e Translated using Weblate (Russian)
Currently translated at 95.6% (2763 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
2021-03-20 20:34:18 +00:00
@a2sc:matrix.org
60efd3c4c0 Translated using Weblate (German)
Currently translated at 96.7% (2794 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-03-20 20:34:16 +00:00
libexus
48db1a5967 Translated using Weblate (German)
Currently translated at 96.7% (2794 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-03-20 20:34:16 +00:00
Michael Telatynski
98df2883d3
Merge pull request #5728 from matrix-org/t3chguy/fix/3657
Collapse redactions into an event list summary
2021-03-19 19:16:20 +00:00
Jaiwanth
70e0b77fc4 Changed invite phrases in context menu and invite dialog 2021-03-19 21:32:52 +05:30
Michael Telatynski
76dffdcb2c Tweak space creation copy and auto focus fields 2021-03-19 13:20:30 +00:00
Michael Telatynski
c6f6d24b32 Iterate space creation and previews 2021-03-19 13:20:30 +00:00
Michael Telatynski
90d87122bc Tweak copy on space creation flows 2021-03-19 13:20:30 +00:00