BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,717 Commits 13 Branches 260 Tags 1.1 GiB
aa2e5b9e35
Commit Graph

385 Commits

Author SHA1 Message Date
Chad Pilkey
facf1ab7b2 warning for ie users 2019-03-25 14:38:41 -07:00
Chad Pilkey
815e454eb7 revert normalize.css back to old version to avoid Safari issue 2019-03-21 16:24:43 -07:00
Chad Pilkey
5c357a7fb7 update normalize.css to a newer version 2019-03-21 14:03:22 -07:00
Chad Pilkey
d3656ef022 clean up of the buttons. simplified and reduced 2019-03-19 10:11:48 -07:00
Anton Georgiev
8380875e70 remove Verto code 2019-03-08 19:41:19 +00:00
KDSBrowne
ee0f030043 add web open font format files / remove ttf files 2019-03-07 16:49:10 +00:00
Anton Georgiev
f2bd5573f9 remove unused font files; pulled latest fonts 2019-02-21 22:13:57 +00:00
Anton Georgiev
f620de2585 pulled latest fonts to obtain download-off icon 2019-02-20 19:29:16 +00:00
Anton Georgiev
42ce30416b
Merge pull request #6634 from vitormateusalmeida/issue-5846 
Implement enable/disable Animations
 2019-02-05 09:49:36 -05:00
Anton Georgiev
cd531f91ff
Merge pull request #6702 from MaximKhlobystov/html5-logs 
Improve logging
 2019-02-01 16:03:23 -05:00
Maxim Khlobystov
b86a990612 Add logCode and build number to log messages 2019-02-01 14:12:06 -05:00
Vitor Mateus
64210cc610 Fixes 2019-01-30 15:43:11 -02:00
Vitor Mateus
e0ddffbf66 Merge remote-tracking branch 'upstream/master' into issue-5846 2019-01-30 10:01:29 -02:00
Chad Pilkey
1dda32bf0a remove the unused bbb_webrtc_bridge_sip.js from the HTML5 client 2019-01-29 16:09:57 -08:00
prlanzarin
4172a15a36 Check if the mediaDevices scope existes before checking for gDM availability 2019-01-28 18:48:06 +00:00
Vitor Mateus
c140acbd6b Merge remote-tracking branch 'upstream/master' into issue-5846 2019-01-28 10:14:46 -02:00
Chad Pilkey
4444a8f5a2
Merge pull request #6651 from prlanzarin/fix-ch-ss-new-adapter-html5 
[HTML5] Chrome extension-based screensharing with the newest adapter
 2019-01-25 16:53:32 -05:00
prlanzarin
202d896436 Fixed Chrome extension-based screensharing with the newest adapter on HTML5 2019-01-25 21:42:55 +00:00
Chad Pilkey
032460480d update the version of adapterjs and renable sipjs logging 2019-01-25 10:03:01 -08:00
Vitor Mateus
b6d5b15e3e Implement enable/disable Animations issue-5846 2019-01-24 14:16:23 -02:00
Anton Georgiev
3a375cb48f
Merge pull request #6619 from prlanzarin/fix-chrome-pc-createOffer 
Fixed Safari check in kurento-utils
 2019-01-23 14:04:47 -05:00
prlanzarin
4a2c26cc6f Fixed Safari check in kurento-utils 2019-01-23 16:33:04 +00:00
Anton Georgiev
6c06abc5bd
Merge pull request #6607 from prlanzarin/fix-chrome-pc-createOffer 
Fix webcam/screen sharing on Windows
 2019-01-23 08:52:25 -05:00
