Richard Alam
63d43da710
Merge pull request #5770 from ritzalam/merge-latest-20-branch
...
Merge latest 20 branch
2018-06-28 11:37:48 -04:00
Richard Alam
d3af675ef1
Merge branch 'v2.2-dev' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch
2018-06-28 08:34:20 -07:00
Richard Alam
d891a4e85f
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch
2018-06-28 08:30:17 -07:00
Oswaldo Acauan
3b29f50765
Change viewport to prevent zooming. Related #5672
2018-06-28 11:28:28 -03:00
Oswaldo Acauan
3e67501790
Clear optimistic shapes when the presenter/multiwb status change. Fix #5677
2018-06-28 11:27:40 -03:00
Fred Dixon
1ba07296a9
Remove incorrect image
2018-06-27 22:25:17 -04:00
Fred Dixon
8f6e40ed3f
Merge pull request #5763 from ffdixon/bbb-conf-15
...
Add additional step to installing PPA for ffmpeg
2018-06-27 16:45:40 -04:00
Fred Dixon
5bb98daa90
Add additional step to installing PPA for ffmpeg
2018-06-27 15:44:13 -05:00
Fred Dixon
6c82c18904
Merge pull request #5762 from riadvice/chrome-hardware-acceleration
...
Update hardware acceleration warning style and help page
2018-06-27 16:36:31 -04:00
Ghazi Triki
cefd078b0a
Update hardware acceleration warning style and help page.
2018-06-27 21:30:25 +01:00
Richard Alam
c92635b209
- cheange text to warn user that meeting is inactive
2018-06-27 12:59:33 -07:00
Richard Alam
0356721627
- clean up printlns
2018-06-27 12:58:49 -07:00
Richard Alam
db80060968
- fix reason ended string
2018-06-27 12:57:36 -07:00
Paulo Lanzarin
7d414e8b7d
Merge branch 'v2.0.x-release' into sfu-opt-audio
2018-06-27 14:44:11 -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
Anton Georgiev
1e1e605d7a
Merge pull request #5722 from antobinary/breakouts-improvements-3
...
Improvements to Breakouts on HTML5
2018-06-27 12:35:16 -04:00
Fred Dixon
224fec5f4c
Merge pull request #5758 from ritzalam/silence-chat-view-exceptions
...
- check if chat message is available to prevent NPEs
2018-06-27 12:20:49 -04:00
KDSBrowne
9f01d3b1d1
ensure settings modal is closed on cancel
2018-06-27 16:18:45 +00:00
Richard Alam
2f727fe085
- check if chat message is available to prevent NPEs
2018-06-27 08:15:47 -07:00
Richard Alam
4f728c651a
Merge branch 'antobinary-client-type-get-meetings' into v2.0.x-release
2018-06-27 08:09:34 -07:00
Richard Alam
d8a4a03cd7
Merge branch 'client-type-get-meetings' of https://github.com/antobinary/bigbluebutton into antobinary-client-type-get-meetings
2018-06-27 07:51:43 -07:00
Tainan Felipe
7dc251fc5a
add treater of webrtc error
2018-06-27 10:56:03 -03:00
Anton Georgiev
79329d036a
set dial-in clientType in html5 client
2018-06-26 20:50:03 +00:00
Anton Georgiev
e2e83e08df
plug clientType in UserJoin* messages, not separate ones
2018-06-26 19:27:42 +00:00
Anton Georgiev
67c7b90581
set clientType from Flash clients
2018-06-26 14:13:14 +00:00
Oswaldo Acauan
46a469eb2a
Prevent scrolling while drawing on iOS. Related #5672
2018-06-26 11:01:05 -03:00
Oswaldo Acauan
e4b0edefec
Fix undo not working for text-tool. Closes #5619
2018-06-26 10:50:19 -03:00
Oswaldo Acauan
d413b2e156
Fix linter errors
2018-06-26 10:38:43 -03:00
Oswaldo Acauan
03a18b85b1
Prevent drawing while disconnected
2018-06-26 10:28:58 -03:00
Bobak Oftadeh
5ee63a2aef
Fixed Package conflicts
2018-06-25 10:01:34 -07:00
Anton Georgiev
80fbebe829
Fix typo in clearing bbb-webrtc-sfu logs
2018-06-25 11:34:29 -04:00
Fred Dixon
34568e0171
Merge pull request #5754 from ffdixon/fix-5725
...
Fix #5725
2018-06-24 18:46:27 -04:00
Fred Dixon
baa2c5bd59
Fix #5725
2018-06-24 17:45:30 -05:00
Fred Dixon
da15f2fe2c
Merge pull request #5753 from ffdixon/bump-version
...
Bump version to RC1
2018-06-24 18:38:46 -04:00
Fred Dixon
d4cd5ae0c4
Bump version to RC1
2018-06-24 17:37:47 -05:00
Fred Dixon
ea5d1d5744
Merge pull request #5752 from ffdixon/bbb-conf-14
...
Fixed typo
2018-06-24 15:56:52 -04:00
Fred Dixon
95919448e3
Fixed typo
2018-06-24 14:56:09 -05:00
Fred Dixon
e8b640da1f
Merge pull request #5751 from ffdixon/bbb-conf-webhooks
...
Improve checking of webhooks and ffmpeg
2018-06-24 15:30:29 -04:00
Fred Dixon
9eb3da4970
Improve checking of webhooks and ffmpeg
2018-06-24 14:27:57 -05:00
Fred Dixon
8f79599f03
Merge pull request #5750 from ffdixon/fix-ht-slide-title
...
fix HT slide title
2018-06-24 14:11:29 -04:00
Fred Dixon
4c0b783497
fix HT slide title
2018-06-24 13:10:29 -05:00
Fred Dixon
24b47bcf07
Merge pull request #5749 from bigbluebutton/bbb-conf-13
...
Update bbb-conf
2018-06-23 08:59:50 -04:00
Fred Dixon
5a671d4d3d
Update bbb-conf
2018-06-23 08:58:37 -04:00
James Jung
733aa46c6b
Fix the problem partially hiding the post button when typing chat on iphone
2018-06-22 16:55:14 -04:00
Fred Dixon
fa37772ac1
Merge pull request #5747 from ffdixon/bbb-conf-13
...
One more step for upgrade ffmpeg
2018-06-22 16:35:37 -04:00
Fred Dixon
f934e98369
One more step for upgrade ffmpeg
2018-06-22 15:34:28 -05:00
Richard Alam
e2133a4273
Merge pull request #5738 from kepstin/bbb-20-rec-fixes
...
Merge BBB 2.0 recording fixes into 2.2 branch as well
2018-06-22 16:08:04 -04:00
Richard Alam
db5b60c73a
Merge pull request #5745 from kepstin/bbb-20-rec-fixes
...
RaP: Don't error on pencil drawings with 0 dataPoints
2018-06-22 16:07:30 -04:00
Richard Alam
837a44ee98
Merge pull request #5742 from ritzalam/fix-issue-5708
...
- display meeting is about to end warning to user and breakout warni…
2018-06-22 15:39:03 -04:00
Calvin Walton
3d78745dd4
RaP: Don't error on pencil drawings with 0 dataPoints
...
In some cases, we get DRAW_END events for pencil shapes from the
html5 client that have no dataPoints. The only thing we can really
do here is detect the issue and ignore the shape.
In some cases, this may result in the shape's intermediate drawing
updates being shown, but it'll disappear when the end event happens.
2018-06-22 15:33:30 -04:00
