Michael Telatynski
|
e1b62ae38b
|
Increase yOffset by 4px away
|
2021-08-05 14:20:31 +01:00 |
|
Michael Telatynski
|
8ae95ddbb7
|
i18n
|
2021-08-05 13:50:50 +01:00 |
|
Michael Telatynski
|
a8b050a385
|
Post-merge conflict resolution and improve alignment of tooltips
|
2021-08-05 13:37:23 +01:00 |
|
Michael Telatynski
|
54509fae95
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into pr/voip-a11y1
Conflicts:
src/components/views/voip/CallView.tsx
|
2021-08-05 13:24:16 +01:00 |
|
Michael Telatynski
|
a9d7d01014
|
Null guard space inviter to prevent the app exploding
|
2021-08-05 12:30:22 +01:00 |
|
Michael Telatynski
|
58575c335d
|
Merge pull request #5510 from SimonBrandner/feature-surround-with
Add surround with feature
|
2021-08-05 09:33:52 +01:00 |
|
Dariusz Niemczyk
|
7d06507a9c
|
Merge pull request #6534 from SimonBrandner/fix/ringing-sound/15591
Make the ringing sound mutable/disablable
|
2021-08-05 00:02:44 +02:00 |
|
Travis Ralston
|
4d5bdf70b7
|
Fix worklet reference for new webpack pipeline
|
2021-08-04 15:08:22 -06:00 |
|
Šimon Brandner
|
b9b98c6a81
|
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-04 18:15:11 +02:00 |
|
Š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 |
|
Š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 |
|
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 |
|
Šimon Brandner
|
a04a8006fc
|
Merge remote-tracking branch 'upstream/develop' into feature/update-tile-copy/18376
|
2021-08-04 15:48:53 +02: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 |
|
Š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 |
|
Š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
|
72654f24dc
|
Merge pull request #6541 from SimonBrandner/fix/indent
Fix indent in HTMLUtils
|
2021-08-04 10:06:38 +01: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 |
|
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 |
|
Germain
|
a07df5e9d8
|
Merge pull request #6512 from SimonBrandner/fix/mirroring/5633
|
2021-08-04 08:51:22 +01:00 |
|
Germain
|
94e77e70c6
|
Merge pull request #6470 from SimonBrandner/feature/incoming-call-toast
|
2021-08-04 08:42:09 +01:00 |
|
Germain
|
d2aa7a3bd6
|
Merge pull request #6457 from aaronraimist/more-url-schemes
Allow all of the URL schemes that Firefox allows
|
2021-08-04 08:32:08 +01:00 |
|
Šimon Brandner
|
d479373af9
|
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-04 09:21:45 +02:00 |
|
Šimon Brandner
|
372cbbfe8e
|
Increase snapping speed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-04 08:11:05 +02: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 |
|
Š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
|
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 |
|
Germain Souquet
|
54c685bfa8
|
Migrate LogoutDialog to TypeScript
|
2021-08-03 13:52:46 +02:00 |
|
Germain Souquet
|
81b45f8aa9
|
Make defaultProps a static property of LogoutDialog
|
2021-08-03 13:44:14 +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 |
|
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 |
|
James Salter
|
c5ea253181
|
Revert "Add support for Posthog Analytics under a labs flag"
|
2021-08-03 07:30:02 +01:00 |
|
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 |
|
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 |
|