Commit Graph

32910 Commits

Author SHA1 Message Date
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
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
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
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
Anton Georgiev
1b949a7d5c
Update bigbluebutton-html5/public/locales/en.json 2022-03-09 13:48:12 -05:00
Anton Georgiev
465c99daca
Merge pull request #14569 from antobinary/2-4-5
chore: Pulled the latest 2.4 HTML5 locales from Transifex
2022-03-09 12:55:20 -05:00
Localization Server
fca15ad8e3 chore: Pulled the latest 2.4 HTML5 locales from Transifex 2022-03-09 17:51:39 +00:00
Anton Georgiev
d4abf2f080
Merge pull request #14561 from riadvice/lti-images-fail-safe
Fix displaying thumbnails if not existing for LTI.
2022-03-09 12:26:05 -05:00
Anton Georgiev
d737ad59b0
Merge pull request #14541 from gustavotrott/fix-breakout-user-remove
fix: Users not being ejected from breakout rooms (only from main room)
2022-03-09 09:57:17 -05:00
Anton Georgiev
35634420cd
Merge pull request #14565 from JoVictorNunes/chore-fix-npm-dependencies
chore(Dashboard): fix npm dependencies
2022-03-09 09:54:18 -05:00
Anton Georgiev
a7a187133a
Merge pull request #14567 from frankemax/eth-icons-overlapping
fix(etherpad): avoid icons overlapping
2022-03-09 09:52:51 -05:00
Anton Georgiev
207c26f0a6
Merge pull request #14566 from gustavotrott/disabledFeatures-chat
feat: Support to disable chat via disabledFeatures
2022-03-09 09:52:03 -05:00
Anton Georgiev
338b595d07
Merge pull request #14564 from gustavotrott/disabledFeatures-externalVideo
feat: Support to disable external videos via disabledFeatures
2022-03-09 09:35:15 -05:00
Joao Victor
f1807b38d8 Run npm audit fix 2022-03-09 11:33:39 -03:00
Max Franke
36e3db4625 fix(etherpad): avoid icons overlapping 2022-03-09 11:29:34 -03:00
Gustavo Trott
057b7514b1 Implements disabledFeatures-chat 2022-03-09 11:19:25 -03:00
Gustavo Trott
2719bd4f65 Implements disabledFeatures=externalVideos 2022-03-09 10:33:18 -03:00
Anton Georgiev
4f73272477
Merge pull request #14560 from gustavotrott/disabledFeatures-polls
feat: Support to disable polls via disabledFeatures
2022-03-08 14:52:31 -05:00
Ghazi Triki
f580e1a146 Fix displaying thumbnails if not existing for LTI. 2022-03-08 19:17:04 +01:00
Gustavo Trott
6f24d36ed1 Remove unecessary import 2022-03-08 15:08:35 -03:00
Gustavo Trott
3013c2792b Implements disabledFeatures/polls 2022-03-08 15:05:24 -03:00
Paulo Lanzarin
5febb285bf
Merge pull request #14559 from bigbluebutton/sfu2610
build: bump bbb-webrtc-sfu to v2.6.10
2022-03-08 14:54:48 -03:00
Paulo Lanzarin
2193c99d8d
build: bump bbb-webrtc-sfu to v2.6.10 2022-03-08 14:46:34 -03:00
Anton Georgiev
9cd7eccf63
Merge pull request #14558 from ramonlsouza/issue-14552
fix: Video warning keeps showing after hiding presentation/external video
2022-03-08 12:18:03 -05:00
Ramón Souza
38d804da37 do not display external video message when it is minimized 2022-03-08 17:10:26 +00:00
Anton Georgiev
a45e6c75a9
Merge pull request #14550 from pedrobmarin/b-e-v1-8-17
build(etherpad): v1.8.17
2022-03-08 10:10:26 -05:00
Anton Georgiev
c0bcecee95
Merge pull request #14551 from ramonlsouza/issue-14376
Change presentation placeholder message and behavior
2022-03-07 15:31:46 -05:00
Ramón Souza
9ec9bfc790 do not display presentation placeholder in smart layout 2022-03-07 20:21:58 +00:00
Pedro Beschorner Marin
93767d19fe build(etherpad): v1.8.17
Update Etherpad version and settings file.
2022-03-07 17:16:52 -03:00
Anton Georgiev
d19a5f0f3d
Set release to 2.5-alpha-4 2022-03-07 14:53:59 -05:00
Anton Georgiev
4def5a58ed
Merge pull request #14547 from gustavotrott/fix-end-session-dashboardEnabled
fix: meeting crashing when trying to end
2022-03-07 13:48:33 -05:00
Gustavo Trott
b6df87618c Fix isDashboardEnabled problem on end meeting 2022-03-07 15:40:05 -03:00
Ramón Souza
b734039965 change no presentation placeholder message 2022-03-07 18:34:07 +00:00
Anton Georgiev
94d6a648e2
Merge pull request #14546 from gustavotrott/groups-param-roster-format
refactor: simplify groups json format
2022-03-07 13:22:41 -05:00
Anton Georgiev
06708a2dbb
Merge pull request #14543 from ramonlsouza/issue-9887
Add breakout-room duration to sidebar
2022-03-07 13:16:53 -05:00
Anton Georgiev
a755a0173e
Merge pull request #14544 from antobinary/nginx-cleanup-1
build: packages cleanup
2022-03-07 13:15:38 -05:00
Gustavo Trott
a4f4f24160 Convert groups roster to array of strings instead of array of objects 2022-03-07 15:08:00 -03:00
Ramón Souza
23c42fedaf add breakouts duration to sidebar 2022-03-07 16:29:40 +00:00