Fred Dixon
9b973c331f
Merge pull request #11077 from hiroshisuga/bug-shortcutwindow
...
Adding ID to debug window shortcut translation
2020-12-28 22:37:30 -04:00
Fred Dixon
40dc4ffb8b
Merge pull request #11085 from bigbluebutton/ffdixon-patch-2
...
Update bigbluebutton-release
2020-12-28 06:54:44 -05:00
Fred Dixon
22b9c684ab
Update bigbluebutton-release
2020-12-28 07:45:09 -04:00
Fred Dixon
1a4dd87f7f
Merge pull request #11080 from hiroshisuga/patch-12
...
enabling copy-pasting in the chat window on 2.3a3
2020-12-27 08:04:33 -05:00
hiroshisuga
3c0a35706c
Update styles.scss
2020-12-27 15:10:32 +09:00
hiroshisuga
4e4d3beb10
Update component.jsx
2020-12-27 10:36:01 +09:00
hiroshisuga
90ea3f845b
Update en.json
2020-12-27 09:58:44 +09:00
hiroshisuga
d30a9bba47
Update component.jsx
2020-12-27 09:55:32 +09:00
hiroshisuga
3dc0aa83f2
Update component.jsx
2020-12-27 00:01:54 +09:00
Fred Dixon
0677cf33a3
Merge pull request #11061 from fcecagno/new-playback
...
Support for bbb-playback
2020-12-20 19:58:59 -05:00
Felipe Cecagno
47af1a391b
publish presentation format to use the new bbb-playback; redirect 2.0 to 2.3 by default
2020-12-20 21:43:54 -03:00
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
