Commit Graph

19554 Commits

Author SHA1 Message Date
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
Tainan Felipe Pauli de Almeida
bc2da51bfb Comply lock setting 'Hide other viewer's webcams' 2018-02-06 09:43:14 -02:00
Anton Georgiev
d712043673
Merge pull request #5097 from OZhurbenko/fix-logging-trace
Fixed the logging of the Meteor server-side methods
2018-02-05 16:18:44 -05:00
Oleksandr Zhurbenko
6e1102999d Turned on logging for the production 2018-02-05 12:39:08 -08:00
Oleksandr Zhurbenko
e1568baa24 Fixed the logging of the Meteor serser-side methods 2018-02-05 12:34:03 -08:00
Ghazi Triki
9067baf215 Show record button for all users. 2018-02-05 20:19:49 +01:00
Anton Georgiev
d5837f46ee adjust source for recording meeting status 2018-02-05 13:34:03 -05:00
Fred Dixon
b1ba37b46d
Merge pull request #5090 from ffdixon/fix-bbb-conf-5
Remove duplicate update for links in config.xml
2018-02-03 11:10:15 -05:00
Fred Dixon
a8a98e9974 Remove duplicate update for links in config.xml 2018-02-03 11:09:31 -05:00
Fred Dixon
a8c54c477f
Merge pull request #5089 from ffdixon/fix-chromeExtensionLink
Fix chrome extension link
2018-02-03 10:40:14 -05:00
Fred Dixon
c7782aa0a1 Update copyright to 2018 2018-02-03 10:39:25 -05:00
Fred Dixon
2380a3db2c Perserve value for chromeExtensionLink 2018-02-03 10:39:12 -05:00
Anton Georgiev
c65e7c15c3
Merge pull request #5081 from lfzawacki/video-shouldupdatecomponent-bbb
Video share button timeout and re-written shouldComponentUpdate method
2018-02-02 11:03:14 -05:00
Tainan Felipe Pauli de Almeida
eb4ed2e4bd fix button disable don't appear with cursor not-allowed 2018-02-02 09:51:21 -02:00
Lucas Fialho Zawacki
829930f131 Remove logging and some comments to shouldUpdateComponent 2018-02-01 18:02:33 +00:00
Lucas Fialho Zawacki
4dce4676cb Wait a while before closing streams if media stops flowing on bbb-webrtc-sfu 2018-02-01 18:02:22 +00:00
Lucas Fialho Zawacki
c36f322fff Better handling of shared video timeout in html5 2018-02-01 18:02:04 +00:00
Lucas Fialho Zawacki
8be4fd6ef4 Better way to handle shouldComponentUpdate callback on HTML5 video
This commit matches userIds on the old/new userlist when the react component
updates and does not assume the lists are ordered. It also prevents things
from getting funky when a user leaves or joins the list
2018-02-01 18:01:56 +00:00
Lucas Fialho Zawacki
a1e7833fa3 Better video reconnect when network is offline 2018-02-01 18:01:42 +00:00
Lucas Fialho Zawacki
55feaa30af Timeout cameras that have not started 2018-02-01 18:01:28 +00:00
Richard Alam
784d5cb6d9
Merge pull request #5080 from ritzalam/logos-folder
- put logos into its own directory
2018-02-01 11:49:16 -05:00
Richard Alam
5a5232d43d - put logos into its own directory 2018-02-01 08:47:36 -08:00
Richard Alam
1b8d0a06c1 Merge branch 'riadvice-moderator-message-ui' into v2.0.x-release 2018-02-01 08:26:28 -08:00
Richard Alam
6f7669c390 Merge branch 'moderator-message-ui' of https://github.com/riadvice/bigbluebutton into riadvice-moderator-message-ui 2018-02-01 08:26:15 -08:00
Richard Alam
9e62dfb979 Merge branch 'riadvice-2.0-updates' into v2.0.x-release 2018-02-01 08:00:21 -08:00
Richard Alam
d58f1ec5e7 Merge branch '2.0-updates' of https://github.com/riadvice/bigbluebutton into riadvice-2.0-updates 2018-02-01 07:40:27 -08:00
Fred Dixon
feff36a352
Merge pull request #5076 from riadvice/remove-spark
Replace remnant spark labels by mx label and text
2018-02-01 09:03:29 -05:00
Fred Dixon
4d9138300a
Merge pull request #5075 from riadvice/2.0-ui-fixes
Show "Viewers Locked" when webcamsOnlyForModerator is on
2018-02-01 09:03:07 -05:00
Tainan Felipe Pauli de Almeida
fd9dfbf89b fix more linter errors 2018-02-01 09:31:17 -02:00
Tainan Felipe Pauli de Almeida
1bdf08b260 lock logic passed to the parent 2018-02-01 09:09:33 -02:00
Ghazi Triki
26aa84c4cc Replace remnant spark labels by mx label and text. 2018-02-01 11:17:34 +01:00