6fdeca93b6
Make the riot-desktop callback args more generic and encrypt the args
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-09 16:21:52 +01:00
8ca9e4ccb1
Fix Electron SSO handling to support multiple profiles
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-04 00:22:15 +01:00
a377ca7b85
Merge pull request #13020 from vector-im/t3chguy/fix_mac_shortcut
...
Fix Electron mac-specific shortcut being registered on Web too.
2020-04-03 13:23:13 +01:00
c1da3bf537
Fix Electron mac-specific shortcut being registered on Web too.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-03 13:01:28 +01:00
ab29ec123e
Merge pull request #12968 from vector-im/travis/jitsi-errors
...
Add a console warning that errors from Jitsi Meet are fine
2020-04-01 10:54:06 -06:00
0bf05e3c7b
Make widget API use optional
...
So we can work when popped out into a browser
2020-04-01 11:08:53 +01:00
421fcb115f
Give the jitsi wrapper its own external api script
2020-04-01 10:38:49 +01:00
13a7b71e08
Add a console warning that errors from Jitsi Meet are fine
...
See diff for info.
We use the fragment to avoid sending conference information to the web server where possible.
2020-03-31 12:19:17 -06:00
d9fbbe1696
Merge pull request #12861 from mnoorenberghe/patch-1
...
Don't immediately remove notifications from notification trays
2020-03-26 09:33:11 -06:00
c1884a26aa
Merge branch 'origin/develop' into Weblate.
2020-03-26 12:03:29 +00:00
1963270d64
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (25 of 25 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2020-03-26 11:43:06 +00:00
3072bbb0d7
Translated using Weblate (Esperanto)
...
Currently translated at 100.0% (25 of 25 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2020-03-26 11:43:06 +00:00
fd385f8450
simplify loadConfig
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 14:37:28 +00:00
92d8ee355d
merge initial-load.ts into init.ts as its no longer used by Jitsi
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 14:32:37 +00:00
1f94b25d25
Fix copyrights
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 14:28:07 +00:00
8929cd9c08
Merge branches 'develop' and 't3chguy/app_load_tweaks' of github.com:vector-im/riot-web into t3chguy/app_load_tweaks
2020-03-25 14:26:48 +00:00
24d85c5cd7
Merge branch 'origin/develop' into Weblate.
2020-03-25 14:26:12 +00:00
4b7cf489c8
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (25 of 25 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/tr/
2020-03-25 14:26:12 +00:00
990a96b56d
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (25 of 25 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/tr/
2020-03-25 14:26:12 +00:00
cb23da12cb
Translated using Weblate (Mongolian)
...
Currently translated at 100.0% (25 of 25 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/mn/
2020-03-25 14:26:11 +00:00
6315907585
Typescript stuff.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 14:07:22 +00:00
6fb9fc4e6f
move loadLanguage to init.ts
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 13:55:25 +00:00
df2b966acd
move loadOlm to init.ts
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 13:54:02 +00:00
b09b47543b
Merge branches 'develop' and 't3chguy/app_load_tweaks' of github.com:vector-im/riot-web into t3chguy/app_load_tweaks
2020-03-25 12:45:10 +00:00
e669c681e2
Fetch both config.json-s at the same time, first one fails 99% of the time
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 12:39:42 +00:00
b8ca1f920e
Don't immediately remove notifications from notification trays
...
Let the notifications go into browser/OS notification trays so users can click on them from there if they miss the initial notification. Modern Chrome uses OS notifications so the user is in control of the the notification with the OS. This also aligns with the Electron platform version.
Signed-off-by: Matthew Noorenberghe <github@matthew.noorenberghe.com>
2020-03-24 17:27:14 -07:00
bde5679d11
Ask for Riot config over postMessage for the Jitsi widget
...
Fixes https://github.com/vector-im/riot-web/issues/12839 by not using the app load order that doesn't detect the right platform anyways.
2020-03-24 09:54:15 -06:00
783f3c6955
Merge branch 'origin/develop' into Weblate.
2020-03-24 15:15:39 +00:00
4087ba0c5c
Revert "Remove useless app preloading from Jitsi widget wrapper"
2020-03-24 09:14:59 -06:00
cd399f0284
Merge branch 'origin/develop' into Weblate.
2020-03-24 14:54:59 +00:00
b41d318e62
Translated using Weblate (Turkish)
...
Currently translated at 96.0% (24 of 25 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/tr/
2020-03-24 14:54:59 +00:00
97243e9c59
Translated using Weblate (Italian)
...
Currently translated at 100.0% (25 of 25 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
2020-03-24 14:54:58 +00:00
3aee541cb9
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (25 of 25 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
2020-03-24 14:54:58 +00:00
679331323a
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (25 of 25 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
2020-03-24 09:00:37 +00:00
350a52b44e
Remove useless app preloading from Jitsi widget wrapper
...
We should always have conference information, and if we don't then the widget is invalid.
2020-03-23 10:38:10 -06:00
080076e3e4
Translated using Weblate (German)
...
Currently translated at 100.0% (25 of 25 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2020-03-23 09:55:16 +00:00
f4ef7ba7e1
Translated using Weblate (French)
...
Currently translated at 100.0% (25 of 25 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2020-03-23 09:55:16 +00:00
ffb7126582
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (25 of 25 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
2020-03-23 09:55:16 +00:00
e22ade38f9
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (25 of 25 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
2020-03-23 09:55:16 +00:00
ae9c02b456
Translated using Weblate (Basque)
...
Currently translated at 100.0% (25 of 25 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
2020-03-23 09:55:15 +00:00
a560d3586a
Translated using Weblate (Albanian)
...
Currently translated at 100.0% (25 of 25 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sq/
2020-03-20 11:53:08 +00:00
fbf4437159
Merge branch 'origin/develop' into Weblate.
2020-03-20 10:45:16 +00:00
3d266cb237
Register Mac electron specific Cmd+, shortcut to User Settings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 23:42:10 +00:00
f377dfcad4
Merge branch 'origin/develop' into Weblate.
2020-03-19 17:52:28 +00:00
09e26d0882
Misc case changes, comment updates
2020-03-19 11:47:43 -06:00
e1eb16ce46
Use a local widget wrapper for Jitsi calls
...
Effectively fixes https://github.com/vector-im/riot-web/issues/11074
Effectively fixes https://github.com/vector-im/riot-web/issues/7112
Fixes https://github.com/vector-im/riot-web/issues/6930
Fixes Jitsi widgets not working for guests (https://github.com/vector-im/riot-web/issues/8933 )
Fixes https://github.com/vector-im/riot-web/issues/5048
Previously we were relying on an integration manager to be defined, functional, and alive in order to join Jitsi calls. This commit changes this so we aren't reliant on an integration manager for Jitsi calls at all, and gives people the option of choosing a Jitsi server via the config.json.
This side is just the wrapper/shell: the logic is mostly in the react-sdk (to be linked via PRs). This layer simply has an HTML file exported that can be used to render a Jitsi widget, and the react-sdk constructs a URL to access it locally. This is similar to how the mobile apps handle Jitsi widgets: instead of iframing the widget URL directly into the app, they pull apart the widget information and natively render it. We're effectively doing the same here by parsing the widget options and using our local wrapper instead of whatever happens to be defined in the widget state event.
Integration managers should still continue to offer a widget URL for Jitsi widgets as this is what the spec requires.
A large part of this is based upon Dimension's handling of Jitsi and widgets in general: a license has been granted to allow Riot (and therefore the react-sdk) to use the code and be inspired by it.
2020-03-18 15:48:02 -06:00
6b959b4a76
Merge branch 'origin/develop' into Weblate.
2020-03-18 14:04:05 +00:00
7296b704a8
Merge pull request #12756 from vector-im/t3chguy/gemini
...
Remove remainders of gemini-scrollbar and react-gemini-scrollbar
2020-03-18 14:03:59 +00:00
3a8a5febe9
Translated using Weblate (Welsh)
...
Currently translated at 100.0% (24 of 24 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cy/
2020-03-18 11:43:42 +00:00
a0fbae0971
Translated using Weblate (Portuguese)
...
Currently translated at 100.0% (24 of 24 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt/
2020-03-18 11:43:42 +00:00
Michael Telatynski