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

33036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
9e6c078703 build: use tomcat9 not tomcat10 2022-03-14 20:38:31 +00:00
Anton Georgiev
c2ee473f7c must revert! build: temp drop bbb-webrtc-sfu as a dependency 2022-03-14 20:04:36 +00:00
Gustavo Trott
c770d3ccdd Allow API param override config bbb.properties 2022-03-14 16:46:11 -03:00
Anton Georgiev
20bff96cbf must revert! build: temp drop yq as a dependency 2022-03-14 19:39:11 +00:00
Guilherme Leme
882c1e6cf6 [issue-14243] - changes in review. 2022-03-14 16:23:27 -03:00
Guilherme Leme
b080e889f6 Merge remote-tracking branch 'upstream/v2.5.x-release' into issue-14243 2022-03-14 16:05:44 -03:00
Anton Georgiev
3de540f0ab build: swap bionic with focal 2022-03-14 19:04:23 +00:00
Anton Georgiev
941c265252 build: changed docker image to v2022-03-14-bbb-25 2022-03-14 18:54:44 +00:00
Anton Georgiev
7147045a82 build: renamed opts-bionic to -focal 2022-03-14 18:53:35 +00:00
Gustavo Trott
c6bfb4b7ec fix error 2022-03-14 15:35:00 -03:00
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
Anton Georgiev
be80e57b15
Set release to 2.5-alpha-5 2022-03-14 12:51:09 -04: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
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
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
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
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
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
Ramón Souza
0881b3bf1b restore package.json + package-lock.json 2022-03-10 13:47:59 +00:00
Ramón Souza
ff36acf4ca
Merge pull request #4 from gustavotrott/merge-24-25-mar09 
Fix merge conflicts on Akka
 2022-03-10 13:20:43 +00:00
Gustavo Trott
901c990ce4 Fix merge conflicts on Akka 2022-03-10 10:11:14 -03:00
Gustavo Trott
ad95126912 Fix breaking closeCaption on disabling sharedNotes 2022-03-10 08:56:12 -03:00
Anton Georgiev
6ce903a2fb !!!build: FS - drop Marios patch TEMP TEMP 2022-03-10 02:24:50 +00:00
Anton Georgiev
4c7b780d25 build: tomcat8->10 for bbb-demo 2022-03-10 02:09:38 +00:00
Gustavo Trott
bedaf4de98 Add support for deprecated API param learningDashboardEnabled 2022-03-09 18:04:34 -03:00
Ramón Souza
ae5e116e16 Merge remote-tracking branch 'upstream/v2.4.x-release' into merge-24-25-mar09 2022-03-09 20:40:07 +00:00
Gustavo Trott
537704ef0e Implements disabledFeatures=sharedNotes 2022-03-09 16:23:38 -03:00
Anton Georgiev
506468e4b7
Merge pull request #14495 from gustavo-em/mobile_translations 
feat: translations to mobile app
 2022-03-09 13:48:39 -05:00
Anton Georgiev
e874d2ed9f
Update bigbluebutton-html5/public/locales/en.json 2022-03-09 13:48:22 -05:00