d90321d813
Iterate PR, merge types with @types/PushRules
2021-08-10 11:03:03 +01:00
2d5dc6d529
Break instead of return
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-07 21:30:58 +02:00
78f53b3f6b
Don't show modal on reject/user hangup
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-07 21:28:35 +02:00
74e1342fa8
Wrap cases in {}
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 16:35:46 +02:00
023d874949
Add missing ?
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 16:34:59 +02:00
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
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
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
c9c8177f58
Start a call immediately after creating a room via the dial pad ( #6529 )
2021-08-04 09:46:39 +01:00
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
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
24f0c760ce
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 16:25:38 +02:00
40947a2a68
Simplifie toast handling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 12:21:58 +02:00
8c635884d9
Add comment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 11:05:52 +02:00
7c805501bc
Cleanup hangup dialogs
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 10:56:04 +02:00
410928745f
IncomingCallBox -> IncomingCallToast
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:46:22 +02:00
c25feb9b9f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-20 15:48:25 +02:00
66a3b0fe5f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:24:05 +02:00
ff5ebb4657
Merge remote-tracking branch 'upstream/develop' into feature/re-pin-jitsi/17679
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:16:56 +02:00
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:15:04 +02:00
ce78cdf4ad
Conform to new react and typescript eslint rules
2021-07-19 22:43:11 +01:00
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:43:33 +02:00
d512a83a6c
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:37:57 +02:00
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements ( #6363 )
...
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
2021-07-15 09:55:58 +01:00
a645cebb49
Fix setTimeout/setInterval typing
2021-07-12 09:02:46 +01:00
8f0d72335d
Rework call silencing once again
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:16:02 +02:00
657896c0b9
Delint
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 11:00:42 +02:00
fc239ffd01
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 10:53:22 +02:00
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:14:14 +02:00
80f5232217
Comply with new member-delimiter-style rule
...
Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9 in place
2021-07-01 23:23:03 +01:00
ae0a8b8da4
Auto-fix lint errors
2021-06-29 13:11:58 +01:00
314ab7a94d
If there already is a Jitsi widget pin it
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-21 11:26:34 +02:00
ccfc7fe421
Make call silencing more flexible
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 20:03:02 +02:00
f96c366aa4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 17:07:43 +02:00
71ff5248fe
Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591
2021-06-17 16:41:00 +01:00
e5188a5258
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-06-12 13:32:49 +02:00
fdda534053
Merge branch 'develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-09 19:23:14 +02:00
bd8fd246c6
Add logging for which rooms calls are in
2021-06-09 16:04:03 +01:00
1d3bf91e83
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-04 08:19:29 +02:00
629201a074
Merge branch 'develop' into fix/mute-incoming-call/15591
2021-06-04 07:59:28 +02:00
6eb33ac730
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-04 07:49:05 +02:00
ae54a8f546
Return null
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-04 07:42:17 +02:00
0aeddea30f
Only do native lookup if it's supported
...
Also fix as bug where we were checking the wrong field to check
for native/virtual support: oops.
2021-06-02 17:47:29 +01:00
2c4fa73a45
Map phone number lookup results to their native rooms
...
When dialing a phone number, also look to see if there's a corresponding
native user for the resulting user, and if so, go to the native room
for that user.
2021-06-02 17:39:13 +01:00
37c379c393
Merge branch 'develop' into feature/call-event-tile
2021-06-02 12:52:03 +02:00
f0f8210790
Log when we ignore a second call in a room
...
What's more useful than a comment? A log line.
2021-06-01 19:04:52 +01:00
20c5735e96
Add getCallById()
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
c4a26893a0
Handle user_busy in voip calls
...
Newly added to MSC2746
2021-05-27 18:57:22 +01:00
21fb81d4a2
Export AudioIDs
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-22 20:23:24 +02:00
0eeb21dfac
Remove unnecessary import
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 12:41:29 +02:00
Michael Telatynski