prlanzarin
1e71edb18a Add specific case for safari-specific devices on the SD offer release 2019-01-23 13:23:43 +00:00
prlanzarin
544d2ad38b Improved getDisplayMedia detection 2019-01-21 21:04:59 +00:00
prlanzarin
7df4349609 Reverted a change on kurento-utils that caused problems with the SDP offer generation 2019-01-21 20:25:00 +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
Gustavo Trott
954f7862d6 Fix video receive on Safari (and ios webview) without media grant 2019-01-10 21:25:39 -02:00
Gustavo Trott
ec49bdfda2 Nothing changed, this commit is really necessary because for some unknown reason all editors change whole file when save file, even editing in vi 2019-01-10 19:43:30 -02:00
prlanzarin
04ec52111a Reorganized the gDP code a bit to also support Edge 2019-01-03 18:17:13 +00:00
prlanzarin
c2646b78a2 Add support for getDisplayMedia on Chrome 2019-01-03 17:08:41 +00:00
prlanzarin
86e5c806f0 Removed ICE state change listener on screenshare presenter exit 2019-01-02 14:43:16 +00:00
Gustavo Trott
6d4cca9306 Fix audio in ios webview 2018-12-21 15:14:05 -02:00
Chad Pilkey
a42466961a [HTML5] create RTCPeerConnection with sdpSemantics:plan-b for Chrome unified-plan 2018-12-18 13:29:42 -08:00
zhu
304a29be2e Fix ios scrolling when drawing 2018-12-17 17:16:08 +08:00
Tainan Felipe
5a3649791b Transform joinRouterHandler and aunthenticatedRouteHandler in components 2018-11-14 15:11:10 -02: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
Tainan Felipe
32dd8c4740 migrate to session 2018-10-26 12:16:29 -03:00
Anton Georgiev
194140c056
Merge pull request #6123 from zhu/patch-1 
Fix compatibility in some old browser
 2018-10-25 14:52:52 -04:00
Anton Georgiev
35d92c3e6d improve on callbacks when joining client 2018-10-25 15:51:53 +00:00
Anton Georgiev
cde6311a5d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-24 18:26:13 +00:00
João Francisco Siebel
252bacb917 Add multiUserPenOnly parameter in yml 2018-10-18 14:03:11 -03:00
KDSBrowne
14066b4280 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into post-router-style-fix 2018-10-15 14:54:15 +00:00
Anton Georgiev
27a41753f9 hooked on error pages via Session 2018-10-12 17:05:30 +00:00
Anton Georgiev
4059fd5fa9 mostly recovered chat. needs UI love and handling of unread 2018-10-11 20:41:37 +00:00
gustavotrott
4f607d304a Move duplicated parameters to a constant in the beginning 2018-10-11 10:24:12 -03:00
prlanzarin
5dd8a3d3c4 Added onunmute listener to MediaStreamTrack to detect late start tracks 2018-10-09 18:03:40 +00:00
gustavotrott
265275018e Added compatibility with Electron Chromium 2018-10-09 10:43:22 -03:00
Anton Georgiev
497db01167 added meteor/session; userList without router 2018-10-05 19:23:16 +00:00
prlanzarin
2741022cb2 Updated kurento-utils WebRTC calls, added permission request on listen only for safari 
Also fixed a resource leak on listen only fallback and transitioned the SFU listen only from a tag-based approach to MediaStream
 2018-10-03 18:39:55 +00:00
Anton Georgiev
02905fb90d react-router removed, lots of code commented out, client loads 2018-10-03 16:14:10 +00:00
Anton Georgiev
308beb874c Auth logged in 2018-10-02 19:53:13 +00:00
Anton Georgiev
0c8eafc2c8 Merge branch 'remove-react-router' of github.com:antobinary/bigbluebutton into remove-react-router 2018-10-02 14:47:25 +00:00
zhu
39adce2321
Fix compatibility in some old browser 
Trailing comma in function arguments does not allowed until ECMAScript 2017
 2018-09-28 18:30:50 +08:00
Anton Georgiev
92732a96e6 WIP removing react-router 2018-09-21 15:43:10 +00:00
Tainan Felipe
210dbbbeaf Merge remote-tracking branch 'upstream/master' into zoom-implementation 2018-09-17 15:20:20 -03:00
Tainan Felipe
0372f736fc Add Double tap zoom and pan navigation 2018-09-12 11:36:04 -03:00
prlanzarin
e327625b64 Avoid calling screenshare viewer exit twice and handle any possible exception 2018-09-11 19:40:13 +00:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Anton Georgiev
49c0e7b9b1
Merge pull request #5998 from MaximKhlobystov/ice-connection-state-errors-2 
Better handling of screensharing ice connection state errors.
 2018-09-04 13:14:08 -04:00
