Commit Graph

629 Commits

Author SHA1 Message Date
Gustavo Trott
5681e88c60 Merge 2.7 into Develop 2023-06-26 17:21:01 -03:00
Anton Georgiev
43b96b47c4
Merge pull request #17724 from lfzawacki/v2.7.x-release
feat: Implement automatic closed captions using an open transcription server
2023-06-22 05:25:14 -04:00
Anton Georgiev
116209887c captions writer modal tweak 2023-06-22 04:28:13 -04:00
Anton Georgiev
72ea26b931 captions writer modal tweak 2023-06-22 04:27:44 -04:00
Anton Georgiev
a962a44c74 Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into june14merge 2023-06-14 10:07:54 -04:00
Anton Georgiev
ddca65cb43
enable-french-cc 2023-06-13 09:00:01 -04:00
Gustavo Trott
22a2c8ce7c Merge remote-tracking branch 'upstream/v2.7.x-release' into graphql-timer 2023-06-12 10:06:22 -03:00
Anton Georgiev
540ebe4bf9
chore: Enable Timer by default 2023-06-08 20:20:37 -04:00
Anton Georgiev
c8b0437df3
Merge pull request #18133 from GuiLeme/port-timer-with-events-suggestions
feat(timer): Port timer (Mconf) with events suggestions
2023-06-08 15:56:10 -04:00
Ramón Souza
f72f84106a
Merge pull request #18106 from hiroshisuga/dev2.6_pointerSize
feat(config): Configurable presentation pointer size
2023-06-08 09:19:27 -03:00
hiroshisuga
99919edb33
default pointer size 10 -> 5 2023-06-08 08:25:24 +09:00
hiroshisuga
97f660e268
Update settings.yml 2023-06-07 22:47:34 +09:00
Ramón Souza
d31e56b3fd rename parameter, fix props 2023-06-07 09:35:56 -03:00
Anton Georgiev
831a46afc4 Update bigbluebutton-html5/private/config/settings.yml 2023-06-07 09:06:40 -03:00
Samuel Weirich
db1c76b89b Add allow snapshot to config file 2023-06-07 09:03:00 -03:00
Anton Georgiev
2abe115e04 Merge branch 'v2.7.x-release' of github.com:bigbluebutton/bigbluebutton into june1merge 2023-06-01 10:11:59 -04:00
Anton Georgiev
cda09e2c17
chore: Add inline comments on how the reactions options configs work 2023-05-31 11:39:22 -04:00
Anton Georgiev
bde9864a9e
chore: Enable ReactionsBar by default 2023-05-31 11:24:45 -04:00
Gustavo Trott
2f68313df0 Merge remote-tracking branch 'upstream/v2.7.x-release' into develop 2023-05-30 08:43:14 -03:00
Anton Georgiev
80a46d5ab3
chore: Enable by default Camera as content 2023-05-26 11:28:40 -04:00
Gustavo Trott
51bdcededc Merge 2.7 into develop 2023-05-26 10:50:39 -03:00
Paulo Lanzarin
5447666c15
Merge branch 'v2.7.x-release' into port-timer 2023-05-26 10:33:38 -03:00
Paulo Lanzarin
171c7a6587
Merge branch 'v2.7.x-release' into v2.7.x-release 2023-05-26 09:27:14 -03:00
Anton Georgiev
4948731fe7
Merge pull request #17764 from lfzawacki/reactions-port
feat: Port Mconf Reactions into BBB 2.7
2023-05-26 08:05:02 -04:00
Anton Georgiev
1a1f442d5a
Merge pull request #17746 from Carloshsc/port-present-webcam-27
feat(camera as content): present webcam
2023-05-26 08:01:40 -04:00
prlanzarin
7c77fc7433 Merge remote-tracking branch 'origin/v2.7.x-release' into reactions-port 2023-05-25 19:54:01 -03:00
Arthurk12
33878f6224 fix(timer): tab title indicator flag
Adds a flag to the settings.yml file to enable and disable the timer
indicator in the tab title.
2023-05-18 15:29:43 -03:00
Lucas Zawacki
545f486c29 fix(timer): New songs for timer 2023-05-18 15:29:41 -03:00
Arthurk12
f5a5a960ba feat(timer): adds more songs
Adds 2 more songs to the timer, which can be switched using the radio
buttons inside timer panel.
Changed the music loop logic to make it gapless.
2023-05-18 15:29:35 -03:00
Arthur B. Grossi
cc61652aa3 feat(timer): ambient music
Adds a music player for ambient sound which can be turned on and off using a
toggle located inside timer panel. When stopwatch is selected, this toggle is
automattically turned off.
2023-05-18 15:29:34 -03:00
Arthurk12
cc2f509c7c Refactored timer design 2023-05-18 15:29:33 -03:00
Pedro Beschorner Marin
2f104eafc8 Syncing time offset between client and server 2023-05-18 15:29:32 -03:00
Pedro Beschorner Marin
4d8f7070de Add timer alarm 2023-05-18 15:29:32 -03:00
Pedro Beschorner Marin
5463a4a423 Stopwatch handlers 2023-05-18 15:29:31 -03:00
Arthurk12
953a3d3548 Timer first commit 2023-05-18 15:29:31 -03:00
Anton Georgiev
510c94cfa7 Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into may16-merge 2023-05-16 13:35:47 -04:00
Ramón Souza
af23ce542e
Merge pull request #17702 from Scroody/virtual-backgound-accepts-webp
feat (html5): Virtual backgrounds now accepts webp format
2023-05-15 17:06:41 -03:00
Anton Georgiev
4e851a7571 Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into merge-267-27 2023-05-15 11:51:17 -04:00
Paulo Lanzarin
6326a81123
feat(audio): microphone bridge set to mediasoup by default
The initial goal is for this to be default in 2.7.
Set it as default early in the cycle so folks can test it for longer.

