Commit Graph

19745 Commits

Author SHA1 Message Date
Anton Georgiev
417acf4d9d
Merge pull request #5125 from prlanzarin/screenshare-fps-ext-prompt
Limited screensharing FPS to 5-10, resolution to screen size and fixed chrome extension prompt
2018-02-12 10:39:48 -05:00
Fred Dixon
c201cd99c2
Merge pull request #5133 from ffdixon/fix-bbb-conf-2
Fix bbb conf 2
2018-02-11 12:26:59 -06:00
Fred Dixon
098c7b8a20 Make moderator role default for HTML5 demo 2018-02-11 12:16:28 -06:00
Fred Dixon
6a237f86dd Fixed error restarting bbb-transcode-akka 2018-02-11 12:15:19 -06:00
Richard Alam
565bce12e7
Merge pull request #5122 from riadvice/config-xml-encoding
Force reading config.xml in utf-8 format
2018-02-09 16:40:13 -05:00
Anton Georgiev
32abdc8344
Merge pull request #5102 from MaximKhlobystov/handle-reconnected-voice-users
[HTML5 Client] Adjustments in handling of reconnected voice users
2018-02-09 14:50:32 -05:00
Lucas Fialho Zawacki
333bba0a77 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into settings-lock-video-dock 2018-02-09 19:33:55 +00:00
Anton Georgiev
4c8970abe6
Merge pull request #5108 from KDSBrowne/z.0.8-settings-userlist-bug
Prevent error on settings change with userlist open
2018-02-09 11:56:58 -05:00
Anton Georgiev
6db4a91846
Merge pull request #5116 from MaximKhlobystov/attendee-mute-from-userlist
[HTML5 Client] Self mute/unmute from userlist for attendees.
2018-02-09 10:09:37 -05:00
Anton Georgiev
5dd704dc95
Merge pull request #5115 from OZhurbenko/fix-meteor-exceptions
Fixed exceptions thrown during meeting destruction and presenter assignment
2018-02-09 10:09:09 -05:00
prlanzarin
750d537618 Updated bbb-web apiVersion to 2.0 2018-02-09 03:22:11 +00:00
prlanzarin
81afe84079 Limiting screensharing FPS to 5-10 and resolution to screen size
Also fixes the extension prompt for chrome users in the HTML5 client
2018-02-08 22:53:18 +00:00
Ghazi Triki
b848beb04a Force reading config.xml in utf-8 format. 2018-02-08 20:19:07 +01:00
Maxim Khlobystov
7968a55bf3 Simplified the toggleSelfVoice code. 2018-02-08 14:00:29 -05:00
Fred Dixon
8cda909783
Merge pull request #5118 from ffdixon/update-bbb-conf-8
Updates to bbb-conf to support HTML5
2018-02-08 12:28:07 -05:00
Fred Dixon
dea8addc9b Updates to bbb-conf to support HTML5 2018-02-08 11:26:31 -06:00
Augusto Bennemann
65bf18e6ca Fix typo 2018-02-08 16:49:02 +00:00
Oleksandr Zhurbenko
607e2decad Removed a comment 2018-02-08 08:42:32 -08:00
Augusto Bennemann
95c172a8f0 Videodock adjusts for screenshare 2018-02-08 16:32:12 +00:00
Maxim Khlobystov
483f543f17 Made sure non-moderators can user userlist for mute/unmute. 2018-02-08 11:06:41 -05:00
KDSBrowne
ff78e14835 switch indexOf() with includes() 2018-02-08 07:14:00 -08:00
Augusto Bennemann
d5cda55220 Improve video adjusting code 2018-02-08 12:52:29 -02:00
Lucas Fialho Zawacki
23b635b4ff Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into settings-lock-video-dock 2018-02-08 14:48:33 +00:00
Oleksandr Zhurbenko
894e2b94f2 Fixed exceptions thrown on PresenterAssignedEvtMsg event 2018-02-07 15:10:15 -08:00
Oleksandr Zhurbenko
dddc388a10 Fixed an exception thrown on meeting destruction 2018-02-07 14:57:34 -08:00
Anton Georgiev
22b1d5662a
Merge pull request #5114 from bigbluebutton/revert-5110-update-bbb-conf-7
Revert "Give mongod a moment to startup before bbb-html5"
2018-02-07 16:59:49 -05:00
Anton Georgiev
710cca2d8e
Revert "Give mongod a moment to startup before bbb-html5" 2018-02-07 16:57:48 -05:00
Chad Pilkey
c1fbb22c79
Merge pull request #5106 from antobinary/redirect-mobile-to-html5
Redirect Android, iOS users to html5 except on Puffin browser
2018-02-07 16:13:57 -05:00
Augusto Bennemann
323cdd3232 Fix camera button style and improve videodock code 2018-02-07 17:20:10 -02:00
Lucas Fialho Zawacki
30b26a0a0c Unshare webcam and dispose peers when video component is unmounted 2018-02-07 18:06:58 +00:00
Augusto Bennemann
b0b16498fb Fixes #5056 2018-02-07 14:57:09 -02:00
Fred Dixon
1002c2d871
Merge pull request #5110 from ffdixon/update-bbb-conf-7
Give mongod a moment to startup before bbb-html5
2018-02-07 11:25:48 -05:00
Augusto Bennemann
c38a6e34ae Fix error introduced on last merge 2018-02-07 13:24:20 -02:00
Augusto Bennemann
326325fddb trigger on orientation change 2018-02-07 13:12:07 -02:00
Augusto Bennemann
541b06393c Video positioning. Code still bad. 2018-02-07 13:11:52 -02:00
Augusto Bennemann
db7bd9e9b6 Display usernames on videos 2018-02-07 13:07:38 -02:00
Lucas Fialho Zawacki
3af600d015 User video tags with new design [part 1] 2018-02-07 12:56:07 -02:00
Augusto Bennemann
1d5bfce167 Fix share/unshare video button style and remove old files 2018-02-07 12:51:40 -02:00
Fred Dixon
11866c336e Give mongod a moment to startup before bbb-html5 2018-02-06 19:05:07 -06:00
Anton Georgiev
cf42513f2b redirect Android, iOS to html5 except on Puffin browser 2018-02-06 18:25:44 -05:00
KDSBrowne
d7b9e4dce9 close userlist before settings are saved 2018-02-06 12:06:52 -08:00
Fred Dixon
fa4c4e06af
Merge pull request #5104 from ffdixon/update-local-5
Remove 1935 from firewall message
2018-02-06 14:51:26 -05:00
Fred Dixon
f311422069 Remove 1935 from firewall message 2018-02-06 13:50:43 -06:00
Fred Dixon
583f16280a
Merge pull request #5096 from riadvice/2.0-ui-fixes
Show record button for all users
2018-02-06 14:31:26 -05:00
Anton Georgiev
d71bae2ded
Merge pull request #5088 from Tainan404/fix-button-disabled
Fix when button is disabled cursor does not appear not-allowed.
2018-02-06 13:07:09 -05:00
Anton Georgiev
649d045609
Merge pull request #5094 from antobinary/blank-video
Adjusted the source for recording meeting status
2018-02-06 13:05:20 -05:00
Anton Georgiev
5195bc8a96
Merge pull request #5055 from Tainan404/lock-settings
Merging this but some edge cases will be addressed in an upcoming PR
2018-02-06 11:25:04 -05:00
Maxim Khlobystov
82a40e4d9a Handle voice users message to update the voice states properly on reconnect. 2018-02-06 11:23:51 -05:00
Tainan Felipe Pauli de Almeida
38e3ce3013 Merge remote-tracking branch 'upstream/v2.0.x-release' into lock-settings 2018-02-06 13:21:22 -02:00
Joao Siebel
eddc480851 Implement screenshare data saving setting. Fix #5029 2018-02-06 11:33:48 -02:00