Ghazi Triki
7d283cd154
Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x
...
# Conflicts:
# bigbluebutton-client/resources/config.xml.template
# bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
# bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
# record-and-playback/core/scripts/rap-process-worker.rb
2017-05-22 17:35:24 +01:00
Fred Dixon
237c6f8fbc
Update BigBlueButton.html
2017-05-20 12:33:42 -04:00
Chad Pilkey
7a46382e86
Merge pull request #3946 from riadvice/fix-presenter-share-only
...
Delete the option "presenterShareOnly" in favor of lock settings
2017-05-18 12:29:21 -04:00
Ghazi Triki
43d05ffa0b
Remove presenterShareOnly option and all its implementation.
2017-05-17 14:30:54 +01:00
perroned
a7c2542c0a
Overwrites popup function
2017-05-15 12:16:30 -04:00
Ghazi Triki
a7f6d8483c
Use the correct Arabic locale for the flash client.
2017-05-10 11:04:33 +01:00
Stephen Dame
6fff8c0a8a
flash blue to white screen
2017-05-08 14:09:47 -07:00
Richard Alam
44e3fb8a07
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2x-mconf
2017-05-08 08:51:31 -07:00
Fred Dixon
26a62bd398
Merge pull request #3907 from kepstin/webrtc-stats
...
Update webrtc stats bridge for modern Chrome/Firefox APIs
2017-05-05 14:21:48 -04:00
Calvin Walton
75c680832c
Update webrtc stats bridge for modern Chrome/Firefox APIs
...
Switch to the promise-based getStats, and use the standardized
property names where available, with fallback to handle Chrome,
which hasn't fully switched yet.
The stats now only track the outgoing audio stream, as a way to
indicate quality, since the user can't hear themselves. This
might be revisited later; it would require tracking the stats
separately for incoming vs. outgoing and e.g. returning whichever
is worse.
2017-05-05 11:22:38 -04:00
Richard Alam
23e6dea35b
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2.x-dev-mconf
2017-05-04 14:39:02 -07:00
perroned
66061fa33d
Handle lib update/fix errors
2017-05-03 14:13:53 +00:00
perroned
1d7ba676da
Update verto libs
2017-05-03 14:12:42 +00:00
perroned
43636d26ad
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into update-verto-libs
2017-05-02 22:15:36 +00:00
perroned
4b6c95f1c9
Adds chrome tabs to extension
2017-05-02 15:01:05 +00:00
Richard Alam
c733f4eafc
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2.x-dev-mconf
2017-04-27 14:52:47 -07:00
Chad Pilkey
3970f17455
force Flash on Edge 15+, fixes #3812
2017-04-26 17:13:52 -04:00
Richard Alam
262c7250c8
Merge branch 'master' with bbb-mconf
2017-04-17 15:57:31 +00:00
Ghazi Triki
92554f8b3e
Squashed commits for displaying WebRTC stats inside the Flex client.
2017-04-10 11:16:46 +01:00
Pedro Beschorner Marin
f59e42bb02
Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1
2017-04-04 20:42:15 +00:00
Pedro Beschorner Marin
84fd8d4101
Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images!
2017-04-03 17:06:16 +00:00
Ubuntu
8445c49f92
- add dimension of screen share
2017-03-29 15:58:43 +00:00
Ubuntu
e6796bf3ea
Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-24 19:25:47 +00:00
Ubuntu
5e0a5f019c
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-24 19:14:21 +00:00
Chad Pilkey
4515c08654
changes to shortcut keys so they all work in IE
2017-03-22 19:53:12 -04:00
perroned
cb124961a2
Connect to /verto endpoint
2017-03-22 22:20:15 +00:00
Ubuntu
a096e25a72
Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-22 20:37:41 +00:00
Pedro Beschorner Marin
0ab207c997
Merge remote-tracking branch 'mconf/mconf'
2017-03-21 19:47:11 +00:00
perroned
47c6e3fe69
Puts back resolution values into screen constraints
2017-03-21 17:14:36 +00:00
Pedro Beschorner Marin
c74cc682c4
Merge remote-tracking branch 'mconf/mconf'
2017-03-20 19:45:59 +00:00
Ubuntu
4da7d6d03f
Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-17 15:55:23 +00:00
perroned
dd6f869059
Fixes exceptions and jnlp download issue
2017-03-13 21:20:13 +00:00
Felipe Cecagno
21170265e2
implement the ability to add artificial remote ICE candidates to the SDP, so we can better handle servers behind NAT (and other situations); extend the /api/stun call in order to retrieve the list of remote ICE candidates from a XML file
2017-03-12 21:45:08 -03:00
Chad Pilkey
0235dd5adb
fix plus and minus shortcut modifier in key table
2017-03-08 19:26:02 -05:00
Fred Dixon
c28c78a405
Minor updates for release -- bumped the API version
2017-03-06 13:57:54 -06:00
perroned
dab5adb5be
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
...
Conflicts:
bigbluebutton-html5/imports/ui/components/media/container.jsx
bigbluebutton-html5/server/main.js
2017-03-06 19:21:40 +00:00
Fred Dixon
c0c58b5507
Update BigBlueButton.html
...
Modified "You need Flash Installed" message.
2017-03-04 10:02:39 -05:00
Anton Georgiev
ad59c80853
adjust ExternalApiCalls for multiple recovered cams
2017-03-01 13:56:10 -05:00
perroned
59435c6020
Cleaning
2017-02-27 19:59:54 +00:00
perroned
92c3cdb746
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
2017-02-23 19:20:37 +00:00
perroned
2d04f057cc
Cleans up html5 screenshare
2017-02-22 20:31:09 +00:00
perroned
de1a91950e
Restructure constraints
2017-02-21 21:07:42 +00:00
Fred Dixon
47767ae9cf
Minor edit to config.xml to setup defaults for logging
2017-02-08 19:14:28 -06:00
perroned
0c64b0e0dc
Removes comments from config xml template
2017-02-08 21:27:53 +00:00
Richard Alam
cc9e0c9151
Merge pull request #3618 from riadvice/detect-https-in-bbb_webrtc_bridge_sip.js
...
Auto detect https in bbb_webrtc_bridge_sip.js and select between wss and ws
2017-02-07 14:45:04 -05:00
Dan A. Perrone
37cce892fc
fixes issue of sending empty video
2017-02-07 10:18:52 -05:00
Anton Georgiev
ad35758cb9
initialize html5StunTurn properly - complication from PR 3628
2017-02-03 13:57:29 -05:00
Anton Georgiev
22bb2a8200
fix bug preventing stun/turn call
2017-02-03 11:25:04 -05:00
perroned
1116cc0d1e
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
...
Conflicts:
bigbluebutton-client/resources/config.xml.template
2017-02-02 15:27:08 +00:00
Ghazi Triki
0d6acd27b4
Auto detect https in bbb_webrtc_bridge_sip.js and select between wss and ws
2017-01-31 19:31:27 +01:00
