Germain Souquet
10bdb3cefa
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-07 13:07:43 +02:00
Germain
7d6342fa40
Merge pull request #6315 from matrix-org/gsouquet/ts-1
2021-07-06 12:04:18 +01:00
Germain Souquet
8d34767768
Fix i18n after deprecation
2021-07-05 09:18:16 +02:00
Šimon Brandner
4f70d9021a
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-01 19:05:11 +02:00
Šimon Brandner
e355bf0db1
Merge remote-tracking branch 'upstream/develop' into reorganize-preferences
2021-07-01 18:53:53 +02:00
David Baker
404aa96f48
i18n
2021-07-01 15:13:24 +01:00
Travis Ralston
12d7be2b6a
Merge branch 'develop' into travis/new-audio
2021-06-30 13:25:41 -06:00
Germain Souquet
209344d443
improvements to bubble layout
2021-06-30 17:06:51 +01:00
Germain
640fc591bb
Merge pull request #6279 from matrix-org/gsouquet/deprecate-tinter
...
Deprecate Tinter and TintableSVG
2021-06-29 15:22:48 +01:00
Govindas
d68fa223bc
Translated using Weblate (Lithuanian)
...
Currently translated at 65.5% (1941 of 2961 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
2021-06-29 13:08:42 +00:00
Weblate
0b4cb9af54
Merge branch 'origin/develop' into Weblate.
2021-06-29 13:02:29 +00:00
Priit Jõerüüt
8d79a10135
Translated using Weblate (Estonian)
...
Currently translated at 99.8% (2988 of 2993 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-06-29 13:02:26 +00:00
Govindas
7df42b1bdb
Translated using Weblate (Lithuanian)
...
Currently translated at 65.1% (1951 of 2993 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
2021-06-29 13:02:24 +00:00
libexus
f35fe7c57f
Translated using Weblate (German)
...
Currently translated at 99.8% (2988 of 2993 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-06-29 13:02:12 +00:00
J. Ryan Stinnett
14ef38e057
Merge pull request #6280 from robintown/group-acls
...
Group ACLs with MELS
2021-06-29 10:02:12 +01:00
Michael Telatynski
26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu
2021-06-29 08:18:07 +01:00
Travis Ralston
964a97d59e
Merge remote-tracking branch 'origin/develop' into travis/new-audio
2021-06-28 20:52:44 -06:00
Robin Townsend
a11193e243
Group ACLs with MELS
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-28 12:36:40 -04:00
Germain Souquet
6607294573
Deprecate Tinter and TintableSVG
2021-06-28 17:13:23 +01:00
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
Priit Jõerüüt
39cb5a7058
Translated using Weblate (Estonian)
...
Currently translated at 99.8% (2988 of 2993 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-06-25 13:35:17 +00:00
Andrei
e539b91d58
Translated using Weblate (Romanian)
...
Currently translated at 3.6% (110 of 2993 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ro/
2021-06-25 13:35:15 +00:00
Ridhubharan
4ce5df2fb5
Translated using Weblate (Tamil)
...
Currently translated at 6.7% (202 of 2993 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ta/
2021-06-25 13:35:10 +00:00
Kaede
213cd39030
Translated using Weblate (Japanese)
...
Currently translated at 77.5% (2322 of 2993 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
2021-06-25 13:35:01 +00:00
m4sk1n
037ac3ce8d
Translated using Weblate (Polish)
...
Currently translated at 73.2% (2193 of 2993 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pl/
2021-06-25 13:34:59 +00:00
rkfg
628c91485b
Translated using Weblate (Russian)
...
Currently translated at 94.9% (2842 of 2993 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
2021-06-25 13:34:56 +00:00
Thibault Martin
2ff45339f7
Translated using Weblate (French)
...
Currently translated at 100.0% (2993 of 2993 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
2021-06-25 13:34:52 +00:00
libexus
3f10420503
Translated using Weblate (German)
...
Currently translated at 99.6% (2983 of 2993 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-06-25 13:34:48 +00: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
Michael Weimann
086042f078
update message context texts and icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:53 +02:00
Michael Weimann
9a1be63baa
reorder message context menu items
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:52 +02:00
Michael Weimann
c2d51a115b
tweak message context labels
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:52 +02:00
Travis Ralston
9c752680ba
Tile styling and early behaviour
2021-06-24 13:56:11 -06:00
Š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
Š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
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
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