Commit Graph

35855 Commits (4755a81403cdfc8ecb46eab7397e04ce87c331dc)

Author SHA1 Message Date
Šimon Brandner 51cf426179
Update the toast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 16:08: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
James Salter 4c6b0d35ad Improve analytics interface
* Make it an error to call it before its initialised, and separately track whether its been enabled
* Use anonmity enum in the public interface
* Properly await upstream calls
* Fix accidental test fixture cross-reliance
2021-07-21 14:58:43 +01:00
Šimon Brandner be52eba027
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-21 15:56:08 +02: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
Michael Telatynski cdac3f9f5d
Merge pull request #6404 from SimonBrandner/fix/file-label-behaviour 2021-07-21 14:38:47 +01: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 0fb210cadb Increase hit area for timestamp in message bubbles 2021-07-21 15:31:10 +02:00
Germain Souquet c155382445 Improve new layout switcher UI 2021-07-21 14:55:30 +02:00
James Salter 6da3cc8ca1 Redact sensitive data 2021-07-21 13:48:10 +01:00
Weblate 4f7d6d0b5b Merge branch 'origin/develop' into Weblate. 2021-07-21 11:02:58 +00:00
Germain e4c6833085
Merge pull request #6425 from matrix-org/gsouquet/fix-18099 2021-07-21 12:02:51 +01:00
Germain 32e7c58747
Merge branch 'develop' into gsouquet/fix-18099 2021-07-21 11:57:29 +01:00
Weblate 67f24b55c9 Merge branch 'origin/develop' into Weblate. 2021-07-21 10:56:47 +00:00
Germain 45967c80f3
Merge pull request #6426 from matrix-org/gsouquet/event-tile-null-guard
Add null guard for room prop in EventTile
2021-07-21 11:56:43 +01:00
Weblate bd9c038626 Merge branch 'origin/develop' into Weblate. 2021-07-21 10:56:37 +00:00
Germain a4ca52255d
Merge pull request #6421 from matrix-org/gsouquet/fix-18084
Fix font slider preview for message bubbles
2021-07-21 11:56:33 +01:00
Weblate b92d470627 Merge branch 'origin/develop' into Weblate. 2021-07-21 10:54:38 +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 e33163c837
Merge pull request #6419 from matrix-org/gsouquet/fix-18125
Add spoiler support for message bubbles
2021-07-21 11:54:30 +01: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
Michael Telatynski d147aaa984 delint and fix min-height issue 2021-07-21 11:27:36 +01:00
James Salter 7e549f84e7 Don't make getAnalytics the default export, its weird 2021-07-21 11:23:55 +01:00
James Salter d9594c428a login event should be IAnonymousEvent 2021-07-21 11:23:42 +01:00
James Salter 678474c0e8 Fix missing underscore 2021-07-21 11:23:18 +01:00
Michael Telatynski fd64d37305 Add iconography to Create Room Dialog dropdown
Remove unused old stale feather-customised/globe.svg
2021-07-21 11:20:41 +01:00
Michael Telatynski 390b05617c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/dialogs/RoomUpgradeDialog.tsx
	src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-07-21 10:46:41 +01:00
Germain 6308dabcfe
Remove forgotten code comment 2021-07-21 10:43:48 +01:00
Michael Telatynski a58edcb241 tweak copy 2021-07-21 10:43:12 +01:00
Germain Souquet ef002a2e22 Fix replies line clamping 2021-07-21 11:41:52 +02:00
Weblate 2706e29579 Merge branch 'origin/develop' into Weblate. 2021-07-21 08:43:20 +00:00
Germain dfa85b00d0
Merge pull request #6423 from matrix-org/gsouquet/fix-18077 2021-07-21 09:43:15 +01:00
Weblate 900b5ebb8c Merge branch 'origin/develop' into Weblate. 2021-07-21 08:14:11 +00:00
Germain 8e01080711
Merge pull request #6420 from matrix-org/gsouquet/fix-18079
Reintroduce grouped events padding on modern layout
2021-07-21 09:14:07 +01: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
James Salter b5564a0de0 Add getAnalytics helper 2021-07-21 08:42:29 +01:00
James Salter 4b0cb409a0 Add identifyUser 2021-07-21 08:38:58 +01:00
Weblate 430df6d083 Merge branch 'origin/develop' into Weblate. 2021-07-21 07:36:13 +00:00
Germain ae60692e88
Merge pull request #6412 from matrix-org/gsouqet/ts-migration-1 2021-07-21 08:36:08 +01:00
Germain Souquet 6d9ac1de17 Fix font slider preview for message bubbles 2021-07-21 09:34:30 +02:00
Germain Souquet 54841d63dc Fix wrench-tests by importing EmbeddedPage through sdk.getComponent 2021-07-21 09:29:33 +02:00
James Salter 74b0e52f9a Enforce anon/pseudo-anon via types 2021-07-21 08:23:42 +01:00
Robin Townsend 1d1d93ed14 Apply code review suggestion
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-21 03:17:55 -04:00