Commit Graph

3609 Commits

Author SHA1 Message Date
Tainan Felipe
8ae1fd1820 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-moderator-ends 2018-01-11 09:19:56 -02:00
Joao Siebel
0764ae867c Remove old whiteboard toolbar items config 2018-01-11 08:51:37 -02:00
Augusto Bennemann
a8888e49ad Prevent multiple clicks on share/unshare video button 2018-01-10 23:16:49 -02:00
Maxim Khlobystov
aeb1aeb14b Made sure the mute/unmute button is updated when Flash client mutes/unmutes HTML5 client. 2018-01-10 15:51:10 -05:00
Maxim Khlobystov
12e474fa01 Doing the mute/unmute flag change inside the Audio Manager instead of using Mongo observer. 2018-01-10 15:41:21 -05:00
Joao Siebel
0b02d90927 Resolve merge conflicts 2018-01-10 17:22:42 -02:00
Tainan Felipe
5e96068a6d remove multiplication for 1 2018-01-10 16:55:33 -02:00
Tainan Felipe
273ea0dbc6 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-settings-mobile 2018-01-10 16:42:39 -02:00
KDSBrowne
9593b12904 remove css not being used 2018-01-10 09:22:03 -08:00
Tainan Felipe
2f00d0b612 add directory via absoluteFilePathh 2018-01-10 15:03:06 -02:00
KDSBrowne
57424ecedd add css class to align btns as presenter for small mobile screens 2018-01-10 07:44:21 -08:00
Tainan Felipe
b9d7a5ba38 changes to import form 2018-01-10 10:43:45 -02:00
Oleksandr Zhurbenko
7871681448 Changed all the references of kick to remove, to be consistent 2018-01-09 14:28:48 -08:00
Anton Georgiev
a2ff3e6480 remove AudioComponent as we do not render anything 2018-01-09 17:07:29 -05:00
KDSBrowne
7c6e490b82 fix btn positioning using media queries 2018-01-09 13:13:31 -08:00
KDSBrowne
438afc6241 reduce margin between btns on action bar 2018-01-09 12:30:38 -08:00
Anton Georgiev
e9093a6c19 Merge branch 'v2.0.x-release' into fix-audio-locale-change 2018-01-09 14:52:49 -05:00
Anton Georgiev
0c8be1cc0b
Merge pull request #4833 from KDSBrowne/x.0.4-ios-hide-fullscreen
Hide fullscreen option for iOS devices
2018-01-09 13:29:53 -02:00
Anton Georgiev
980a6490ec
Merge pull request #4832 from KDSBrowne/x.0.3-fix-console-warnings
Fix Invalid prop 'children[2]' supplied to `DropdownList`
2018-01-09 13:28:17 -02:00
Anton Georgiev
0392634f57
Merge pull request #4841 from MaximKhlobystov/reopen-private-chat-bug
[HTML5 Client] Fix for reopening private chat after using X button
2018-01-08 18:42:36 -02:00
Anton Georgiev
415a8ec5df
Merge pull request #4915 from OZhurbenko/update-meteor-16
Updated Meteor to 1.6.0.1
2018-01-08 18:39:16 -02:00
Richard Alam
b93a95ca8e
Merge pull request #4896 from prlanzarin/flash-webcam-fix
Ghost flash webcams fix
2018-01-08 10:18:52 -08:00
Oleksandr Zhurbenko
ce1f40ac9a Updated Meteor to 1.6.0.1 2018-01-07 22:17:18 -08:00
Oleksandr Zhurbenko
962e659378 Switched the components from deprecated method to 2018-01-07 20:44:42 -08:00
Oleksandr Zhurbenko
2de02c4f8d Linting 2018-01-07 16:25:56 -08:00
Oleksandr Zhurbenko
4af6d30f6a Switched from the broken 4commerce:env-settings package to native Meteor.settings 2018-01-07 16:24:05 -08:00
Augusto Bennemann
e2ef3281ec Localize video and screnshare error messages 2018-01-05 19:43:53 +00:00
Augusto Bennemann
67cb4b073b Error notifications for video and screenshare 2018-01-05 17:16:46 +00:00
prlanzarin
dfb5170e5d Finished filtering out HTML5 and Flash webcams using stream name patterns 2018-01-04 16:24:50 +00:00
Anton Georgiev
d22a6d5a96
Merge pull request #4883 from OZhurbenko/fix-issue-4863
Updated the message displayed to the kicked user
2018-01-04 14:20:00 -02:00
Anton Georgiev
850ac870e9
Merge pull request #4884 from OZhurbenko/fix-issue-4715
Updated the html5 client's font to use the latest icons
2018-01-04 13:30:36 -02:00
Anton Georgiev
a00487cc75
Merge pull request #4740 from Tainan404/fix-dropdown-bug
Fix user list dropdown bug when making user presenter.
2018-01-03 19:40:49 -02:00
Anton Georgiev
34a503b218
Merge pull request #4624 from Tainan404/toast-breakout-ends
[HTML5] show audio modal and toast notification when breakout room ends
2018-01-03 19:11:27 -02: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
Oleksandr Zhurbenko
d8533a86b3 Changed the message displayed to the kicked user
Fixes #4863
2018-01-03 12:25:13 -08:00
KDSBrowne
3fd964d3ca remove import not being used 2018-01-03 09:04:28 -08:00
KDSBrowne
ed3d58f0f2 Merge remote-tracking branch 'upstream/v2.0.x-release' into x.0.3-fix-console-warnings 2018-01-03 08:56:22 -08:00
Anton Georgiev
830627ea0c
Merge pull request #4831 from OZhurbenko/presenter-functionality-2x
Improved Whiteboard toolbar's user experience
2018-01-03 14:47:02 -02:00
Anton Georgiev
5debc39362
Merge pull request #4818 from antobinary/fix-ios-audio
Add permissionLayout location for Safari
2018-01-03 14:46:19 -02:00
Anton Georgiev
f0e15af607
Merge pull request #4814 from oswaldoacauan/issue-4812
Simplify authentication code/flow and Add subscriptions error handling
2018-01-03 14:45:38 -02:00
Anton Georgiev
c9379eaa0f add muteOnStart param in Meeting structure 2017-12-22 15:22:24 -05:00
prlanzarin
02a46387e0 Filter out html5 cameras from flash client 2017-12-22 19:25:25 +00:00
prlanzarin
31fb95bf72 Removed wrong video peer stop procedure and reset the kurento.yaml config file 2017-12-22 12:30:24 +00:00
prlanzarin
8608fd9f94 Tooltips for video buttons and actions-bar container service calls fixes 2017-12-21 17:40:00 +00:00
prlanzarin
3a72afa350 Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection 2017-12-21 17:37:07 +00:00
Lucas Zawacki
06f8b56a82 Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-video-media-flow
Conflicts:
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
2017-12-20 18:43:33 -02:00
prlanzarin
362335f727 Made the users own webcam local instead of server-side 2017-12-20 20:06:27 +00:00
Lucas Zawacki
113aca16a2 Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-development-reconnect-issues
Conflicts:
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	labs/bbb-webrtc-sfu/lib/video/VideoManager.js
	labs/bbb-webrtc-sfu/lib/video/video.js