Maxim Khlobystov
5825b635ba Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-connection-state-errors-2 2018-08-30 16:07:52 -04:00
prlanzarin
dc767d9bdb Fixed server-side error handling for listen only via SFU, correctly handling KMS abrupt shutdown 2018-08-30 02:41:02 +00:00
prlanzarin
be6313106b Add retry limiter to playVideo in kurento-utils 2018-08-29 19:39:15 +00:00
prlanzarin
a7bfb985d3 Improvements to Safari/Chrome autoplay policies with placeholder buffer on audiocontext and bogus audio + upstarting audio tag as muted 2018-08-29 19:12:34 +00:00
Tainan Felipe
75967a0aac Add minus icon 2018-08-28 14:14:01 -03:00
Maxim Khlobystov
82a69fb902 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-connection-state-errors-2 2018-08-28 12:49:06 -04:00
Maxim Khlobystov
285d57a766 Listening to the closed ICE connection state for viewer. 2018-08-28 12:40:51 -04:00
Maxim Khlobystov
6f7fdc41a1 Listening for closed state. 2018-08-28 11:40:26 -04:00
prlanzarin
4f99173d38 Using default input stream for SFU listne only 2018-08-28 15:24:06 +00:00
Maxim Khlobystov
fc3e46493e Linting. 2018-08-23 11:49:16 -04:00
Maxim Khlobystov
242200ac91 Replaced Ice with ICE in strings. 2018-08-22 14:51:25 -04:00
Maxim Khlobystov
d67aba6c8a Listening to ice connection failures when screensharing. 2018-08-22 14:10:08 -04:00
Anton Georgiev
c95beba0e2
Merge pull request #5988 from Tainan404/add-minus-icon 
Add minus icon
 2018-08-17 10:15:52 -04:00
Tainan Felipe
b36abace9a Add minus icon 2018-08-17 11:07:22 -03:00
KDSBrowne
155b36f929 add desktop unshare icon 2018-08-07 23:02:11 +00:00
Tainan Felipe
ece61e9918
Merge branch 'master' into compability-to-npm 2018-08-02 17:27:23 -03:00
Tainan Felipe
05d04b63cb remove jquery-json.js 2018-07-31 09:00:27 -03:00
Tainan Felipe
80eeea2ac6 remove bbblogger 2018-07-30 13:57:06 -03:00
Anton Georgiev
53e5a64885
Merge pull request #5928 from lfzawacki/the-new-adventures-of-logger-and-loggy 
Additions to video, listen-only and screenshare logging
 2018-07-30 11:53:33 -04:00
Tainan Felipe
0c2866ccfb move ReconnectingWebSocket to npm packages 2018-07-27 17:42:45 -03:00
prlanzarin
4393d19877 Modified SIP.js to only resolve local description on ICE completion 2018-07-26 18:52:49 +00:00
Lucas Fialho Zawacki
e36c494252 Use newer logging calls for video,audio,screenshare 2018-07-26 15:26:56 -03:00
Lucas Fialho Zawacki
df22f43b11 Add window.Logger to kurento-extension 2018-07-25 19:08:35 -03:00
Lucas Fialho Zawacki
2fc85f75e1 New Logging format for listenonly audio and screenshare 2018-07-25 19:08:24 -03:00
Lucas Fialho Zawacki
b667c53590 Get more detailed logs from the video component 2018-07-25 18:53:12 -03:00
Anton Georgiev
e4edb9f196
Merge pull request #5894 from prlanzarin/sfu-error-handling-3 
SFU error handling part 3
 2018-07-24 13:45:08 -04:00
prlanzarin
75f70ad06c Added SFU error handling in video-provider component with localized messages 2018-07-20 19:34:50 +00:00
Bobak Oftadeh
a5354c9c10 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fixes3 2018-07-13 12:18:55 -07:00
Bobak Oftadeh
c98bd10024 Replaced console.errors with client logger and alterted logger configurations 2018-07-13 12:16:50 -07:00
Anton Georgiev
466bcf054a
Merge pull request #5854 from prlanzarin/video-attach-response-fixes 
Trying to fix WebRTC video tag attachment
 2018-07-11 13:41:09 -04:00
prlanzarin
5bf5a126b5 Cleaning ping/pong interval on SFU listen only exit 2018-07-11 16:32:52 +00:00
Anton Georgiev
5bcbc330af
Merge pull request #5842 from prlanzarin/audio-video-ss-stun-turn 
[HTML5] STUN/TURN config support for SFU client-side apps and general improvements
 2018-07-10 11:24:37 -04:00
