Commit Graph

1611 Commits

Author SHA1 Message Date
Lucas Zawacki
1f2f5dc218 More reconnect logic and some translations 2017-12-01 21:40:25 -02:00
prlanzarin
fdca5356c3 Finished making bbb-webrtc-sfu answer in single path
Started standardizing video and screenshare RPC messages

Video now uses redis message routing
2017-11-24 18:59:40 +00:00
prlanzarin
248dc7fa08 Fixed HTML5 video API import
Added chrome extension ID to HTML5 screenshare call
2017-11-17 18:55:59 +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
prlanzarin
76f09e16ad Adding checks to show screenshare and video overlays according to config file 2017-11-11 01:36:55 +00:00
prlanzarin
2166b56304 Added toggle options for kurento video/screensharing in the HTML5 config yaml
Also made cam button respond to those config values
2017-11-10 21:08:40 +00:00
Oleksandr Zhurbenko
561709644d Fixed a bug with props in the polling container 2017-11-06 10:24:10 -08:00
prlanzarin
050d4c29bf Moved HTML5 video adjustment to a separate script 2017-11-06 15:42:00 +00:00
prlanzarin
e96fc385f1 Handling HTML5 screensharing stop
The action bar stop button is temporary
2017-11-06 15:39:55 +00:00
Anton Georgiev
1fdd1f1353
Merge pull request #4585 from Gcampes/end-meeting-fix
Fix issue that prevented end meeting button to appear
2017-11-02 12:40:12 -02:00
Anton Georgiev
8b80d7e9c2
Merge pull request #4621 from Tainan404/fix-upload-percentage
[HTML 5] Rounds upload percentage, localize messages in presentation uploader
2017-11-02 11:03:03 -02:00
Anton Georgiev
63eb812f85
Merge pull request #4578 from OZhurbenko/meteor-react-16-update
React 16 and packages update
2017-11-02 10:41:45 -02:00
Gabriel Carvalho de Campes
333916e59a Merge remote-tracking branch 'upstream/v2.0.x-release' into end-meeting-fix 2017-11-02 10:38:06 -02:00
Oleksandr Zhurbenko
e883995379 Breaking proptypes validation, sorry, any questions to @oswaldoacauan 2017-11-01 13:11:35 -07:00
Tainan Felipe
9db759074f moved intl messages to locales/en 2017-11-01 14:37:44 -02:00
Gabriel Carvalho de Campes
c9d7c9cae4
fix endmeeting handler with incorrect name 2017-11-01 13:47:14 -02:00
Tainan Felipe
c1df1da3c4 rounds the file upload percentage 2017-11-01 10:19:18 -02:00
Anton Georgiev
8853d562ce
Merge pull request #4497 from Gcampes/audio-refactor
[HTML5] Refactor Audio
2017-10-31 15:39:37 -02:00
Gabriel Carvalho de Campes
2cca0c1724 change device selector key generation 2017-10-31 15:34:06 -02:00
Gabriel Carvalho de Campes
fde5d56d87 change ask permissions timing, small code fixes 2017-10-31 08:53:06 -02:00
Anton Georgiev
f5d65b8983
Merge pull request #4577 from Gcampes/kick-user-meeting-end
Remove user on meeting end
2017-10-27 21:19:20 -02:00
Gabriel Carvalho de Campes
ba019e52db fix issue preventing end meeting button to appear 2017-10-27 15:08:43 -02:00
Anton Georgiev
970205f92d Merge pull request #4556 from jfsiebel/fix-user-list-mute-unmute-logic
fix allowedToMuteAudio and allowedToUnmuteAudio logic and created action
2017-10-27 12:01:14 -02:00
Gabriel Carvalho de Campes
144705ce9b change func call to a variable 2017-10-27 11:44:42 -02:00
Gabriel Carvalho de Campes
436e7df7d4 removes unused css, removes unneeded code 2017-10-27 11:19:24 -02:00
Gabriel Carvalho de Campes
9bb0248957 fix logout issue on meeting end 2017-10-26 16:45:03 -02:00
Gabriel Carvalho de Campes
cf73251feb Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-26 16:26:19 -02:00
Gabriel Carvalho de Campes
81f35bac4f Fix concerns from review 2017-10-26 15:14:56 -02:00
Oleksandr Zhurbenko
df3325e42f Fixed a bug introduced in #4524 2017-10-25 16:12:17 -07:00
Oleksandr Zhurbenko
6dabe055d8 bug fixes; CSS animation package update; updated package-lock; fixed permissions; 2017-10-25 16:11:06 -07:00
Anton Georgiev
f7ba155f97 Merge pull request #4524 from oswaldoacauan/patch-3
[HTML5] Fix logClient method name
2017-10-24 17:04:38 -02:00
Anton Georgiev
967be17440 Merge pull request #4521 from Tainan404/fix-presenter-modal-bug
[HTML5] Fix presentation upload modal  bug
2017-10-24 17:02:47 -02:00
Anton Georgiev
9f2b364710 Merge pull request #4553 from OZhurbenko/fix-settings-cancel
[HTML5] - Fix for Settings not being closed
2017-10-24 16:58:40 -02:00
Joao Siebel
8a534f14b1 fix allowedToMuteAudio and allowedToUnmuteAudio logic and created action 2017-10-24 13:35:47 -02:00
gcampes
d32330b208 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-24 11:19:58 -02:00
Oswaldo Acauan
e76459be65 Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3 2017-10-24 11:11:18 -02:00
Oswaldo Acauan
fda223e81d Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3 2017-10-24 11:01:58 -02:00
Oswaldo Acauan
45d604c63d Refactor logger from client to server 2017-10-24 10:58:46 -02:00
Tainan Felipe
8e2f29e667 changed assign of the function 2017-10-24 08:52:44 -02:00
Oswaldo Acauan
28c19ec82d Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-24 07:57:52 -02:00
Oleksandr Zhurbenko
a2c635d094 Fixed a bug with Settings not being closed when click Cancel 2017-10-23 16:19:02 -07:00
Anton Georgiev
eb9dd49b75 Merge pull request #4551 from Tainan404/fix-errors-linter
[HTML5] Fix issue introduced on #4488
2017-10-23 15:53:32 -02:00
Tainan Felipe
02c617da68 solve error in nav-bar component 2017-10-23 14:26:56 -02:00
Tainan Felipe
da608da325 fix merge issue 2017-10-23 14:15:55 -02:00
Tainan Felipe
1469791bc7 solve merge issues 2017-10-23 13:50:31 -02:00
Tainan Felipe
5ac96e6979 solve merge issues 2017-10-23 13:47:14 -02:00
Oswaldo Acauan
1dcfb9e3fa Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-23 13:31:33 -02:00
Anton Georgiev
4566d82a2a Merge pull request #4488 from Tainan404/fix-errors-linter
[HTML5] Fix errors linter
2017-10-23 12:27:38 -02:00
Tainan Felipe
896883ecd9 remove comment in recording-indicator component 2017-10-23 12:01:00 -02:00
gcampes
ff35ad9602 delete unused files, cleanup code 2017-10-23 10:41:09 -02:00