Commit Graph

1123 Commits

Author SHA1 Message Date
Anton Georgiev
e2cdd68bac
Merge pull request #18516 from ramonlsouza/2627-aug10
chore: Merge 2.6 into 2.7
2023-08-11 17:13:21 -04:00
Ramón Souza
c598db9c7a display selected emoji in reactions bar button 2023-08-11 11:01:50 -03:00
Ramón Souza
b103448091 Merge remote-tracking branch 'upstream/v2.7.x-release' into issue-18443 2023-08-11 09:36:08 -03:00
Anton Georgiev
09f5b8a464
Merge pull request #18524 from antonbsa/multiple-leave-audio-datatest
fix: Remove leaveAudio data-test from the reaction buttons
2023-08-10 16:37:10 -04:00
Ramón Souza
6d4c140f76 auto close reactions settings 2023-08-10 16:28:21 -03:00
Anton B
b6c73b4a04 fix: remove leaveAudio data-test from the reaction buttons 2023-08-10 16:14:33 -03:00
Anton Georgiev
a3cf5ce935
Merge pull request #18513 from ramonlsouza/fix-disabled-reactions
fix: do not display reactions button if reactions are disabled
2023-08-10 15:13:10 -04:00
Ramón Souza
866c40f84f Merge remote-tracking branch 'upstream/v2.6.x-release' into 2627-aug10 2023-08-10 11:49:01 -03:00
Anton Georgiev
2e80e406b9
Merge pull request #18469 from ramonlsouza/keyboard-reactions
style: reactions bar improvements
2023-08-10 09:55:30 -04:00
Ramón Souza
fadd035bea do not display reactions button if reactions are disabled 2023-08-10 09:02:08 -03:00
Ramón Souza
3bde4c970e
Merge pull request #18456 from ramonlsouza/issue-18434
fix: Labels flowing out of a <div> in breakout rooms creation view
2023-08-09 15:59:14 -03:00
Ramón Souza
e767a39799 centralize emoji, add focus color 2023-08-08 15:28:05 -03:00
Ramón Souza
c68da552d2 break lines in breakout room checkbox 2023-08-07 11:34:35 -03:00
Ramón Souza
56c4657c46 adjust styles 2023-08-04 16:14:57 -03:00
KDSBrowne
632b7764bf move fitToWidth state up to app component (#17982) 2023-08-04 16:41:42 +00:00
Ramón Souza
95e3bba2f1 make reactions bar accessible by keyboard 2023-08-03 15:48:47 -03:00
Anton Georgiev
ce2b65798b
Merge pull request #18377 from antonbsa/parameter-tests-fix-after-merge
test: Parameter tests fix
2023-07-26 14:05:18 -04:00
Anton B
1024930a32 test: disabled features test fixes and managePresentationButton selector update 2023-07-25 15:26:42 -03:00
Anton Georgiev
9015c1d339
Merge pull request #18378 from antonbsa/raise-hand-tests-fix
test: Raise and lower hand tests fix
2023-07-25 14:15:38 -04:00
Ramón Souza
ee78814827 change quick poll button styles 2023-07-25 15:05:00 -03:00
Anton B
03aa9d3bec test: update all raise and lower hand related tests 2023-07-24 18:07:51 -03:00
Anton Georgiev
90ef5ab591
Merge pull request #18358 from antonbsa/breakout-tests
test: Breakout tests update
2023-07-24 16:31:23 -04:00
Anton B
cdf3c0d2fb test(breakout): remove all notifications before ending rooms and temporally avoid screenshot comparison due to a reported bug 2023-07-20 17:15:32 -03:00
Ramón Souza
5bb012a6a9
Merge pull request #18351 from Scroody/fix-warnings
Fix: Warnings when creating a new meeting
2023-07-20 17:00:15 -03:00
Anton B
fbb622ba52 test: update breakout selectors 2023-07-20 16:59:53 -03:00
Ramón Souza
5992f628ed Merge remote-tracking branch 'upstream/v2.7.x-release' into issue-18344 2023-07-20 16:02:13 -03:00
Scroody
125811f0d3 Merge remote-tracking branch 'upstream/v2.7.x-release' into fix-warnings 2023-07-20 14:10:47 -03:00
Scroody
0a1428b862 Time features label change 2023-07-19 15:00:48 -03:00
Scroody
4f930ed2e2 XMerge remote-tracking branch 'upstream/v2.7.x-release' into fix-warnings 2023-07-19 13:27:16 -03:00
Scroody
86f4e372f8 Fix: Warnings when creating a new meeting 2023-07-19 13:22:50 -03:00
Ramón Souza
bc1898dfff reactions bar tweaks 2023-07-19 11:36:34 -03:00
Ramón Souza
bf6f96fc44 renaming interactions -> reactions 2023-07-18 08:54:36 -03:00
Anton Georgiev
042bacc7c1 Merge remote-tracking branch 'bbb/v2.7.x-release' into merge-july12 2023-07-12 18:53:12 -04:00
Anton Georgiev
cd9f93be44 Merge remote-tracking branch 'bbb/v2.6.x-release' into merge-july12 2023-07-12 15:59:46 -04:00
Anton Georgiev
e32a5feabe
Merge pull request #18304 from gabriellpr/new-disabled-features-test
test: slide snapshot, camera as content disabledFeatures tests
2023-07-12 14:06:07 -04:00
Gabriel Porfirio
251bf6867b 4 tests for disabledFeatures, slide snapshot, camera as content 2023-07-12 08:55:49 -03:00
Ramón Souza
af593e41ee
Merge pull request #18289 from ramonlsouza/issue-15863
Layout Settings Enhancements
2023-07-10 16:53:16 -03:00
Ramón Souza
52b636a65a keyboard move user - unassigned list 2023-07-07 16:56:42 -03:00
Ramón Souza
870d773fdf remove unused code 2023-07-07 13:22:34 -03:00
Ramón Souza
804d7e859c change labels, update push layout experience 2023-07-07 09:53:58 -03:00
KDSBrowne
9f1734bfb8 handle quick poll options for F/G 2023-07-06 15:30:05 +00:00
André Castro
a24439d414
Merge branch 'v2.7.x-release' into I-17515 2023-07-05 16:08:37 -03:00
Scroody
50511ff3d3 Requested changes made 2023-07-05 13:58:40 -03:00
Scroody
d145a482cb Enhancement: Breakout modal UI improved 2023-06-30 10:53:58 -03:00
Arthurk12
104550d46f fix(timer): sidebar content when activated
Changes the behavior of activating the timer. The behavior set by this commit
is: when the timer is activated, only the moderator who triggered it will see
the sidebar content switch to the timer. This change required hanging an
observer to catch the timer activation and dispatch the sidebar content
change since timer messages are passing through akka.
2023-06-29 18:24:40 -03:00
Gustavo Trott
c8867fadb5
Merge pull request #18197 from Scroody/I-18127
Allow dynamic control on moderators invitation for breakouts
2023-06-29 13:39:26 -03:00
Gustavo Trott
58e862e6a7 Make names more clear for 'invite assigned moderators to breakoutRooms' 2023-06-29 12:04:14 -03:00
Ramón Souza
94eceb0489 mobile menu 2023-06-27 11:08:49 -03:00
Ramón Souza
bd6779e1b9 close menu after selecting a reaction 2023-06-27 09:50:04 -03:00
André Castro
389f7b0fe3
removing unnecessary code 2023-06-23 14:46:16 -03:00
André Castro
ef384eae15
Removal of unnecessary imports 2023-06-23 14:42:45 -03:00
André Castro
a09953039e
Update container.jsx 2023-06-23 14:40:42 -03:00
Ramón Souza
411f0e01a4 move active/away to userlist 2023-06-23 10:39:40 -03:00
Ramón Souza
d0ed90a6c0 Merge remote-tracking branch 'upstream/v2.7.x-release' into issue-18134 2023-06-23 09:32:55 -03:00
Ramón Souza
af670883c1 remove unused code 2023-06-22 15:35:40 -03:00
Gustavo Trott
6ba4aad05a
Merge branch 'v2.7.x-release' into user-raiseHand-away-flags 2023-06-22 08:27:20 -03:00
Scroody
36bc004425 Additional changes 2023-06-21 11:53:11 -03:00
Scroody
61fef1ece4 Allow dynamic control on mod invitation for breakouts 2023-06-21 11:06:41 -03:00
André Castro
5af5151219
Merge branch 'v2.7.x-release' into I-18137 2023-06-15 11:50:02 -03:00
André Castro
34130b06d6
Lint error caused by prettier 2023-06-15 11:41:03 -03:00
Ramón Souza
03c3eae821 remove unused code 2023-06-14 16:35:44 -03:00
Scroody
c5250d1ee5 Lint corrections requested 2023-06-14 15:04:58 -03:00
Scroody
11169b76ff conflict resolving 2023-06-14 11:32:52 -03:00
Ramón Souza
337688b3a3 add present/away toggle 2023-06-14 10:21:33 -03:00
Scroody
450cbe5451 Client: Timer added as disabled feature 2023-06-13 15:54:16 -03:00
Ramón Souza
f90b200d04 reactions bar restyle 2023-06-13 14:51:42 -03:00
André Castro
403d78c2e7
Update bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
2023-06-13 13:32:46 -03:00
Scroody
294fda2c6f Client: Camera as content as conent added to disabled features 2023-06-13 11:25:09 -03: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
GuiLeme
2cf46e4d05 [port-timer-with-events-suggestions] - made review suggestions 2023-06-08 16:37:32 -03:00
Gustavo Trott
ca9b873c4a Resolve conflicts 2023-06-08 10:03:35 -03:00
Gustavo Trott
8263dd17ca Introduces flags user.away and user.raiseHand 2023-06-07 22:10:07 -03:00
Ramón Souza
04804aa13b
Merge pull request #18065 from ramonlsouza/fix-pin-notes
fix: pin/unpin shared notes
2023-06-07 16:09:30 -03:00
Scroody
be567dd23c Fix: Arrow upside down on interactions sub-menu 2023-06-07 15:49:40 -03:00
Anton Georgiev
748c7a4a0b Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into june227 2023-06-02 09:45:34 -04:00
Ramón Souza
7c86eee147 fix pin/unpin shared notes 2023-06-01 17:04:31 -03:00
Paulo Lanzarin
5447666c15
Merge branch 'v2.7.x-release' into port-timer 2023-05-26 10:33:38 -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
83f96b42c1 fix(reactions): remove commented code 2023-05-25 18:16:51 -03:00
Gabriel Porfirio
999bf44a11 adding data-test to yes/no option 2023-05-25 12:59:23 -03:00
Arthurk12
8541a5aae1 fix(reactions): prop name 2023-05-22 12:07:08 -03:00
Arthurk12
f13217607e feat(timer): add model and messages to akka apps
This commit makes the messages of the timer feature to be proxied by
akka-apps and also adds a timer model that is updated based on these
messages.
Moving the timer panel opening logic to the timer button component in
the navigation panel was a consequence of these changes.
2023-05-18 15:29:42 -03:00
Carlos Henrique
0659f15211 fix(disabledFeatures) add timer
"disableFeatures=timer"
2023-05-18 15:29:41 -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
953a3d3548 Timer first commit 2023-05-18 15:29:31 -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
KDSBrowne
1b51377147 fix getContentAnchorEl console error 2023-05-10 01:31:48 +00:00
Carlos
5ddfb8b883 fix(camera as content): merge fixes 2023-05-09 17:21:48 -03:00
Arthurk12
a03064aa41 fix(camera as content): stop ongoing screenshare
Camera as content and screenshare are 2 features that are mutually exclusive
because they share the same space in the UI. This commit adds the behavior
that when one this features is started, the other one is closed if it is
running.
2023-05-09 17:21:48 -03:00
Arthurk12
7697367335 feat(screenshare): make component generic
Turns the screenshare component into a generic component, so that it can be
used both for screenshare and camera as content fetures.
Also changes specific locales and icons for the camera as content feature.
2023-05-09 17:21:47 -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
hiroshisuga
c66177d543
Update component.jsx 2023-05-07 00:20:55 +09: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
Lucas Fialho Zawacki
f18130c4f3 fix(reactions): Correct style after merge 2023-04-28 11:35:41 -03:00
Lucas Fialho Zawacki
b91697d0b9 fix(reactions): Fix merge 2023-04-27 18:31:11 -03:00
Carlos
fe745dea94 fix(reactions) menu blocking reactions button
Add options to dropdown.
2023-04-27 14:48:27 -03:00
Carlos
747a02a573 fix(reactions) bug display
Fix bug that causes the emoji modal be too large.
Fix bug when modal is on mobile.
2023-04-27 14:40:38 -03:00
Carlos
3b6c1d565c fix(interactions): add correct border
Fix hand button border style.
2023-04-27 14:40:08 -03:00
Carlos
3990f29f7c fix(reactions): reactions emoji picker
Fix reaction add style.
2023-04-27 14:20:53 -03:00
Max Franke
6d146d07d4 fix(interactions-button): typo 2023-04-27 14:08:16 -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
Ramón Souza
af8556e026 Merge remote-tracking branch 'upstream/v2.6.x-release' into 26-27-apr24 2023-04-24 17:15:47 -03:00
Scroody
e27c50a487 Fix: Presentation unminimizing when exiting external video or screen share. 2023-04-19 08:25:24 -03:00
Anton Georgiev
7b864cc841
Revert "Fix: Presentation un-minimizing when exiting external video or screen sharing." 2023-04-18 17:18:46 -04:00
GuiLeme
d1025fcbe5 [issue-16954] - Changes in review and fix of minor bugs 2023-04-12 12:51:23 -03:00
GuiLeme
5eb29e0ab5 [issue-16954] - merge upstream/v2.7.x-release 2023-04-11 11:02:00 -03:00
Scroody
5b0bc16e5c Fix: Presentation unminimizing when exiting external video or screen share. 2023-04-10 16:25:19 -03:00
Anton Georgiev
72c575b911 Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into merge-apr-6 2023-04-06 11:50:26 -04:00
Anton Georgiev
e2dc7da98a
Merge pull request #16828 from prlanzarin/u27/fix/ss-cam-reconn
fix: re-connection improvements for cameras and screen sharing
2023-04-05 16:13:01 -04:00
Ramón Souza
bcd504b749 Merge remote-tracking branch 'upstream/v2.7.x-release' into lodash-radash 2023-04-05 09:42:05 -03:00
GuiLeme
a277e77718 [issue-16954] - Adjusting modal priorities and refactor of code 2023-03-29 11:38:48 -03:00
GuiLeme
81ae4e9ca6 [issue-16954] - Adjusting modal priorities 2023-03-29 11:08:56 -03:00
GuiLeme
5f3296fdb1 [issue-16954] - last migrations - VideoPreview and drag and drop of background 2023-03-27 12:36:25 -03:00
GuiLeme
9329e194fd [issue-16954] - migration of screenshare unavailable, connectionStatus and randomUser 2023-03-24 17:48:00 -03:00
GuiLeme
d389a5b9e3 [issue-16954] - migration of fallback modal and caption reader modal 2023-03-24 10:07:56 -03:00
GuiLeme
7ce2203c04 [issue-16954] - merge v2.6.x-release 2023-03-24 08:44:19 -03:00
Anton Georgiev
f7efedf1a7
Merge pull request #16989 from KDSBrowne/bbb-br-manage-access
fix(access): Presentation Interference With Keyboard Access in Breakout Management
2023-03-23 16:56:52 -04:00
GuiLeme
d4bd29ea67 [issue-16954] - Migrating userOptions and remove user modals 2023-03-23 11:56:00 -03:00
GuiLeme
a5b5a754a0 [issue-16954] - Migrating recording modals components 2023-03-22 17:32:47 -03:00
GuiLeme
2f4b0bd592 [issue-16954] - Migration of breakoutroom invitation 2023-03-22 09:50:39 -03:00
GuiLeme
86e1209049 [issue-16954] - migrating user-options createBreakoutRoomModal and GuestPolicy 2023-03-21 17:45:20 -03:00
GuiLeme
4e17e80873 [issue-16954] - migrating dropdown menu from presenter 2023-03-21 14:55:43 -03:00
GuiLeme
f943cbf732 [issue-16954] - renaming referencing of Modals 2023-03-20 10:08:35 -03:00
Ramón Souza
9a56952483 restore popup menu 2023-03-17 09:54:36 -03:00
KDSBrowne
a9e7f54a1d fix presentation interference with keyboard access in br management 2023-03-10 18:42:57 +00:00
prlanzarin
afa2908ded fix(screenshare): better reconnection timers and UI for abrupt failures
Reconnection timers are far too long for abrupt failures because we
are waiting the original timeouts to elapse (30-60s) before trying it
again - even if a connection worked N-sessions back in that session's
history. The ideal thing to have is another intermediate, smaller and
fixed reconnection timer for sessions that had a working screen share
at least once.
The UI is also not being updated to the reconnecting state on negotiation
failures.

* Add an intermediate reconnection timer for abrupt failures set to 8s.
  This should improve reconnection times.
* Lower default connection timers values (base 20s down from 30s, max
  25s down from 60s)
* Set screen share UI to reconnecting on abrupt failures as well - we
  were only tracking ICE states prior to this, not negotiation errors
2023-03-08 15:48:30 -03:00
Carlos Henrique
b2bc2d174c feature(layout) viewers layout
Add a button for viewers to change the layout.
2023-03-07 16:09:02 -03:00
Ramón Souza
41c187d93e Merge remote-tracking branch 'upstream/v2.6.x-release' into lodash-radash 2023-03-01 15:19:12 -03:00
Anton Georgiev
ce73288ccf
Merge pull request #16778 from gabriellpr/test-disabled-features
test: disabled features
2023-02-28 15:11:48 -05:00
Ramón Souza
3bb6aa5a2c
Merge pull request #16841 from Scroody/I-16816
feat: Raise hand button now shows current emoji and can also clear emoji.
2023-02-28 15:50:17 -03:00
Ramón Souza
8b9164adbe
Merge pull request #16845 from Scroody/I-16843
Upload presentation label and icon changed.
2023-02-28 14:33:55 -03:00
imdt
c5d0e02b2b Upload presentation label and icon changed. 2023-02-28 13:24:08 -03:00
imdt
f7ff7e70cb Raise hand button now shows current emoji and can also clear emoji. 2023-02-28 10:57:31 -03:00
Ramón Souza
0a9e2ed7d5 Merge remote-tracking branch 'upstream/v2.6.x-release' into lodash-radash 2023-02-24 15:01:49 -03:00
GuiLeme
661ab05bfa [issue-16734] - changes in review 2023-02-24 12:52:01 -03:00
Ramón Souza
4ed09c89cf replace lodash uniqueId 2023-02-23 11:23:51 -03:00
Gabriel Porfirio
01eddc9dd6 adding layouts test 2023-02-23 09:05:57 -03:00
GuiLeme
6545736a1f [issue-16734] - merge upstream/v2.6.x-release 2023-02-22 17:19:27 -03:00
GuiLeme
d47d586f0e [issue-16734] - refactor disabledFeatures presentationArea to just presentation 2023-02-22 17:16:43 -03:00
imdt
4da5adb52a Propagate layout and layout setting don't show up when disabled features is enabled as a custom parameter. 2023-02-22 15:53:57 -03:00
André Castro
52993629c1 Propagate layout and layout setting don't show up when disabled features is active. 2023-02-22 16:57:24 +00:00
Ramón Souza
5c5433296b replace lodash range, partition and upperFirst 2023-02-22 13:52:18 -03:00
GuiLeme
54efb82a33 [issue-16734] - patch for sharednotes pin 2023-02-21 12:44:12 -03:00
GuiLeme
9fb2c32384 [issue-16734] - refactor hidePresentation to hidePresentationOnJoin 2023-02-17 14:59:39 -03:00
GuiLeme
cbe3e88938 [issue-16734] - Implemented new disabledFeature presentationArea 2023-02-17 12:44:36 -03:00
Ramón Souza
2591563250 fix warning in raise hand and presentation upload toast 2023-02-16 09:50:29 -03:00
Ramón Souza
7648d58bc3
Merge pull request #15728 from sapsDev/raise-hand-2.6
feat: Emoji Status Control in Raise Hand Button
2023-02-16 09:35:56 -03:00