prlanzarin
d2bdb67ed3 Propagating configs to WebRTC screenshare script and added support for STUN/TURN config to SFU components 2018-07-09 21:29:59 +00:00
Anton Georgiev
bc410c290c
Revert "Prevent screen from moving while drawing" 2018-07-05 16:05:02 -04:00
Bobak Oftadeh
bc3e068e2e Client logger implemented 2018-07-04 14:02:10 -07:00
Oswaldo Acauan
3e2008be3e Prevent screen from moving while drawing. Closes #5672 2018-07-04 17:11:04 -03:00
Anton Georgiev
cd6417aa33
Merge pull request #5779 from oswaldoacauan/whiteboard-fixes 
Whiteboard fixes and improvements
 2018-07-03 11:33:35 -04:00
prlanzarin
d4858b6e70 Fixed userId/userName sending to SFU audio component 
Also did some refactoring to kurento-extension parameters
 2018-06-28 18:50:56 +00:00
Oswaldo Acauan
3b29f50765 Change viewport to prevent zooming. Related #5672 2018-06-28 11:28:28 -03:00
prlanzarin
2f5aa09fe5 Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-opt-audio 2018-06-27 17:34:33 +00:00
Tainan Felipe
aaebcd8f10 add filled star in feedback rating 2018-06-12 16:53:17 -03:00
Anton Georgiev
21dcb0eaeb html5 client title - same format as Flash client 2018-06-07 15:18:11 +00:00
Anton Georgiev
1b755bfb24 make window title configurable 2018-06-01 18:31:41 +00:00
Augusto Bennemann
77a25940e0
Comment out screenshare code for Safari 2018-05-23 13:04:03 -03:00
Augusto Bennemann
68c18ff70f Display a toast for screensharing not supported by Safari 2018-05-22 14:17:35 -03:00
Anton Georgiev
b6b93d8903
Merge pull request #5497 from musickiper/absPathToRelPath 
Change abs paths to use baseName config
 2018-05-16 08:51:05 -04:00
James Jung
5fe5d2ee3f Change fonts' abs paths to use baseName config(3) 2018-05-11 13:58:48 -04:00
prlanzarin
060e8abf32 Fixed screenshare resolution limit 2018-05-09 23:38:20 +00:00
James Jung
e66fd17fd7 Change fonts' abs paths to use baseName config(2) 2018-05-09 17:01:21 -04:00
James Jung
e192ea1e42 Change fonts' abs paths to use baseName config 2018-05-09 16:59:17 -04:00
prlanzarin
9d26a83514 Removed application support for chrome screensharing 
Also reverted the track resolution to the screen res. The WebRTC getSettings is buggy for chrome <= 65
 2018-05-09 16:39:59 +00:00
prlanzarin
1a16e5a0b1 Fixed screenshare resolutions to preserve aspect ratio 2018-05-09 14:21:03 +00:00
James Jung
26271b0f0e Delete styles.scss file which stored images' links for the whiteboard cursor and put the links for the whiteboard cursor inside components 2018-05-08 18:06:31 -04:00
James Jung
583725053c Change some files permission from 755 to 644 2018-05-08 16:05:04 -04:00
James Jung
ae9d92ea16 Update absolute paths to use baseName config 2018-05-07 19:15:50 -04:00
prlanzarin
5375eb2836 Removed uneeded dispose func and updated flash kurento-extension with listen only hooks 2018-05-07 17:44:18 +00:00
prlanzarin
37564a0c6f Fixed userName/userId usage in kurento-extension 2018-05-07 17:17:48 +00:00
Anton Georgiev
f973fedf4d commenting out code that breaks client loading 2018-05-03 15:21:46 +00:00
prlanzarin
01f87d2718 Added websocket ping pong to SFU clients 
Also updated SFUs package-lock
 2018-05-03 13:57:03 +00:00