2017-12-20 17:20:56 -02:00
prlanzarin
0cecd028fd Changing the way the unshare webcam API is called to support user roles 2017-12-20 18:00:17 +00:00
Tainan Felipe
0037ebd77d remove locales.js which is unnecessary 2017-12-20 15:15:49 -02:00
Lucas Zawacki
2e3ea4e45f Better video stop treatment in HTML5 2017-12-20 15:05:05 -02:00
Tainan Felipe
5c5125c7d2 fix issue #4847 2017-12-20 14:56:56 -02:00
Lucas Zawacki
4aac6d8413 Tweaks on the video media flow 2017-12-20 00:32:31 -02:00
Lucas Zawacki
1f5dd6f9a7 Move WS open/close events to component mount/unmount 2017-12-19 15:02:54 -02:00
Lucas Zawacki
afe4057bf2 Refactor html5 video tag creation to work with React style 2017-12-19 14:29:09 -02:00
KDSBrowne
1afe2f96bf add comment 2017-12-19 08:23:40 -08:00
Oswaldo Acauan
eb4c89aefc Fix bug when users re-validate after refresh 2017-12-19 10:19:47 -02:00
Tainan Felipe
523caf226d fix settings for mobile screen 2017-12-19 09:13:37 -02:00
Maxim Khlobystov
9f6d25ab45 Small comment. 2017-12-18 15:12:31 -05:00
Maxim Khlobystov
b9b73de839 Applied the private chat fix to Chat container. 2017-12-18 15:01:13 -05:00
Maxim Khlobystov
cab6d1a19e Made Chat container a class component 2017-12-18 14:56:08 -05:00
Maxim Khlobystov
56b04d6831 Converted Chat component back to its stateless version. 2017-12-18 14:45:40 -05:00
Maxim Khlobystov
3937a01ffd Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into reopen-private-chat-bug 2017-12-18 13:04:42 -05:00
Maxim Khlobystov
6d84db0bd1 Linting. 2017-12-18 12:41:26 -05:00
Maxim Khlobystov
6130984c7c Small cleanup - removed unnecesssary import statement. 2017-12-18 12:40:31 -05:00
Maxim Khlobystov
bb5c0a1390 Made sure that when we open a new chat, it is not on the list of closed ones anymore. 2017-12-18 12:38:46 -05:00
Maxim Khlobystov
eba7f9ffec Convert the stateless Chat component into a class component. 2017-12-18 12:25:40 -05:00
Oswaldo Acauan
ced25948dd Fix 401 on page refresh 2017-12-18 13:52:04 -02:00
Tainan Felipe
2c48392b2c change intl id 2017-12-18 08:53:37 -02:00
Joao Siebel
c975228428 Fix proptype warning message for whiteboard toolbox labels 2017-12-18 08:37:17 -02:00
Tainan Felipe
85d4f50e06 fix intl id 2017-12-18 08:19:38 -02:00
KDSBrowne
f0958a1a02 fix client not loading on iOS devices 2017-12-15 22:41:54 -08:00
KDSBrowne
0868e98240 add comment to actions-dropdown component 2017-12-15 20:32:17 -08:00
KDSBrowne
bc0ecf0b95 remove new line between imports 2017-12-15 20:27:47 -08:00
KDSBrowne
f1cd5f2d6e move _.uniqueId() out of render function 2017-12-15 20:25:41 -08:00
KDSBrowne
284ab5e628 add button label 2017-12-15 13:06:22 -08:00
Anton Georgiev
d6aa4ed44d
Merge pull request #4733 from oswaldoacauan/fix-4700
Improvements on Presentation Management
2017-12-15 19:03:54 -02:00
Anton Georgiev
b2aa8d4571
Merge pull request #4816 from jfsiebel/hide-audio-labels
Hide audio labels
2017-12-15 18:42:58 -02:00
Oleksandr Zhurbenko
4b344853ff Disabling the Thickness and Colour menu items when the 'hand' tool is selected
Fixes #4808
2017-12-15 12:22:41 -08:00
Oleksandr Zhurbenko
b3450a46ff Changed a default tool to Pencil
Fixes #4807
2017-12-15 12:10:38 -08:00
Oleksandr Zhurbenko
6de2b35cb2 Fixed round buttons' icon centering
Fixes #3576
2017-12-15 11:56:12 -08:00
Oswaldo Acauan
2eb2bbd8ab Fix case when there is no current selected 2017-12-15 16:49:47 -02:00
KDSBrowne
5047c089ca fix remaining console warnings 2017-12-15 09:45:14 -08:00
KDSBrowne
fbec9fc101 fix failed prop type: scrollPosition in Chat component 2017-12-15 09:18:35 -08:00
Joao Siebel
b6eec76e70 Change event to onMouseUp again and linter code 2017-12-15 15:14:21 -02:00
Lucas Zawacki
1e514aad04 Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into bbb-webrtc-sfu
Removed several variables that were in this.state to this in the html5 video-dock component

