Commit Graph

19554 Commits

Author SHA1 Message Date
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
Joao Siebel
45ec92c230 Merge remote-tracking branch 'upstream/v2.0.x-release' into whiteboard-toolbar-locale 2017-12-14 08:47:45 -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
Tainan Felipe
5bd52234e6 add more width for modal 2017-12-13 17:00:16 -02:00
Tainan Felipe
bbbb64b4fd fix error in logoutURL 2017-12-13 16:59:24 -02:00
Oswaldo Acauan
1eacfcb5a1 Fix Meteor.error subscription params 2017-12-13 16:27:53 -02:00
Anton Georgiev
b450db91f7
Merge pull request #4683 from KDSBrowne/z14-fix-userlist-keyboard-accessibility
Fix user-list keyboard accessibility
2017-12-13 16:25:44 -02:00
Oswaldo Acauan
d19c127b1f Add redirect to /logout if not loggedin or on subscription errors 2017-12-13 16:20:56 -02:00
Oswaldo Acauan
b7fa508d9d Simplify auth code and remove clearCredentials on errors. Fix #4812 2017-12-13 16:20:47 -02:00
Oswaldo Acauan
2faf40e381 Throw meteor error when Acl fails for subscriptions 2017-12-13 16:20:37 -02:00
Oswaldo Acauan
62454b826b Remove duplicated log 2017-12-13 16:20:29 -02: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
Anton Georgiev
a30026a5ed
Merge pull request #4804 from OZhurbenko/fix-edge-default-locale
Fixed a problem with the default locale selection in Edge
2017-12-12 16:16:38 -02:00
Anton Georgiev
6e15b91cde
Merge pull request #4800 from OZhurbenko/fix-userlist-sorting
Fixed sorting in the user list
2017-12-12 16:14:24 -02:00
Oleksandr Zhurbenko
ed7b3f619a Corrected the detection of the clear_status 2017-12-12 09:27:51 -08:00
Oleksandr Zhurbenko
c31ee309f4 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-userlist-sorting 2017-12-12 09:11:22 -08:00
Oleksandr Zhurbenko
15f8099b84 Fixes a default locale selection for Edge, Windows 10 2017-12-12 09:05:43 -08:00
Maxim Khlobystov
b42668c65f
Merge pull request #4802 from OZhurbenko/fix-message-list-bottom-padding
Fixed last chat message view in Firefox
2017-12-12 11:37:46 -05:00
Anton Georgiev
38c87c7f75 poll voted - drop requesterId and rename event 2017-12-12 11:19:24 -05:00
Oleksandr Zhurbenko
c9770c02fb Fixed bottom padding for the last chat message in Firefox and Edge 2017-12-12 07:44:10 -08:00
Oleksandr Zhurbenko
ed0c338f8a Fixed sorting in the user list 2017-12-12 07:03:33 -08:00
Tainan Felipe
004290183d add screen to when the meeting is closed 2017-12-12 11:08:43 -02:00
Fred Dixon
d74d309be0
Merge pull request #4796 from jfederico/v2.0.x-release_bbb-lti-fix-getrecordings
bbb-lti: Fixes datatable and adds image preview
2017-12-11 16:27:56 -05:00
jfederico
aba6dfa5b7 bbb-lti: Added image preview to recordings 2017-12-11 18:48:16 +00:00
Joao Siebel
7009e4cebf Resolve linter problems 2017-12-11 16:47:34 -02:00
Joao Siebel
0d2276e8c5 Change actions button icon 2017-12-11 15:09:09 -02:00
Tainan Felipe
5fb0b9b9b7 fix merge conflict 2017-12-11 15:00:16 -02:00
jfederico
aea98ec5c8 bbb-lti: Fixed dataTable and made the eye icon toggle 2017-12-11 16:50:07 +00:00
Fred Dixon
bb5054bba2
Merge pull request #4794 from jfederico/v2.0.x-release_bbb-lti-fix-getrecordings
bbb-lti: Rework on the way XML is parsed in order to fix issue with getRecordings
2017-12-11 11:12:41 -05:00