prlanzarin
47120111dd Fixed adapter calls in SFU and added bridge hooks for kurento listen only 2018-04-27 21:37:41 +00:00
prlanzarin
9fe4fecf2c Improved chrome screensharing constraints and fixed SFU exception 2018-04-27 14:37:18 +00:00
prlanzarin
5059ccdce6 Merge remote-tracking branch 'upstream/v2.0.x-release' into screenshare-opt2 2018-04-25 16:57:02 +00:00
prlanzarin
4cb7dcab7c Refactored WebRTC screenshare flow and fixed mcs-core event emission 2018-04-25 16:56:16 +00:00
Tainan Felipe
2e76439395 Change hand to pointer icon 2018-04-18 16:32:13 -03:00
prlanzarin
1f057bb267 Improved Chrome WebRTC screenshare constraints 2018-04-17 15:23:25 +00:00
Oswaldo Acauan
9c2e8472cc Merge branch 'presentation-styles' into webcams-styling 2018-04-13 10:06:11 -03:00
prlanzarin
0429c2032f Removed uneeded audio negotiation from screenshare viewers 2018-04-12 18:25:51 +00:00
Oswaldo Acauan
5918fc4483 Impl new webcam design 2018-04-09 11:39:27 -03:00
Lucas Fialho Zawacki
65a2fb592f Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-dock-refactor 2018-03-20 17:22:11 +00:00
Anton Georgiev
c52ce83ab4 set max height and width for screenshare to 1080 x 1920 2018-03-09 13:35:37 -05:00
Anton Georgiev
8e0f57c941 linting of kurento-extension.js 2018-03-07 16:23:40 -05:00
Anton Georgiev
dad12699a4 handle Chrome extension "stop sharing" event 2018-03-07 16:23:40 -05:00
prlanzarin
ba5f295624 Limited Firefox WebRTC screenshare options to screen only 2018-02-26 18:42:53 +00:00
Lucas Fialho Zawacki
1b3633c8bd More components for video-dock 2018-02-16 19:24:35 +00:00
Anton Georgiev
a8189b3a36
Merge pull request #5141 from oswaldoacauan/videodock-new 
Improvements for PR#5117
 2018-02-13 15:02:04 -05:00
prlanzarin
81afe84079 Limiting screensharing FPS to 5-10 and resolution to screen size 
Also fixes the extension prompt for chrome users in the HTML5 client
 2018-02-08 22:53:18 +00:00
Augusto Bennemann
95c172a8f0 Videodock adjusts for screenshare 2018-02-08 16:32:12 +00:00
Augusto Bennemann
d5cda55220 Improve video adjusting code 2018-02-08 12:52:29 -02:00
Augusto Bennemann
323cdd3232 Fix camera button style and improve videodock code 2018-02-07 17:20:10 -02:00
Augusto Bennemann
541b06393c Video positioning. Code still bad. 2018-02-07 13:11:52 -02:00
Lucas Fialho Zawacki
3af600d015 User video tags with new design [part 1] 2018-02-07 12:56:07 -02:00
Oleksandr Zhurbenko
4eb5d278c3 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-issue-4900 2018-01-15 12:22:56 -08:00
Oleksandr Zhurbenko
cf74ca961c Making sure we load all the external libraries before starting the client 
Fixes #4900
 2018-01-15 12:15:58 -08:00
Anton Georgiev
e9093a6c19 Merge branch 'v2.0.x-release' into fix-audio-locale-change 2018-01-09 14:52:49 -05:00
Oleksandr Zhurbenko
b3ceb4d5f6 Updated the html5 client's font to use the latest icons 
Fixes #4715
 2018-01-03 12:35:01 -08:00
prlanzarin
3a72afa350 Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection 2017-12-21 17:37:07 +00:00
Anton Georgiev
4765ff80ef Move <audio> to main.html 
Currently it is deep within Base component. So when Base is re-rendered with the updated locale, we lose <audio>. Placing it in main.html, outside Base resolved the problem
 2017-12-13 11:32:36 -05:00
prlanzarin
b7c4115ba3 Moved kurento browser scripts to /client/lib and removed bower packaging from the HTML5 client 2017-11-27 16:22:48 +00:00
prlanzarin
f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 
Conflicts:
	bigbluebutton-html5/imports/startup/client/base.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
	bigbluebutton-html5/imports/ui/components/app/container.jsx
	bigbluebutton-html5/imports/ui/components/screenshare/service.js
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
	bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
 2017-11-11 03:41:37 +00:00