Conflicts:
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
2017-12-15 13:47:03 -02:00
Anton Georgiev
c9c6797fc9
Merge pull request #4788 from antobinary/audio-work-3
Handle dial-in users in HTML5
2017-12-15 13:44:51 -02:00
KDSBrowne
f4abcc0334 remove console log 2017-12-15 07:41:57 -08:00
KDSBrowne
7e4b2ddce5 hide fullscreen option for iOS devices 2017-12-15 07:39:59 -08:00
KDSBrowne
409b2e95e3 clean up code 2017-12-15 07:22:29 -08:00
KDSBrowne
c5b96ed4c8 Merge remote-tracking branch 'origin/x.0.2-fix-invalid-prop' into x.0.3-fix-console-warnings 2017-12-15 07:13:09 -08:00
Joao Siebel
218890d8a6 Alter status tooltip to match selected status 2017-12-15 11:11:28 -02:00
Oswaldo Acauan
0c89d81675 Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-4812 2017-12-15 09:13:26 -02:00
KDSBrowne
165df38dcb fix Failed prop type warning in LeaveConfirmation 2017-12-14 11:35:10 -08:00
KDSBrowne
57e1f80d55 convert to component that entends Purefunction 2017-12-14 11:23:43 -08:00
Tainan Felipe
c582f5bf08 add meetingEnded in Base component aand add intl translation 2017-12-14 17:03:34 -02:00
Lucas Zawacki
a370285f0b Capture several errors and crashes in client and bbb-webrtc-sfu 2017-12-14 16:42:13 -02:00
KDSBrowne
2cebd8d8d9 remove console logs 2017-12-14 09:35:45 -08:00
KDSBrowne
b59106912a fix console warnings 2017-12-14 09:31:05 -08:00
Anton Georgiev
1b939ad2aa
Merge pull request #4803 from antobinary/adjust-polls-4778
Poll updated event - drop requesterId/presenterId and rename event
2017-12-14 13:25:34 -02:00