Commit Graph

36421 Commits

Author SHA1 Message Date
Šimon Brandner
b99e39e011
Merge remote-tracking branch 'upstream/develop' into feature-surround-with 2021-08-04 18:14:38 +02:00
Šimon Brandner
ee500ad684
Update copy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 18:14:32 +02:00
Weblate
9f61095466 Merge branch 'origin/develop' into Weblate. 2021-08-04 15:41:54 +00:00
Germain
7b8a43bd2b
Merge pull request #6551 from SimonBrandner/fix/pip-cursor/18383
Fix wrong cursor being used in PiP
2021-08-04 16:41:49 +01:00
Šimon Brandner
91b4b50969
Fix wrong cursor being used in PiP
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 17:25:12 +02:00
Šimon Brandner
e2bc76a129
Fix voice feed cut-off
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 17:17:21 +02:00
Šimon Brandner
fe643b2401
Use flex-start as it has more universal support
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 17:09:48 +02:00
Weblate
f9e44e2b14 Merge branch 'origin/develop' into Weblate. 2021-08-04 15:00:30 +00:00
waclaw66
04fb61f91e Translated using Weblate (Czech)
Currently translated at 100.0% (3103 of 3103 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-08-04 15:00:30 +00:00
Germain
724c67bc21
Merge pull request #6548 from robintown/fix-fallback-fonts
Fix fallback fonts
2021-08-04 16:00:22 +01:00
Šimon Brandner
74e1342fa8
Wrap cases in {}
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 16:35:46 +02:00
Šimon Brandner
023d874949
Add missing ?
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 16:34:59 +02:00
Šimon Brandner
881cac0d21
Merge remote-tracking branch 'upstream/develop' into fix/ringing-sound/15591
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 16:30:03 +02:00
Šimon Brandner
79e4a95b13
Move stuff out of if statement for better readability
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 16:25:44 +02:00
Weblate
d4c4cc9239 Merge branch 'origin/develop' into Weblate. 2021-08-04 14:15:12 +00:00
Germain
4dda4b241a
Merge pull request #6542 from matrix-org/gsouquet/fix-18354
Fix right margin for events on IRC layout
2021-08-04 15:15:06 +01:00
Weblate
368d975a0f Merge branch 'origin/develop' into Weblate. 2021-08-04 14:02:50 +00:00
Dariusz Niemczyk
dc88686f9d
Merge pull request #6539 from SimonBrandner/feature/increase-anim-speed/18371
Increase PiP snapping speed
2021-08-04 16:02:47 +02:00
Weblate
8f96b4ebb5 Merge branch 'origin/develop' into Weblate. 2021-08-04 13:55:31 +00:00
Dariusz Niemczyk
139a4028a3
Merge pull request #6545 from SimonBrandner/feature/update-tile-copy/18376
Improve call event tile wording
2021-08-04 15:55:26 +02:00
Šimon Brandner
a04a8006fc
Merge remote-tracking branch 'upstream/develop' into feature/update-tile-copy/18376 2021-08-04 15:48:53 +02:00
Weblate
2e1d2f20e6 Merge branch 'origin/develop' into Weblate. 2021-08-04 13:35:20 +00:00
Dariusz Niemczyk
c848b8f486
Merge pull request #6524 from matrix-org/palid/feature-css/hmr
Add data-mx-theme to theme css for hot-reload
2021-08-04 15:35:15 +02:00
Robin Townsend
5877e936c0 Fix fallback fonts
Signed-off-by: Robin Townsend <robin@robin.town>
2021-08-04 09:24:18 -04:00
Weblate
9588a2c391 Merge branch 'origin/develop' into Weblate. 2021-08-04 13:23:00 +00:00
David Baker
9845dcb08c
Merge pull request #6546 from matrix-org/dbkr/codeowners
Add CODEOWNERS
2021-08-04 14:22:56 +01:00
Weblate
c658d7d834 Merge branch 'origin/develop' into Weblate. 2021-08-04 13:01:37 +00:00
William Weber Berrutti
de78f7273e Translated using Weblate (Portuguese (Brazil))
Currently translated at 90.9% (2829 of 3110 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
2021-08-04 13:01:37 +00:00
David Baker
a5b43ca7ca
Merge pull request #6226 from SimonBrandner/feature/re-pin-jitsi/17679
Re-pin Jitsi if the widget already exists
2021-08-04 14:01:13 +01:00
David Baker
d0b295f1a7 Add CODEOWNERS 2021-08-04 13:28:31 +01:00
Šimon Brandner
f97f410d09
Unused import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 13:16:01 +02:00
Šimon Brandner
9681e0e441
Merge remote-tracking branch 'upstream/develop' into feature/re-pin-jitsi/17679
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 13:15:20 +02:00
Weblate
62f833f9aa Merge branch 'origin/develop' into Weblate. 2021-08-04 11:13:20 +00:00
Besnik Bleta
bdbab07371 Translated using Weblate (Albanian)
Currently translated at 99.7% (3103 of 3110 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
2021-08-04 11:13:20 +00:00
David Baker
972e34516d
Merge pull request #6544 from matrix-org/dbkr/use_node_14
Declare node 14 requirement
2021-08-04 12:13:08 +01:00
Šimon Brandner
3232552715
Merge remote-tracking branch 'upstream/develop' into feature/update-tile-copy/18376 2021-08-04 13:11:36 +02:00
Šimon Brandner
d05be44113
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 13:07:54 +02:00
Šimon Brandner
4a1789be53
Update copy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 13:04:23 +02:00
David Baker
6350cecb5e emoty commit to try & wake netlify up 2021-08-04 12:02:14 +01:00
David Baker
c31f9335dc Declare node 14 requirement
Mostly for netlify (we need node 14 now because element-web's
webpack config uses the `??` operator).
2021-08-04 11:51:55 +01:00
Germain Souquet
b4b788e8d5 Fix right margin for events on IRC layout
Fixes vector-im/element-web#18354
2021-08-04 11:21:52 +02:00
Weblate
a8d6fa96bc Merge branch 'origin/develop' into Weblate. 2021-08-04 09:06:41 +00:00
David Baker
72654f24dc
Merge pull request #6541 from SimonBrandner/fix/indent
Fix indent in HTMLUtils
2021-08-04 10:06:38 +01:00
Weblate
185d0b71c5 Merge branch 'origin/develop' into Weblate. 2021-08-04 09:02:52 +00:00
David Baker
15d42a2fd2
Merge pull request #6537 from matrix-org/dbkr/allchange
Switch to new changelog generator
2021-08-04 10:02:48 +01:00
Weblate
9aff4db5f5 Merge branch 'origin/develop' into Weblate. 2021-08-04 08:47:44 +00:00
James Salter
57f5c30af8
Merge pull request #6532 from matrix-org/posthog-analytics
Reinstate Posthog analytics PR fixing type definitions via installing dev dependencies
2021-08-04 09:47:39 +01:00
Weblate
9f82e010d0 Merge branch 'origin/develop' into Weblate. 2021-08-04 08:46:43 +00:00
Andrew Morgan
c9c8177f58
Start a call immediately after creating a room via the dial pad (#6529) 2021-08-04 09:46:39 +01:00
Šimon Brandner
7cb21c845f
Fix indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 10:34:48 +02:00