Commit Graph

19251 Commits

Author SHA1 Message Date
Richard Alam
ffc448f948 - fix issue https://github.com/bigbluebutton/bigbluebutton/issues/4660 2017-12-18 12:16:15 -08: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
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
Anton Georgiev
bfa8637edc
Merge pull request #4830 from OZhurbenko/fix-issue-3576
Fixed round buttons' icon centering
2017-12-15 18:24:49 -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
Lucas Zawacki
ecda3f460e Don't send the 'media not flowing' event until we figure things out 2017-12-15 13:57:29 -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
9a92d972d8
Merge pull request #4822 from bigbluebutton/antobinary-update-index.html
Update index_html5_vs_flash.html
2017-12-14 14:00:14 -02:00
Anton Georgiev
696974d3b7
Update index_html5_vs_flash.html 2017-12-14 10:58:06 -05: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
Joao Siebel
845692b9e5 Merge remote-tracking branch 'upstream/v2.0.x-release' into hide-audio-labels 2017-12-14 09:01:38 -02:00
Anton Georgiev
375b8ad68a add permissionLayout location for Safari 2017-12-13 15:37:31 -05:00
Anton Georgiev
886b32d2ef set defaultProps for glow to be false 2017-12-13 14:19:26 -05:00
Anton Georgiev
334c80083e
Merge pull request #4753 from jfsiebel/html5-tooltip
Add tooltip for buttons without label
2017-12-13 17:13:28 -02:00
Anton Georgiev
97989025df audio related linting 2017-12-13 14:03:14 -05:00