BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,076 Commits 13 Branches 260 Tags 1.1 GiB
dfc375180c
Commit Graph

28076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Dixon
dfc375180c
Merge pull request #11060 from bigbluebutton/ffdixon-patch-1 
Update events_worker.rb
 2020-12-20 17:39:16 -05:00
Fred Dixon
e08ff14c52
Update events_worker.rb 
Fix file existence test.
 2020-12-20 18:38:18 -04:00
Fred Dixon
7594121664
Merge pull request #11049 from ffdixon/minor-updates-bbb-conf 
Restart tomcat8
 2020-12-18 20:49:45 -04:00
Fred Dixon
ed56de9567 Restart tomcat8 2020-12-18 18:47:59 -06:00
Anton Georgiev
2dc9ed6c74
Merge pull request #11048 from bigbluebutton/antobinary-patch-1 
Recover 2.3-alpha3 version of bbb-conf
 2020-12-18 18:40:11 -05:00
Anton Georgiev
278223b4e0
Recover 2.3-alpha3 version of bbb-conf 
Most of the changes date back to #10700 
We were trying to trace down a problematic change likely when merging 2.2.31 into 2.3 ( #11033 )
If anyone spots issues with bbb-conf on their 2.3 server, please comment
 2020-12-18 18:38:46 -05:00
Fred Dixon
17c5ea9aed Fixup bbb-conf for 2.3-alpha3 2020-12-18 16:41:08 -06:00
Anton Georgiev
882a941632
Merge pull request #11046 from antobinary/fixes-alpha-3 
settings.yml media configs incorrectly placed under "stats"
 2020-12-18 12:58:19 -05:00
Anton Georgiev
2a825c8aaa settings.yml media configs incorrectly placed under "stats" 2020-12-18 17:55:44 +00:00
Anton Georgiev
f3213696db
Merge pull request #11045 from antobinary/fixes-alpha-3 
Pulled HTML5 locales on 2.3, Dec 18, 2020
 2020-12-18 12:02:50 -05:00
Anton Georgiev
646dd583e3 add Kazakh and Mongol 2020-12-18 16:54:27 +00:00
Anton Georgiev
438deeff6a Pulled HTML5 locales on 2.3, Dec 18, 2020 2020-12-18 16:41:10 +00:00
Anton Georgiev
5a7bc3c3ef
Merge pull request #11044 from antobinary/fixes-alpha-3 
Handle ejected presenter case, add missing videoDock locales
 2020-12-18 11:08:05 -05:00
Anton Georgiev
2bbd345782 add missing videoDock locale strings 2020-12-18 16:00:05 +00:00
Anton Georgiev
998eea6ec4
Changed a few more http links to https 2020-12-18 10:53:51 -05:00
Anton Georgiev
2cab73f498
Merge pull request #11043 from Dennis1993/patch-1 
Update URL to HTTPS
 2020-12-18 10:48:57 -05:00
Dennis1993
ef4e871638
Update URL to HTTPS 
Change http:// to https://
 2020-12-18 16:45:18 +01:00
Anton Georgiev
4f14086f72 set default value for isPresenter in case user removed 2020-12-18 15:37:45 +00:00
Anton Georgiev
2d6565d4f9
Merge pull request #11033 from antobinary/merge-31 
Merge 2.2.31 into 2.3
 2020-12-18 09:58:09 -05:00
Anton Georgiev
fc93b5a91c correctly add chat message without flattening 2020-12-17 22:02:38 +00:00
Anton Georgiev
c1ffced27d Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into develop 2020-12-17 21:14:29 +00:00
Anton Georgiev
d77666c2e4
Merge pull request #11032 from hiroshisuga/patch-9 
secure http in application.conf
 2020-12-17 09:58:18 -05:00
hiroshisuga
7f5352e2f9
Update application.conf 2020-12-17 23:13:32 +09:00
Anton Georgiev
1451071668
Merge pull request #11028 from antobinary/bbb-web-prep 
Change bigbluebutton.properties client url param to defaultHTML5ClientUrl
 2020-12-16 10:54:28 -05:00
Anton Georgiev
55fe528e35 Change bigbluebutton.properties client url param 2020-12-16 15:49:20 +00:00
Anton Georgiev
65f2d5ba83
Merge pull request #11008 from antobinary/bbb-web-prep 
bbb-web to loadbalance bbb-html5 instances
 2020-12-15 17:08:25 -05:00
Anton Georgiev
99ff801d34 remove obsolete callback from user remove 2020-12-15 22:04:26 +00:00
Anton Georgiev
1880c0b5db
Merge pull request #11024 from jfsiebel/generate-heapdump-file 
Add option to generate heap file and tweak metrics
 2020-12-15 14:47:15 -05:00
Anton Georgiev
2bf6758f31
Enable customHeartbeat by default 
https://github.com/bigbluebutton/bigbluebutton/pull/10826
 2020-12-15 14:46:38 -05:00
Joao Siebel
3ad269c24c Check if metrics are enabled 2020-12-15 16:20:32 -03:00
Joao Siebel
c5b8f30f5d Add option to generate heapdump file and improve metrics 2020-12-15 13:10:39 -03:00
Anton Georgiev
8b65f9e15b Set bbb-html5 loadbalancing to be round robin 2020-12-15 01:55:57 +00:00
Fred Dixon
c8f23fe34b
Merge pull request #11011 from ffdixon/fix-dangling-if 
Fix dangling fi
 2020-12-12 17:51:01 -04:00
Fred Dixon
1105e85456 Removed extra fi 2020-12-12 15:49:26 -06:00
Fred Dixon
c99834f187 Echo STUN server if enabled 2020-12-12 15:35:14 -06:00
Fred Dixon
00f6ca2282
Merge pull request #11010 from ffdixon/shorten-sounds 
Provide shorter audio prompts for muted/unmuted
 2020-12-12 13:19:30 -04:00
Fred Dixon
053eba27b0 Provide shorter audio prompts for muted/unmuted 2020-12-12 11:15:14 -06:00
Anton Georgiev
9239d515a5 dispatch whiteboard events to html5 redis channel only 2020-12-12 01:45:38 +00:00
Anton Georgiev
09ca742e01 cleanup 2020-12-11 23:46:01 +00:00
Anton Georgiev
0be8773e4c Loadbalance bbb-html5 in bbb-web based on CPU 2020-12-11 21:36:06 +00:00
Anton Georgiev
9a04087c12
Merge pull request #11006 from mariogasparoni/v2.2.x-release 
Add keep alive message to audio's websocket
 2020-12-11 10:41:33 -05:00
Anton Georgiev
d99321836e
Merge pull request #11005 from jfsiebel/stop-typing-log-error 
Prevent calling stopUserTyping when parameters are undefined
 2020-12-11 09:42:10 -05:00
Joao Siebel
b07b200a2f Prevent calling function when parameters are undefined 2020-12-11 11:24:03 -03:00
Mario Jr
6113113af9 Add option to disable traceSip logs 
Audio client logs already cover audio session progress the way we need.
This avoids keepAlive and other unnecessary messages to be logged in browser's console.
If setting is not present, default value is set to false.
 2020-12-11 00:31:10 -03:00
Mario Jr
c65fa2b350 Add keep alive message to audio's websocket 
This was added as an option (websocketKeepAliveInterval), which is the interval to send keep alive messages.
Setting websocketKeepAliveInterval to 0 disables the keep alive, producing the same old behavior.
This helps avoid websocket disconnection due to socket inactivity, preventing it to unnecessarily reconnect.
Also, sometimes reconnect fails and error 1005 is triggered.
Fixes problems reported in #10985.
Also reduces occurrences of error 1005.
 2020-12-10 23:48:01 -03:00
Fred Dixon
3424c5b7c9
Merge pull request #10900 from wmchris/develop 
The first element of "hostname -I" is not intended to receive the primary IP address in bbb-conf
 2020-12-10 20:51:17 -04:00
Jesus Federico
163d40652a
Update post_events_analytics_callback.rb 2020-12-10 17:23:01 -05:00
Anton Georgiev
f7e17cb1e7
Merge pull request #10999 from lonesomewalker/patch-1 
fix typo in apply-lib.sh
 2020-12-10 12:45:56 -05:00
Anton Georgiev
33f5a854e1
Merge pull request #10998 from jfsiebel/improve-redis-metrics 
Add processing time metrics
 2020-12-10 12:42:23 -05:00
Joao Siebel
ec2cb2dbde Chek for queueMetrics 2020-12-10 14:07:46 -03:00