Commit graph

36429 commits

Author SHA1 Message Date
David Baker
8c5cfe6c2a
Merge pull request #6536 from matrix-org/dbkr/argh_the_linting
Update eslint plugin & fix silly indenting
2021-08-03 17:18:20 +01:00
David Baker
28f5dc483b Update eslint plugin & fix silly indenting
As per https://github.com/matrix-org/eslint-plugin-matrix-org/pull/15
this caused a bunch of silly indenting to creep in, so this fixes it
back to the previous style.
2021-08-03 17:07:37 +01:00
Dariusz Niemczyk
806b36856d
Fix i18n 2021-08-03 18:01:34 +02:00
Dariusz Niemczyk
7487636f90
Fix linter again 2021-08-03 18:00:11 +02:00
Šimon Brandner
65451805a2
Merge remote-tracking branch 'upstream/develop' into fix/mirroring/5633
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 16:06:12 +02:00
Šimon Brandner
a18f41ceed
Fix tests
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:43:56 +02:00
Šimon Brandner
2a378f30b7
Attempt to fix tests
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:38:12 +02:00
Dariusz Niemczyk
b18d03be32
Fix final style issues 2021-08-03 15:21:15 +02:00
Dariusz Niemczyk
8a1def1d26
Update src/components/views/voip/CallView/CallViewHeader.tsx
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:21:14 +02:00
Dariusz Niemczyk
08b27a7c82
Update src/components/views/voip/PictureInPictureDragger.tsx
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:21:14 +02:00
Dariusz Niemczyk
3ab54bce6e
Move CallViewHeader css to separate file 2021-08-03 15:21:14 +02:00
Dariusz Niemczyk
389d0b2d4a
Another fix for indentation 2021-08-03 15:21:14 +02:00
Dariusz Niemczyk
466151a10c
Update src/components/views/voip/CallPreview.tsx
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:21:14 +02:00
Dariusz Niemczyk
f592d37f39
Remove widget support for CallViewHeader 2021-08-03 15:21:14 +02:00
Šimon Brandner
75948587e4
Avoid calling with undefined
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:13:40 +02:00
Šimon Brandner
e787d14cde
Set silenced state as soon as we get the call
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 14:58:50 +02:00
Šimon Brandner
37f51c7536
Don't ring if it's disabled
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 14:48:39 +02:00
Dariusz Niemczyk
a0b0a91d08
Fix ident 2021-08-03 14:03:35 +02:00
Germain
b51fb0cb94
Merge pull request #6533 from matrix-org/gsouquet/fix-logoutdialog-warning 2021-08-03 12:59:54 +01:00
Dariusz Niemczyk
838d9105c9
Update src/components/views/voip/CallView/CallViewHeader.tsx
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 13:53:49 +02:00
Germain Souquet
54c685bfa8 Migrate LogoutDialog to TypeScript 2021-08-03 13:52:46 +02:00
Dariusz Niemczyk
90c2eb0b92
Update src/components/views/voip/CallView/CallViewHeader.tsx
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 13:50:00 +02:00
Germain Souquet
81b45f8aa9 Make defaultProps a static property of LogoutDialog 2021-08-03 13:44:14 +02:00
Dariusz Niemczyk
29e9db44a3
Another fix to the TS types 2021-08-03 13:30:14 +02:00
Dariusz Niemczyk
36efa448b2
Fix TS types 2021-08-03 13:24:41 +02:00
James Salter
c66d0017de Patch posthog's type definitions using patch-package
Remove definitions for sentry and rrweb-snapshot
2021-08-03 11:59:54 +01:00
Dariusz Niemczyk
ae411b9401
Refactor Call components into smaller pieces 2021-08-03 12:58:09 +02:00
James Salter
dc7aad1abf Revert "Revert "Add support for Posthog Analytics under a labs flag""
This reverts commit c5ea253181.
2021-08-03 11:55:02 +01:00
Jaiwanth
b333612dea Fix comparing MB -> bytes 2021-08-03 14:53:23 +05:30
James Salter
1b87ffb7cb
Merge pull request #6527 from SimonBrandner/fix/font-topic/18339
Fix the wrong font being used in the room topic field
2021-08-03 10:06:58 +01:00
Jaiwanth
4824c93707 Add a test file 2021-08-03 14:36:21 +05:30
James Salter
0b369b6ee6
Merge pull request #6531 from matrix-org/revert-6495-posthog-analytics
Revert "Add support for Posthog Analytics under a labs flag"
2021-08-03 07:36:18 +01:00
James Salter
c5ea253181
Revert "Add support for Posthog Analytics under a labs flag" 2021-08-03 07:30:02 +01:00
Travis Ralston
c5d11a9f17 Improve voice messages uploading state
Fixes https://github.com/vector-im/element-web/issues/18226
Fixes https://github.com/vector-im/element-web/issues/18224
2021-08-02 23:29:46 -06:00
Jaiwanth
46e2f67f54 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-08-03 10:03:16 +05:30
Dariusz Niemczyk
7fd14c9ccc
Add data-mx-theme to theme css for hot-reload 2021-08-02 22:31:38 +02:00
David Baker
3ea0571c5f
Merge pull request #6486 from SimonBrandner/feature/muting
Show an avatar/a turned off microphone icon for muted users
2021-08-02 17:20:55 +01:00
James Salter
a65b41be63
Merge pull request #6495 from matrix-org/posthog-analytics
Add support for Posthog Analytics under a labs flag
2021-08-02 14:46:17 +01:00
Šimon Brandner
2dc13dedf0
Fix font
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 15:38:45 +02:00
Michael Telatynski
152c7dc865
Merge pull request #6523 from aaronraimist/fix-mjolnir 2021-08-02 13:48:43 +01:00
David Baker
9f8eb22c33
Merge pull request #6526 from SimonBrandner/fix/call-notif-fire
Fix broken call notification regression
2021-08-02 13:42:18 +01:00
Šimon Brandner
fd3bb2712a
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 14:35:12 +02:00
Šimon Brandner
2bdb7e64a3
Revert removing textForCallInvite
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 14:34:18 +02:00
James Salter
1ca547802f lint 2021-08-02 13:28:56 +01:00
RiotRobot
e2ef5d1737 Resetting package fields for development 2021-08-02 13:08:10 +01:00
RiotRobot
81b767ed89 Merge branch 'master' into develop 2021-08-02 13:08:09 +01:00
RiotRobot
e77f7319f2 v3.27.0 2021-08-02 13:06:29 +01:00
RiotRobot
d1e7c48125 Upgrade matrix-js-sdk to 12.2.0 2021-08-02 13:05:48 +01:00
David Baker
83674aad66 Changelog for v3.27.0 2021-08-02 12:55:33 +01:00
David Baker
cb00796a25
Merge pull request from GHSA-f69q-vrfp-27g2
Sanitize untrusted variables from message previews before translation
2021-08-02 12:49:07 +01:00