BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,495 Commits 13 Branches 260 Tags 1.1 GiB
607e2decad
Commit Graph

19495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksandr Zhurbenko
607e2decad Removed a comment 2018-02-08 08:42:32 -08: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
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
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
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
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
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
Ghazi Triki
26aa84c4cc Replace remnant spark labels by mx label and text. 2018-02-01 11:17:34 +01:00
Ghazi Triki
47cd5309b0 Show "Viewers Locked" when webcamsOnlyForModerator is on. 2018-02-01 10:26:09 +01:00
Fred Dixon
c0f0303051
Merge pull request #4027 from hakaz/patch-1 
Issue #3985: bbb-conf --debug incorrectly flags
 2018-01-31 20:08:08 -05:00
Fred Dixon
7617828770
Merge pull request #5064 from riadvice/microphone-highlight 
Highlight microphone icon in users list when microphone is locked
 2018-01-31 20:03:53 -05:00
Fred Dixon
af9d70896e
Merge pull request #5071 from ffdixon/fix-bbb-conf-4 
Fix bbb-conf to correctly use rtmp[s] with porttest
 2018-01-31 17:37:48 -05:00
Fred Dixon
1a6b5b1aac Fix bbb-conf to correctly use rtmp[s] with porttest 2018-01-31 16:36:48 -06:00
Richard Alam
40b3c6aff8
Merge pull request #5069 from ritzalam/backport-rtmps-support-to-2.0 
Backport rtmps support to 2.0
 2018-01-31 16:43:36 -05:00