mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity
9919 commits 185 branches 531 tags 233 MiB
Commit graph

661 commits

Author SHA1 Message Date
Michael Telatynski
0bdf979c46 fix the Jitsi bg colour to not be transparent as the app colours may be anything and bleed through 2020-10-27 11:26:41 +00:00
Michael Telatynski
7c895bd8c0 Fix theme variable handling with invalid values 2020-10-27 11:26:41 +00:00
Michael Telatynski
593a56e2d7 Jitsi accept theme variable and restyle 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 19:40:53 +01:00
J. Ryan Stinnett
dfb1579625 Adjust for new widget messaging APIs 
As part of changing to the `events` package, the API surface changed slightly.

Related to https://github.com/vector-im/element-web/issues/15493
 2020-10-19 16:43:55 +01:00
Travis Ralston
917a85ead9 Don't fatally end the Jitsi widget when it's not being used as a widget 2020-10-14 16:16:08 -06:00
Damir Jelić
0507cd2d90 electron-platform: Use camel case for the user/device id. 2020-10-13 17:04:40 +02:00
Damir Jelić
5350c5e551 electron-platform: Pass the user/devce id pair when initializing the event index. 2020-10-13 16:36:38 +02:00
Travis Ralston
5f353c4907
Merge pull request #15102 from vector-im/travis/widget-api 
Switch to using the Widget API SDK for Jitsi widgets
 2020-10-01 10:16:11 -06:00
Travis Ralston
9cb823b210 Fix join button 2020-10-01 09:59:13 -06:00
Michael Telatynski
cfee4c925a Revert "Attempt to fix tests some more" 
This reverts commit c76a5f2c

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 14:05:07 +01:00
Michael Telatynski
1edbe36547 Revert "Tidy up Service Worker, only run Workbox in production" 
This reverts commit c47532fe

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 14:04:32 +01:00
Michael Telatynski
87c42934ea Revert "Disable workbox when running in webpack dev server, not in dev mode" 
This reverts commit 11e676ce

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 14:04:21 +01:00
Michael Telatynski
daa755017e Revert "consolidate" 
This reverts commit aa2f3918

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 14:04:11 +01:00
Travis Ralston
cdf9547220 Appease the linter 2020-09-30 20:51:31 -06:00
Travis Ralston
7b93c56bd0 Fix custom hangup button 2020-09-30 20:09:42 -06:00
Michael Telatynski
ca78985abc
Merge pull request #15345 from vector-im/t3chguy/fix/workbox 
Disable workbox when running in webpack dev server, not in dev mode
 2020-09-30 19:26:31 +01:00
Michael Telatynski
aa2f3918cc consolidate 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-30 17:36:57 +01:00
Michael Telatynski
11e676cee0 Disable workbox when running in webpack dev server, not in dev mode 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-30 17:35:12 +01:00
Qt Resynth
10d6fbaef7
Update Riot -> Element in index.ts 2020-09-30 11:10:35 +00:00
Travis Ralston
c56368cdbb Fix hangup button handler 2020-09-29 13:20:16 -06:00
Travis Ralston
15a8ee6663 Merge branch 'develop' into travis/widget-api 2020-09-29 13:17:18 -06:00
Travis Ralston
20c6e6dd73
Merge pull request #15316 from vector-im/travis/jitsi-widget 
Give the Jitsi widget an icon to help with discovery
 2020-09-29 11:06:42 -06:00
Travis Ralston
7d3ccb6242
Merge pull request #15219 from vector-im/travis/ft-sep1620/04-jitsi-hangup 
Jitsi widget wrapper updates for hangup button
 2020-09-29 11:06:28 -06:00
Travis Ralston
7ef0702df4 re-todo 2020-09-29 11:04:08 -06:00
Travis Ralston
a1e6b019d2 Give the Jitsi widget an icon to help with discovery 
We think users will be expecting to follow a series of icons into their conference, so we'll remind them here of what is going on with a giant icon.

This does not change depending on the call type because the jitsi widget doesn't understand the call type anyways - it's always a video conference.
 2020-09-29 11:01:26 -06:00
Travis Ralston
97afe18310 Merge branch 'develop' into travis/widget-api 2020-09-28 21:09:10 -06:00
Michael Telatynski
aa9b517664
Merge pull request #15271 from vector-im/t3chguy/fix/15265 
Tidy up Service Worker, only run Workbox in production
 2020-09-28 16:47:15 +01:00
Travis Ralston
c114932da0 Merge branch 'develop' into travis/widget-api 2020-09-25 09:38:52 -06:00
David Baker
4eb5bb2bae
Merge pull request #15274 from vector-im/dbkr/remove_conferencehandler 
Remove conference handler
 2020-09-25 15:52:25 +01:00
Travis Ralston
82749c3de3 Fix Jitsi for new widget-api 2020-09-24 13:25:59 -06:00
David Baker
c988988a70 This is unused now 2020-09-24 16:44:05 +01:00
David Baker
b31bf6cfca Remove conference handler 2020-09-24 16:19:00 +01:00
Michael Telatynski
c47532fe2a Tidy up Service Worker, only run Workbox in production 
Moves ServiceWorker load into Platform so its not done by Electron

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-24 13:01:34 +01:00
Travis Ralston
b9b859dd28 Merge branch 'develop' into travis/widget-api 2020-09-23 12:00:54 -06:00
Michael Telatynski
477b7a362b
Merge pull request #15196 from vector-im/t3chguy/fix/12591 
Replace dummy sw.js with pre-caching and runtime-caching workbox SW
 2020-09-23 17:03:26 +01:00
Travis Ralston
c7617c2538 Fix bad merge 2020-09-22 09:01:55 -06:00
Travis Ralston
465a2ce314 Merge branch 'develop' into travis/widget-api 2020-09-22 09:00:48 -06:00
Travis Ralston
05d5e3f680 Remove debugging 2020-09-17 14:59:43 -06:00
Travis Ralston
737fa7dca5 Jitsi widget wrapper updates for hangup button 
See https://github.com/matrix-org/matrix-react-sdk/pull/5223
 2020-09-16 14:39:40 -06:00
Michael Telatynski
40813a6b33 If no bug_report_endpoint_url, hide rageshaking from the App 2020-09-15 15:49:25 +01:00
Michael Telatynski
c76a5f2c52 Attempt to fix tests some more 2020-09-15 13:19:47 +01:00
Michael Telatynski
ac447fd318 Fix onNewScreen to use replace when going from roomId->roomAlias to prevent locking the user in place 2020-09-09 16:52:48 +01:00
Jason Robinson
7018a498a7 Quieten some IDE warnings 2020-09-08 12:52:17 +03:00
Jason Robinson
579650a1dd Move most of the OpenID token flow to WidgetAPI 2020-09-08 12:50:53 +03:00
Jason Robinson
a7abd8599e More usage of constants 2020-09-08 11:44:11 +03:00
Jason Robinson
3309b2ec55 Block on matrix-org/matrix-react-sdk#5172 
And shuffle code around a bit.
 2020-09-08 11:37:50 +03:00
Jason Robinson
151dd5709c
Fix import 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-09-08 11:32:09 +03:00
Jason Robinson
21c862fe2b Remove console.log 2020-09-07 20:47:07 +03:00
Jason Robinson
3b434a70d2 Fix typo 2020-09-07 20:36:26 +03:00
Jason Robinson
acfd7252bd Remove todo 2020-09-07 20:26:05 +03:00