Commit Graph

35832 Commits (df7ebb2e7ce5894afd349f3a1f8cf930f80f5f90)

Author SHA1 Message Date
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
Šimon Brandner 3fac4adfc7
Fix feed sizing issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:14:21 +02:00
James Salter e9e0e4847f Move Welcome.js to tsx 2021-07-21 17:02:14 +01:00
James Salter b380a89ac6 Fix wrong overriden attribute 2021-07-21 17:01:45 +01:00
Weblate 20edfc9c25 Merge branch 'origin/develop' into Weblate. 2021-07-21 15:59:28 +00:00
David Baker 6afa3fa3ab
Merge pull request #6430 from matrix-org/dbkr/yarn_upgrade_210721
yarn upgrade
2021-07-21 16:59:24 +01:00
James Salter f358deb6c4 Manually track page views 2021-07-21 16:52:57 +01:00
Šimon Brandner dc7f6d8286
Show sidebar in PiP mode
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 17:45:21 +02:00
David Baker a6c432d66f fix types
in varyingly hacky ways
2021-07-21 16:39:41 +01:00
James Salter 93962c0aca Update reasoning around disabling capture_pageview 2021-07-21 16:29:11 +01:00
Germain Souquet 26ca41f699 Cache room member count on the messagePanel 2021-07-21 17:26:41 +02:00
James Salter 34f8c60b34 Hook analytics into the SDK 2021-07-21 16:15:18 +01:00
Šimon Brandner 0a8067506f
Adjust hiding local feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 17:12:27 +02:00
James Salter 6737cfd297 remove superflous dnt clear 2021-07-21 16:10:06 +01:00
James Salter 53b6749f73 Change onboarding_login_begin to welcome_screen_load 2021-07-21 16:09:22 +01:00
James Salter 5697eeaab8 Put back accidentally removed anonymity update 2021-07-21 16:08:00 +01:00
James Salter 726b4497b2 Remove redactedCurrentLocation and rely on posthog for DNT
* Redact and pass the redacted url as a property. redactedCurrentLocation might have issues with concurrent events
* Remove DNT code and rely on posthog
2021-07-21 16:06:09 +01:00
Germain Souquet 43d62aa8c1 Use more performant getMembersCount to decide to hide or show sender 2021-07-21 16:43:57 +02:00
David Baker 35e74db25e yarn upgrade 2021-07-21 15:41:16 +01:00
Šimon Brandner 337664a1b4
Update sidebar behaviour
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 16:34:21 +02:00
Šimon Brandner 74649f1f92
Correct feed ordering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 16:21:52 +02:00
Šimon Brandner 2014517173
Always show screensharing feed as primary
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 16:20:09 +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 22375e2108
Update res/css/views/rooms/_EventBubbleTile.scss 2021-07-21 15:11:49 +01:00
Germain Souquet e5bc5a933e Use cached value to read member count 2021-07-21 16:10:18 +02:00
Š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