Commit Graph

32 Commits

Author SHA1 Message Date
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
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
Tainan Felipe
7243d3bbc3 Fix css variable was not working 2018-10-30 13:19:22 -03:00
Tainan Felipe
c6284a0fbb Add poiter cursor the hover over the video dropdown 2018-10-30 09:47:18 -03:00
Oswaldo Acauan
f71d32a464 Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
WIP

wip

wip

format

wip

Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
2018-10-23 14:21:58 -02:00
Lucas Zawacki
1d38dc4f2e Make it so that cameras use the full space of the video window 2018-09-18 13:58:29 -03:00
KDSBrowne
fc6d4a582f fix webcams audio state indicator sizing 2018-08-03 02:53:46 +00:00
prlanzarin
6f78cf057c Merge remote-tracking branch 'gutobenn/webrtc_stats' into webrtc_stats 2018-06-08 16:36:41 +00:00
Augusto Bennemann
6f16948824 webRTC video stats: fetch stats on VideoListItem 2018-06-04 13:53:41 -03:00
Lucas Fialho Zawacki
cb5022681d Catch exceptions on video tag play 2018-05-29 17:51:50 +00:00
Lucas Fialho Zawacki
32c587dc0d Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into better-video-stability 2018-05-28 18:43:29 +00:00
Augusto Bennemann
a3584092ec Improve webRTC video stats code 2018-05-25 16:24:41 -03:00
Lucas Fialho Zawacki
6cae1678ef Separate webrtc errors, restart and ice in separate functions 2018-05-23 18:04:01 +00:00
Augusto Bennemann
e8c2e1219c Fix measure name 2018-05-17 15:08:27 -03:00
Augusto Bennemann
5f142fa793 Fix merge conflicts 2018-05-17 14:49:35 -03:00
Tainan Felipe
44a5d6c600 add voice user icon for webcam status 2018-05-04 16:44:30 -03:00
Augusto Bennemann
9840bec025 Fix for NaN bug on Firefox; Improve setStats() 2018-04-27 18:57:38 +00:00
Oswaldo Acauan
72498ca227
Fix webcam dropdown padding 2018-04-27 11:50:05 -04:00
Augusto Bennemann
6fe043730e Fix for Firefox and video unmounting 2018-04-26 23:35:05 +00:00
Augusto Bennemann
f163e7683d Improve WebRTC stats react code 2018-04-26 23:01:59 +00:00
Augusto Bennemann
1985958191 WebRTC stats for each video 2018-04-26 22:19:15 +00:00
BobakOftadeh
8e50a232c7
Loading screen rotation spins counter-clockwise
The arrows for when a webcam is loading now correctly spins counter-clockwise.
2018-04-25 17:02:36 -04:00
Oswaldo Acauan
bd61d55c07 Fix wrong calc for optimal grid while having a focused cam 2018-04-17 10:21:18 -03:00
Oswaldo Acauan
86b2cb0040 Fix presentation and webcam not resizing correctly 2018-04-17 10:09:00 -03:00
Oswaldo Acauan
ccf4fbba9e Fix grid sizing on mount 2018-04-13 15:20:00 -03:00
Oswaldo Acauan
599a1935d4 Improve webcam gaps sizing 2018-04-12 09:41:49 -03:00
Oswaldo Acauan
5b9433fc9f Fix webcams/sfu reconnect on every render and styles for 4:3 2018-04-11 15:50:14 -03:00
Oswaldo Acauan
ed8d570a3d Fix gutter calc and reduce in favor of for statement 2018-04-10 10:36:58 -03:00
Oswaldo Acauan
fe11dd9a90 Improve media overlay/content styles 2018-04-09 15:28:54 -03:00
Oswaldo Acauan
5918fc4483 Impl new webcam design 2018-04-09 11:39:27 -03:00