OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
15,057 Commits
219 Branches
561 Tags
468 MiB
Commit Graph

72 Commits (c1ff5f2fba73a90d8b5be868bd2c55df559f8abc)

Author SHA1 Message Date
David Baker 20ea86417e Appease the linter 2018-07-24 19:14:44 +01:00
David Baker d8be4508e8 Unused import 2018-07-24 19:13:05 +01:00
David Baker cfa7d0f11d Take jitsi conf calling out of labs 2018-07-24 19:06:19 +01:00
David Baker fc29e89f63
Merge pull request #2062 from matrix-org/dbkr/use_configured_integ_url 
Jitsi: Use integrations URL from config
 2018-07-20 15:01:28 +01:00
David Baker bd3dd9aafc Allow jitsi in e2e rooms 
We have a separate warning about how widgets are not very e2e, so
this should be sufficient warning.
 2018-07-20 14:30:38 +01:00
David Baker 22bde9fd50 Read jitsi widget URL from config 2018-07-18 12:05:32 +01:00
David Baker 7aab6fa6f1 Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo 2018-07-18 09:35:57 +01:00
Bruno Windels 0a432dfb8f
Merge pull request #2063 from matrix-org/dbkr/jitsi_check_scalar_first 
Jitsi: Check integrations server before call
 2018-07-17 17:46:53 +01:00
David Baker 850a4d8ec5 Jitsi: Check integrations server before call 2018-07-16 16:54:25 +01:00
David Baker e95a8e82bc Jitsi: Use integrations URL from config 2018-07-16 16:35:45 +01:00
David Baker 19f0617052 Jitsi: Error message on no permission 
Fixes https://github.com/vector-im/riot-web/issues/7007
 2018-07-16 15:41:03 +01:00
David Baker 0f32c3a018 PR feedback 2018-07-16 13:18:10 +01:00
David Baker 3f20eb9610 Use more helpful dialog tracking title 2018-07-05 19:58:54 +01:00
David Baker eb552e5cef Just pass the roomId into WidgetEchoStore 2018-07-05 18:43:20 +01:00
David Baker 8b64ddcbe8 Do some level of local echo for widgets 
* Show a spinner while we wait for widgets to be deleted
 * Hide widgets while they're pending deletion
 * Don't put another jitsi widget into the room if there's already
   one pending
 2018-07-03 11:16:44 +01:00
David Baker c780cd05a8 Change argument order of setRoomWidget 
So when deleting a widget we can just omit the ones we don't need
 2018-06-26 16:33:28 +01:00
David Baker 0a6450507e Bits of PR feedback 2018-06-26 15:21:22 +01:00
David Baker 6cf11a15e6 Move WidgetUtils to utils dir 2018-06-26 11:59:16 +01:00
David Baker 0f2c47937c Merge the two different widget utils files 2018-06-26 11:52:21 +01:00
David Baker 5c8eeff08a Refactor widgets code 
Split logic out of setWidget & re-use it when we add jitsi widgets.

Also fix the detection of existing jitsi widgets and make that use
getRoomWidgets() too.

Add error message when a jitsi call is already in process.
 2018-06-25 15:30:04 +01:00
David Baker 9d68c9e1a1 Logging & comment fix 2018-06-22 11:24:30 +01:00
David Baker e1e60cb147 delint CallHandler 2018-06-18 16:00:42 +01:00
David Baker 8cf17a66e5 Very basic Jitsi integration 
Replaces the conference calling by adding a Jitsi widget. No support
for continuing the call on room change currently, so hidden behind
a feature flag. Existing behaviour is preserved by default.
 2018-06-15 15:12:32 +01:00
David Baker e2f5e16fa7 Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-20 10:00:47 +00:00
David Baker 6d23182f5f Fix the force TURN option 
The call object is created within the js-sdk for inbound calls, so
we never got the chance to set it.
 2017-11-17 14:54:44 +00:00
David Baker 65e1d49f37 More sensible buttons in UnknownDeviceDialog 
Just say 'Send' (or equiv) if you actually verify all the devices,
rather than 'Send Anyway'.
 2017-11-16 17:59:42 +00:00
David Baker eea8a41ef9 Unused import 2017-11-16 16:20:13 +00:00
David Baker 8ba9d26d4b Don't set the call state to ended on error 
This isn't always the case, eg. just because we fail to pick up,
the call is still ringing.
 2017-11-16 15:42:46 +00:00
David Baker af8ff1b888 Don't blindly hangup on a call error. 
Not all errors means we want to send a hangup (in fact most don't,
but the most notable being when we fail to answer a call: we should
not then automatically reject it).
 2017-11-16 11:07:57 +00:00
David Baker b0027525f3 Wire up Unknown Devices popup for outbound calls 2017-11-15 17:21:04 +00:00
David Baker f8fc6dc83e Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-15 12:11:33 +00:00
David Baker 63919befd0 Catch call failures due to unknown devices 
And show a specific dialog that you can then launch the UDD from
(although currently with a 'Send Anyway' button which makes little
sense for VoIP)
 2017-11-15 10:49:29 +00:00
David Baker b1ec430523 Remove now-unused dispatches 2017-11-09 16:09:12 +00:00
Travis Ralston 0d3f0eaf98 Convert local settings to granular settings 
This breaks language selection.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-29 16:53:00 -06:00
Luke Barnard d3f9a3aeb5 Run eslint --fix 
Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.
 2017-10-11 17:56:17 +01:00
Michael Telatynski bf98c0da7c
un-i18n Modal Analytics 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-27 17:19:18 +01:00
Michael Telatynski c1d1a1377c allow forcing of TURN, pass account val per-call until UX is designed. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-12 20:20:27 +01:00
Kegan Dougal f75e714c3a More translations.. 2017-06-01 15:18:06 +01:00
Matthew Hodgson e5ef9f3e3a Merge pull request #918 from matrix-org/t3chguy/electron_call_sleep 
pass call state through dispatcher, for poor electron
 2017-05-26 19:09:10 +01:00
David Baker 443ab1add7 Put back default strings on dialogs 
But make them work by calling _t in render rather than
getDefaultProps().

Also sort out some 'Warning!' strings
 2017-05-25 18:20:48 +01:00
David Baker c7776915f7 Kill off more tabs 2017-05-25 11:45:36 +01:00
David Baker 5c359e63ab Bulk change counterpart imports 
to use languageHandler wrapper func
 2017-05-25 11:39:08 +01:00
David Baker d419c42a4f Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801 2017-05-23 15:16:31 +01:00
Michael Telatynski 024964aceb pass call state through, for things that don't have access to full API 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 18:33:14 +01:00
Matthew Hodgson a2be764681 display err.message to user if available in error msgs 2017-04-23 01:48:27 +01:00
Matthew Hodgson 3aaf37df1a beautify a tonne more errors 2017-03-12 22:59:41 +00:00
Luke Barnard 9515cf2cf2 Only hangup on call errors, not errors on sendEvent 2017-02-22 16:12:37 +00:00
Luke Barnard 878e31eba2 Show UDDialog on m.call.invite failure 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/378

Also, refactored UDDialog creation into its own dispatch event, because there will be other parts of the code that will want to spawn one.
 2017-02-21 17:22:22 +00:00
David Baker 18d4d3392a Fix a bunch of linting errors 
eslint --fix and a few manual ones
 2017-01-20 14:22:27 +00:00
David Baker 37d9108ceb Add error popup if screen sharing fails 2017-01-11 10:06:48 +00:00