Commit Graph

28156 Commits (ac3f0be8f7cd90cd92e9a47e3996a67f6a7b3f74)

Author SHA1 Message Date
Weblate ac3f0be8f7 Merge branch 'origin/develop' into Weblate. 2021-07-22 08:35:45 +00:00
Michael Telatynski e665e38b7b
Merge pull request #6413 from SimonBrandner/ts/address-stuff 2021-07-22 09:35:40 +01:00
Šimon Brandner adc177b28f
Fix a naming nit
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-22 10:30:12 +02:00
Weblate 729e6dd3d8 Merge branch 'origin/develop' into Weblate. 2021-07-22 08:23:00 +00:00
Michael Telatynski 9219661d7c
Merge pull request #5389 from matrix-org/t3chguy/fix/15536
Fix onPaste handler to work with copying files from Finder
2021-07-22 09:22:55 +01:00
Weblate 1c2a749cc0 Merge branch 'origin/develop' into Weblate. 2021-07-22 04:19:02 +00:00
XoseM c36e135506 Translated using Weblate (Galician)
Currently translated at 100.0% (3048 of 3048 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2021-07-22 04:19:02 +00:00
Jaiwanth 517e8951ee Apply suggestions from review 2021-07-22 08:30:18 +05:30
Jaiwanth 76040c652c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room 2021-07-22 08:25:24 +05:30
Weblate 6e655b3d16 Merge branch 'origin/develop' into Weblate. 2021-07-22 02:38:53 +00:00
Jeff Huang 2bb80a2793 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3048 of 3048 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-07-22 02:38:53 +00:00
Travis Ralston 05353d0fe5
Merge pull request #6388 from aaronraimist/matrix-url-permitted
Add matrix: to the list of permitted URL schemes
2021-07-21 20:38:45 -06:00
Weblate cfe267a186 Merge branch 'origin/develop' into Weblate. 2021-07-22 01:44:09 +00:00
Travis Ralston c384575375
Merge pull request #6261 from robintown/watch-show-timestamps
Add alwaysShowTimestamps and others to RoomView setting watchers
2021-07-21 19:44:04 -06:00
Weblate ddea1461a7 Merge branch 'origin/develop' into Weblate. 2021-07-21 19:07:28 +00:00
Travis Ralston 36d4eb85e1 Restore 'use default' naming on room notifications
Fixes https://github.com/vector-im/element-web/issues/18139
Following https://github.com/matrix-org/matrix-react-sdk/pull/6352
2021-07-21 13:01:19 -06:00
Šimon Brandner 34f3e62f72
Types!
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 20:48:50 +02:00
Weblate 36c66fe279 Merge branch 'origin/develop' into Weblate. 2021-07-21 16:17:55 +00:00
Germain 0d8309c8fc
Merge pull request #6429 from matrix-org/gsouquet/fix-18146 2021-07-21 17:17:51 +01:00
Weblate 20edfc9c25 Merge branch 'origin/develop' into Weblate. 2021-07-21 15:59:28 +00:00
David Baker a6c432d66f fix types
in varyingly hacky ways
2021-07-21 16:39:41 +01:00
Germain Souquet 26ca41f699 Cache room member count on the messagePanel 2021-07-21 17:26:41 +02:00
Germain Souquet 43d62aa8c1 Use more performant getMembersCount to decide to hide or show sender 2021-07-21 16:43:57 +02:00
Weblate 0a064b89e5 Merge branch 'origin/develop' into Weblate. 2021-07-21 14:12:02 +00:00
Germain 80e64601a9
Merge pull request #6427 from matrix-org/gsouquet/fix-18120
Improve new layout switcher UI
2021-07-21 15:11:58 +01:00
Germain Souquet e5bc5a933e Use cached value to read member count 2021-07-21 16:10:18 +02:00
Weblate 0ccde3dfbb Merge branch 'origin/develop' into Weblate. 2021-07-21 13:58:52 +00:00
Travis Ralston 34b8870a95
Merge pull request #6417 from matrix-org/travis/voice-messages/play-1
Play only one audio file at a time
2021-07-21 07:58:46 -06:00
Weblate 77e095c10a Merge branch 'origin/develop' into Weblate. 2021-07-21 13:38:56 +00:00
jelv 2c370325b7 Translated using Weblate (Dutch)
Currently translated at 100.0% (3045 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-07-21 13:38:55 +00:00
Šimon Brandner e8760736ba
Merge remote-tracking branch 'upstream/develop' into fix/file-label-behaviour
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 15:33:06 +02:00
Germain Souquet c155382445 Improve new layout switcher UI 2021-07-21 14:55:30 +02:00
Weblate 67f24b55c9 Merge branch 'origin/develop' into Weblate. 2021-07-21 10:56:47 +00:00
libexus 3292374ac0 Translated using Weblate (German)
Currently translated at 98.9% (3013 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-07-21 10:54:38 +00:00
Germain Souquet ae51653348 Add null guard for room prop in EventTile 2021-07-21 12:41:02 +02:00
Weblate 99bc204669 Merge branch 'origin/develop' into Weblate. 2021-07-21 10:30:26 +00:00
Besnik Bleta 4c82f161c3 Translated using Weblate (Albanian)
Currently translated at 99.7% (3038 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
2021-07-21 10:30:26 +00:00
Michael Telatynski 5a7fe60d0e
Merge pull request #6416 from robintown/non-emoji-reactions 2021-07-21 11:30:15 +01:00
Weblate 2706e29579 Merge branch 'origin/develop' into Weblate. 2021-07-21 08:43:20 +00:00
Germain b31b8f1b41
Remove old container sizing comment
Co-authored-by: James Salter <jamess@element.io>
2021-07-21 09:13:12 +01:00
Germain Souquet a7cd5fc49b Shift thumbnail dislay to use object-fit to preserve aspect-ratio 2021-07-21 10:03:10 +02:00
Germain Souquet 794c49c5db Migrate MStickerBody to TypeScript 2021-07-21 09:52:09 +02:00
Weblate 430df6d083 Merge branch 'origin/develop' into Weblate. 2021-07-21 07:36:13 +00:00
Germain Souquet 54841d63dc Fix wrench-tests by importing EmbeddedPage through sdk.getComponent 2021-07-21 09:29:33 +02:00
Robin Townsend 1d1d93ed14 Apply code review suggestion
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-21 03:17:55 -04:00
Priit Jõerüüt 4c00b807c2 Translated using Weblate (Estonian)
Currently translated at 99.3% (3025 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-07-21 06:55:16 +00:00
XoseM e9ee55ceb3 Translated using Weblate (Galician)
Currently translated at 100.0% (3045 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2021-07-21 06:55:13 +00:00
Jeff Huang 5f29fa55bb Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3045 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-07-21 06:55:08 +00:00
libexus 6e6a227b13 Translated using Weblate (German)
Currently translated at 98.9% (3012 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-07-21 06:55:03 +00:00
libexus d80c6b6f25 Translated using Weblate (German)
Currently translated at 98.6% (3003 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-07-21 06:02:27 +00:00