Commit Graph

33243 Commits

Author SHA1 Message Date
Gustavo Trott
5fdacf93dd Merge remote-tracking branch 'upstream/v2.5.x-release' into disabledFeatures-breakoutRooms 2022-03-14 15:33:04 -03:00
Gustavo Trott
adc1c8cef8 Implements disabledFeatures=breakoutRooms 2022-03-14 15:30:41 -03:00
Anton Georgiev
1385f0f836
Merge pull request #14595 from bigbluebutton/revert-14594-tomcat-10
Revert "build and conf: Upgrade tomcat8 to 10 for bbb-demo"
2022-03-14 13:50:08 -04:00
Anton Georgiev
821adcdc8c
Revert "build and conf: Upgrade tomcat8 to 10 for bbb-demo" 2022-03-14 13:48:37 -04:00
Anton Georgiev
53493ba3ca
Merge pull request #14594 from antobinary/tomcat-10
build and conf: Upgrade tomcat8 to 10 for bbb-demo
2022-03-14 13:18:17 -04:00
Anton Georgiev
afc231c22b build and conf: tomcat10 for bbb-demo 2022-03-14 17:12:23 +00:00
Ramón Souza
31f5852d3b add settings.yml key for recording notification 2022-03-14 17:01:15 +00:00
Ramón Souza
8850f92f3a do not display modal header if it is not needed 2022-03-14 16:58:41 +00:00
Anton Georgiev
be80e57b15
Set release to 2.5-alpha-5 2022-03-14 12:51:09 -04:00
Ramón Souza
b4bf65ffe1 improve accessibility of notification modal 2022-03-14 16:48:17 +00:00
Ramón Souza
81d3a681e9 restore new recording indicator styles 2022-03-14 14:14:06 +00:00
Fred Dixon
3853d9f799
Merge pull request #14591 from bigbluebutton/ffdixon-reduce-volume
Reduce volume for mute/unmute sound
2022-03-14 10:11:28 -04:00
Fred Dixon
952037e4b5
Reduce volume for mute/unmute sound 2022-03-14 10:10:27 -04:00
Ramón Souza
e369d6c487 only display record notification if create param is set to true 2022-03-14 14:03:54 +00:00
Ramón Souza
e5a3bffb36 add notifyRecordingIsOn param to breakout rooms 2022-03-14 13:58:21 +00:00
Fred Dixon
8bfc8d8df7
Merge pull request #14589 from ffdixon/fix-fs-build
Add back lines to fetch sounds.tar.gz
2022-03-14 08:54:34 -04:00
Fred Dixon
a2797304d4 Add back lines to fetch sounds.tar.gz 2022-03-14 07:53:00 -05:00
Fred Dixon
b7546422fa
Merge pull request #14588 from ffdixon/update-freeswitch-sounds
replace muted/unmuted with sounds from senfcall.de (thanks)
2022-03-13 19:43:20 -03:00
Fred Dixon
3ff06be533 replace muted/unmuted with sounds from senfcall.de (thanks) 2022-03-13 17:40:13 -05:00
Fred Dixon
59330350bb
Merge pull request #14587 from ffdixon/optimize-freeswitch
Use default compiler optimizations for FreeSWITCH
2022-03-13 17:41:20 -03:00
Fred Dixon
a688f851af Use default compiler optimizations for FreeSWITCH 2022-03-13 15:39:42 -05:00
Anton Georgiev
ea7765e658
Merge pull request #14586 from antobinary/etherpad-deps
build: bbb-etherpad set npm to 6.14.11
2022-03-12 15:57:04 -05:00
Anton Georgiev
d20e276b58 build: bbb-etherpad set npm to 6.14.11 2022-03-12 20:53:17 +00:00
Daniel Petri Rocha
535c30b925 Set upload as current presentation 2022-03-12 13:15:02 +01:00
Anton Georgiev
0573624320
Merge pull request #14584 from antobinary/etherpad-deps
build: bbb-etherpad add logs; comment out #14583
2022-03-11 16:08:09 -05:00
Anton Georgiev
95ad4afc98 build: bbb-etherpad add logs; comment out #14583 2022-03-11 16:04:42 -05:00
Ramón Souza
35ae2a9e77 record notify modal 2022-03-11 20:26:26 +00:00
Anton Georgiev
7ed9adf622
Merge pull request #14583 from antobinary/etherpad-deps
?build: bbb-etherpad missing deps, hacky rm package.json
2022-03-11 14:04:05 -05:00
Anton Georgiev
fc071568c4 build: bbb-etherpad missing deps, hacky rm package.json 2022-03-11 18:45:01 +00:00
Ramón Souza
cc54f167f7 remove unused code 2022-03-11 17:16:39 +00:00
Gustavo Emanuel
f292476163 style with em instead px, remove subscriptions becouse already defined in other place 2022-03-11 17:11:35 +00:00
Gustavo Emanuel
f22b5052f1 ajust name 2022-03-11 17:11:19 +00:00
Ramón Souza
902899ba2c modal consent meeting can be recorded 2022-03-11 17:10:54 +00:00
Joao Victor
41237ae0a0 Fix notification not displaying 2022-03-11 11:57:43 -03:00
Joao Victor
30826dfdd8 Remove comment and unused import 2022-03-11 09:36:56 -03:00
Daniel Petri Rocha
5e28cada9e Limit button presses; only allow presenter to upload 2022-03-10 22:46:34 +01:00
Ramón Souza
d008981855 add notifyRecordingIsOn create param 2022-03-10 20:17:57 +00:00
Tainan Felipe
fbb0f23510
Merge branch 'v2.5.x-release' into wip-notifications 2022-03-10 16:42:43 -03:00
Tainan Felipe
8858878d0d Add server side notification 2022-03-10 16:33:25 -03:00
Joao Victor
a067e81cce Fix toast notification for 'Current presentation' 2022-03-10 16:08:26 -03:00
Gustavo Trott
a4c88e0578
better readability
Co-authored-by: Pedro Beschorner Marin <pedrobmarin@gmail.com>
2022-03-10 15:53:05 -03:00
Gustavo Trott
9f939513b0 Implements disabledFeatures=captions 2022-03-10 15:02:20 -03:00
prlanzarin
d9c329df27 refactor(fullaudio): remove server-provided RPC parameters 2022-03-10 14:59:43 -03:00
prlanzarin
b9f9043d9c feat(fullaudio): handle forceRelayOnFirefox flag 2022-03-10 14:31:42 -03:00
Joao Victor
e45c6e90e7 Fix close private chat button 2022-03-10 13:52:53 -03:00
Daniel Petri Rocha
dfa8f42e94 Use fetch instead of Axios; include cookie for export 2022-03-10 16:50:32 +01:00
Paulo Lanzarin
f64d607b13
Merge pull request #14505 from pedrobmarin/f-v-amccc
feat(video): add meeting camera cap control
2022-03-10 12:42:24 -03:00
Pedro Beschorner Marin
5cd2b0b635 Merge remote-tracking branch 'bigbluebutton/v2.5.x-release' into f-v-amccc 2022-03-10 12:25:17 -03:00
Anton Georgiev
22e94b3b8e
Merge pull request #14575 from ramonlsouza/merge-24-25-mar09
chore: Merge 2.4 into 2.5
2022-03-10 09:55:39 -05:00
Ramón Souza
ce9fef4cd0 resolve build file conflict 2022-03-10 14:25:38 +00:00