If there's any deal-breaking issue with it nearing release we can just flip back to the old (2.6, FS/SIP.js) default.
2023-05-10 16:01:45 -03:00
Arthurk12
33c9abd874 requested changes 2023-05-09 17:21:47 -03:00
Carlos
8f8bfc8903 feat(camera as content): port to BBB
Enables the presenter to share a camera in the presentation area.
The shared camera automatically uses a pre-defined, fixed and hidden camera.
Profile defined in the settings.yml file.
It is currently using the screenshare's backend.
2023-05-09 17:21:46 -03:00
Lucas Fialho Zawacki
fcb6b94787 feature(reactions): Flags to enable new/old status button and to position it centered or to the right 2023-04-28 14:10:27 -03:00
André Castro
2c52c1a596
Merge branch 'v2.6.x-release' into I-17465 2023-04-27 19:25:56 -03:00
Lucas Fialho Zawacki
2a3e2d4993 feat(user-actions): enabled option in settings.yml 2023-04-27 18:37:18 -03:00
Max Franke
fbcc611bd9 feat(interactions): add new interactions button
Interactions button is a button that stays in action bar.
Integrates several features in just one place: user-reaction, raise hand,
user-status (away/not away), toggle question panel.
2023-04-27 13:57:40 -03:00
Max Franke
d28b93a586 feat(reactions): add user reaction
add user-reaction collection
add emoji picker for user reaction in the user list
add options to enable/disable user-reaction
add a way to pass style to emoji-picker component
2023-04-27 11:54:11 -03:00
GuiLeme
7492506224 [chat-list-migration] - started migration for chatList 2023-04-26 18:02:32 -03:00
Diego Benetti
2767bee67c Enables transfer button to be displayed in tablets 2023-04-26 14:30:25 +00:00
Gustavo Trott
a5609cd217
Merge pull request #17487 from Tainan404/apollo-client
refactor (bbb-html5): Refactor of Userlist using graphql
2023-04-24 18:27:51 -03:00
Lucas Fialho Zawacki
6979432c36 feat(transcription): Server side open source transcriptions 2023-04-24 18:23:34 -03:00