Commit Graph

183 Commits

Author SHA1 Message Date
Pedro Beschorner Marin
b5427737d7 Includes a minimal authentication step before SFU connections 2019-02-06 09:37:05 -02:00
Anton Georgiev
42ce30416b
Merge pull request #6634 from vitormateusalmeida/issue-5846
Implement enable/disable Animations
2019-02-05 09:49:36 -05:00
Gustavo Trott
fe99ea889a Hide Mic and Camera buttons if userAgent contains bbbnative 2019-01-31 15:17:03 -02:00
Vitor Mateus
e0ddffbf66 Merge remote-tracking branch 'upstream/master' into issue-5846 2019-01-30 10:01:29 -02:00
Pedro Beschorner Marin
07b36d8e27 Fixed video fullscreen position 2019-01-28 15:56:03 -02:00
Anton Georgiev
38afdcf22b
Merge pull request #6640 from pedrobmarin/master-presentation-ui
New UI for presentation/video swap and fullscreen buttons
2019-01-28 12:33:47 -05:00
Pedro Beschorner Marin
5b760b46ef Fixed share video button for locked users 2019-01-28 11:24:03 -02:00
Vitor Mateus
c140acbd6b Merge remote-tracking branch 'upstream/master' into issue-5846 2019-01-28 10:14:46 -02:00
Pedro Beschorner Marin
5d4918218f
Brings the fullscreen button upfront 2019-01-25 18:04:40 -02:00
Pedro Beschorner Marin
0d9117037d
Reverting video-list style modification 2019-01-25 14:32:00 -02:00
Pedro Beschorner Marin
9b882cbe56 Refactored fullscreen and presentation close buttons 2019-01-25 14:21:05 -02:00
Pedro Beschorner Marin
906e11d3d2 Moved fullscreen button style to it's own style sheet 2019-01-25 11:06:17 -02:00
Vitor Mateus
b6d5b15e3e Implement enable/disable Animations issue-5846 2019-01-24 14:16:23 -02:00
Bobak Oftadeh
42eba49dcd Adjusted min-width for dropdown 2019-01-22 14:50:25 -08:00
bobakoftadeh
5284a351c0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into fix-dropdown-webcaps 2019-01-21 21:53:22 +00:00
bobakoftadeh
1b4d956cb5 Fixed dropdown and removed gray border for webcams 2019-01-21 21:51:20 +00:00
Anton Georgiev
120c4712dc remove ping-pong logs for webcams 2019-01-21 20:05:52 +00:00
Anton Georgiev
48425b65d3
Merge pull request #6547 from gustavotrott/safari-audio-video-fix
Fix problems with audio and video in Safari/Webview
2019-01-18 11:37:33 -05:00
Lucas Zawacki
e883d3a2b0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into master-presentation-ui 2019-01-15 10:31:12 -03:00
Lucas Zawacki
2c98ecb2b8 Aesthetic fixes to buttons 2019-01-15 10:16:01 -03:00
gustavotrott
c21bb693b4 Store in session if can generate ice candidates, change timeout to 5secs, display error msgs 2019-01-14 22:45:32 -02:00
Gustavo Trott
a81705339b Avoid call tryGenerateIceCandidates twice 2019-01-14 11:59:47 -02:00
Gustavo Trott
fdf50b3ab7 Validade if Safari can send ICE Candidates before open RTC to receive video 2019-01-10 21:24:25 -02:00
Lucas Zawacki
bb4a83900c Fullscreen button for videos, presentation and screenshare 2019-01-07 15:15:37 -03:00
Anton Georgiev
3018093b27
Merge pull request #6458 from MaximKhlobystov/improve-webcam-picker
Improve webcam picker
2019-01-02 15:50:58 -05:00
Lucas Zawacki
094a0e4f3e Don't use camera button for swap anymore 2019-01-02 17:31:23 -03:00
prlanzarin
e7a500d7ec Revert video SFU connection error detection 2018-12-21 21:25:47 +00:00
prlanzarin
7aa8d7f027 Wait for SDP to be processed before adding candidates to peer on video 2018-12-21 19:47:15 +00:00
Maxim Khlobystov
f157c1a8fd Make sure we remove the event listener for beforeunload (+ some cleanup) 2018-12-20 14:03:09 -05:00
prlanzarin
79ae352e2d Fixed HTML5 viewer cam reconnections 2018-12-18 14:55:04 +00:00
Anton Georgiev
a6afd0314c
Merge pull request #6426 from antobinary/fix-6416
Fix 6416 - Clear All Status not working
2018-12-17 17:25:40 -05:00
Anton Georgiev
6250d606fd improve style on video-provider 2018-12-17 22:19:26 +00:00
prlanzarin
8e7fe4b50b Removed generic camera errors and improved video-preview gUM error handling 2018-12-17 17:45:57 +00:00
Anton Georgiev
1d4b21d9f7 handle meeting not found 2018-12-14 22:33:52 +00:00
Bobak Oftadeh
95ddb01666 Improved fix on VideoService.isLocked error 2018-12-06 22:41:09 +00:00
Bobak Oftadeh
cdc6033c45 fixed VideoService.isLocked error 2018-11-30 16:41:08 +00:00
Anton Georgiev
2e0660db7c
Merge pull request #6307 from Tainan404/issue-6289
Change the buttons on actions bar to ghost buttons
2018-11-29 15:06:52 -02:00
Tainan Felipe
fee219ed07 Fix console warning 2018-11-29 14:58:39 -02:00
prlanzarin
01795860c8 Workaround on webcam viewer race condition when state changes rapidly 2018-11-28 22:27:44 +00:00
Tainan Felipe
3561681e75 Change the buttons on actions bar to ghost buttons 2018-11-28 10:59:03 -02:00
prlanzarin
d652eb7f9b Added voiceBridge prop to video-provider and forward it to SFU 2018-11-20 13:05:16 +00:00
Anton Georgiev
fb0610076c
Merge pull request #6230 from MaximKhlobystov/webcam-choice
Webcam Settings modal for choosing a webcam
2018-11-16 14:33:54 -05:00
Maxim Khlobystov
ce5c20ba7c Unsharing a webcam when page reloads. 2018-11-16 14:03:20 -05:00
Richard Alam
d1dad75898 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-master-nov14 2018-11-14 08:47:21 -08:00
Maxim Khlobystov
91dad9d882 Fixing some linter error 2018-11-07 14:30:36 -05:00
Maxim Khlobystov
9f67ce4106 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webcam-choice 2018-11-06 18:17:52 -05:00
Maxim Khlobystov
90f38561c3 Add Webcam Settings to choose a camera 2018-11-06 18:10:56 -05:00
Ghazi Triki
ff80b30df1 Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master
# Conflicts:
#	bigbluebutton-html5/imports/ui/services/audio-manager/index.js
2018-11-02 21:02:02 +01:00
Ghazi Triki
653fd74440 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
#	bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
#	bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
#	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
#	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/client/compatibility/kurento-extension.js
#	bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
2018-11-01 14:00:54 +01:00
Anton Georgiev
4b4390214f
Revert "Make it so that cameras use the full space of the video window" 2018-10-30 14:25:21 -04:00