BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,084 Commits 13 Branches 260 Tags 1.1 GiB
11169b76ff
Commit Graph

11796 Commits

Author SHA1 Message Date
Ramón Souza
d9a18a9e14 add inline comments 2023-05-30 09:54:35 -03:00
Ramón Souza
6b747ccc9e fix blank presentation after minimizing 2023-05-30 09:39:31 -03:00
KDSBrowne
4e701201c5 update whiteboard toolbar responsive size to fix overlap 2023-05-29 18:03:39 +00:00
André Castro
f2c4d55c2d
Update component.jsx 2023-05-29 15:02:29 -03:00
Anton Georgiev
20d124722a
Merge pull request #17962 from ramonlsouza/change-self-cam-label 
refactor: Change enable/disable self cam label based on state
 2023-05-29 09:49:52 -04:00
Ramón Souza
d3eff236e1
Merge pull request #18020 from Scroody/I-17893 
Fix: Empty 'E' on polls answer options
 2023-05-29 10:34:22 -03:00
André Castro
3852520d0b
Update component.jsx 2023-05-29 10:21:17 -03:00
KDSBrowne
07c7e2c66e fix setting tldraw dock position 2023-05-26 18:39:09 +00:00
Ramón Souza
31add17d9c fix adjust settings button 2023-05-26 15:29:29 -03:00
Scroody
5dcd018500 Removed empty E 2023-05-26 11:04:35 -03:00
Paulo Lanzarin
5447666c15
Merge branch 'v2.7.x-release' into port-timer 2023-05-26 10:33:38 -03:00
André Castro
51b0549e59
Update component.jsx 2023-05-26 10:19:29 -03:00
Ramón Souza
06c0fab6ce Merge remote-tracking branch 'upstream/v2.7.x-release' into issue-17894 2023-05-26 10:13:43 -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
240134838d fix(reactions): code removed by mistake 2023-05-25 19:18:38 -03:00
Arthurk12
83f96b42c1 fix(reactions): remove commented code 2023-05-25 18:16:51 -03:00
Arthurk12
701206ee80 feat(reactions): add to disabledFeatures 2023-05-25 18:05:50 -03:00
Arthurk12
461be7a7fc fix(reactions): method call 
Update method call to the unified one(setUserReaction) and include the userID
parameter, so it can be used by mods to clear others status as well.
 2023-05-25 17:42:02 -03:00
Arthurk12
196d2c1e0a feat(reactions): sync expiration with akka 
Currently, the reactions are cleared on mongo based on the expire time.
So to sync its state with akka, an observer is atattched to the user
reactions collection and whenever a reaction is removed because of the
expiration time, akka is notified with message 'UserReactionTimeExpiredCmdMsg'.
 2023-05-25 17:32:27 -03:00
Ramón Souza
690472d36c
Merge pull request #17984 from Scroody/I-17906 
Fix: Cameras behind drop areas and presentation when dragging
 2023-05-25 16:58:07 -03:00
André Castro
d90e7a2304
Update component.jsx 2023-05-25 16:57:22 -03:00
André Castro
c4e62d3315
Update 
Adding suggestion

Co-authored-by: Ramón Souza <contato@ramonsouza.com>
 2023-05-25 16:42:46 -03:00
Ramón Souza
1540a9a7ec
Merge branch 'v2.7.x-release' into I-16114 2023-05-25 16:38:15 -03:00
Scroody
5693ead6fa Fix: Poll creation allows for 5 choices, but the resulting poll will only have 4 choices 2023-05-25 15:35:35 -03:00
Gabriel Porfirio
999bf44a11 adding data-test to yes/no option 2023-05-25 12:59:23 -03:00
Anton Georgiev
25af259d2d Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into merge-may-24 2023-05-24 17:23:00 -04:00
Ramón Souza
219b1d1a72
add inline comment 2023-05-24 15:45:08 -03:00
Anton Georgiev
cb68297273
Merge pull request #17963 from ramonlsouza/fix-self-checked-value 
fix: webcam self view toggle label
 2023-05-24 14:40:15 -04:00
Scroody
fe24abddca Fix: Camerasa behind drop areas and presentation when dragging 2023-05-24 14:44:26 -03:00
Ramón Souza
60713e6f54 fix slide render issue in firefox 2023-05-24 14:36:58 -03:00
prlanzarin
b40a88cf69 fix(screenshare): size dispatch fails due to wrong scope 2023-05-24 12:07:35 -03:00
prlanzarin
636ab74826 fix(screenshare): adjustments to make output device switching work 2023-05-24 11:40:32 -03:00
AtilaU19
56dba30877 fix(screenshare): audio from screenshare match with audio from microphone 2023-05-24 11:33:32 -03:00
Arthurk12
3efdbd9012 feat(reactions): add akka messages to clear all emojis status 
Adds two new messages which clear the users emoji statuses. This messages
enables this task to be done in a single call, instead of triggering one
method call for each user.
'ClearAllUsersEmojiCmdMsg' is sent from meteor to akka and updates all the
emoji states in the users model.
'ClearedAllUsersEmojiEvtMsg' is sent from akka to meteor. This triggers the
 mongo collection update.
 2023-05-24 10:49:42 -03:00
Scroody
6e6fbe11be Fix: Self cam caoming back after trying to add effects or settings 2023-05-22 16:54:41 -03:00
Arthurk12
8541a5aae1 fix(reactions): prop name 2023-05-22 12:07:08 -03:00
Ramón Souza
7312021d9b fix self view label value 2023-05-22 10:19:49 -03:00
Ramón Souza
810a9895f8 change enable/disable self cam label based on state 2023-05-22 09:06:39 -03:00
Scroody
08a0226b59 Fix: Send to chat presentation not having unread notification 2023-05-19 10:54:29 -03:00
Ramón Souza
0040ee7028 do not display self view disabled message if camera is not being shared 2023-05-19 09:44:08 -03:00
Anton Georgiev
6e9eb023c5
Merge pull request #17883 from ramonlsouza/issue-13844 
feat: Add "Grid View" layout
 2023-05-18 15:43:02 -04:00
Anton Georgiev
1d3bdb5802
Merge pull request #17648 from GuiLeme/issue-17531 
feat: Restore old downloading of original presentation
 2023-05-18 15:40:01 -04: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
Arthurk12
b3c12153c3 feat(timer): add indicator to the tab title 
Adds the current time string to the tab title, enclosed by opening and
closing brackets.
 2023-05-18 15:29:43 -03:00
Arthurk12
ecb6527bae fix(timer): missing prop 
Some tweaks that went unnoticed when porting the timer feature.
 2023-05-18 15:29:42 -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
Arthurk12
215fe73542 fix(timer): update time offset edge case 
Prevents the client from updating its time offset when the time returned
from the server is zero, which is the default returned value when there
is no userId.
This would make the client to calculate a gigantic negative time offset
leading the timer to reach the end prematurely/instantaneously.
 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
Carlos Henrique
98aed5d715 fix(icon) aligned icons 
Timer and notes icon aligned.
Removed line between questions and chat buttons.
 2023-05-18 15:29:41 -03:00
Carlos
da156b7486 fix(timer) presentation blocking the buttons 
Add scroll to timer menu.
 2023-05-18 15:29:41 -03:00
Átila
a23e19adde fix(timer): Item alignment 
* fix(timer): Item alignment

Co-authored-by: Arthur B. Grossi <32987232+Arthurk12@users.noreply.github.com>
 2023-05-18 15:29:40 -03:00
AtilaU19
f0b1a755cb fix(timer): timer song list centering 2023-05-18 15:29:40 -03:00
Arthurk12
a671d45739 fix(layout): adjusts the timer tab height 
Changes the timer's tab height to be relative, so it does not cover the
presentation when it is under the content panel.
 2023-05-18 15:29:40 -03:00
Arthurk12
0d06241a68 feat(timer): port to 2.5 
Port timer feature to 2.5 which includes 3 components:
	- Timer component
	- Timer indicator component
	- Timer sidebar button component
 2023-05-18 15:29:39 -03:00
AtilaU19
7a6e457f5d refactor(timer): updateTimer fuction argument list 
Replacement of the list of arguments of the update Timer function in an object and adequacy of its calls in the functions when necessary.
 2023-05-18 15:29:39 -03:00
Arthurk12
02a6feb1c8 fix(timer): change users count threshold 
Changes the timer auto-stop threshold from 90% to 100% of user count
to prioritize the timer alert sounding for all users over the timer state
being consistent.

Also, puts the user count fetch back to where it was to avoid a race
condition where the number of users when setting the observer is
different than when the timer ends(i.e. users've joined or left the
meeting while the timer was running) causing the timer not to stop or
stop prematurely.
 2023-05-18 15:29:39 -03:00
Arthurk12
10e1b70bf9 chore(timer): adds log message to beep 2023-05-18 15:29:38 -03:00
Arthurk12
6628296471 fix(timer): wrong attribute to get users count 
There was a legacy attribute being used to find active users in the meeting.
This wrong attribute caused the returned number of users to be 0 which
makes the timer stop prematurely and, possibly, not to issue the timer beep.

Also adds a missing argument to updateTimer and moves the find call to
the Users collection to a external function, so it doesn't get executed
every time an user notifies timer has ended.
 2023-05-18 15:29:38 -03:00
AtilaU19
a694595275 feat(timer): added requestedUserId and Action logs 2023-05-18 15:29:38 -03:00
Arthurk12
df9b0a2655 refactor(timer): audio tag and play/stop conditions 
Sets conditions for calling play and stop music to avoid being called
repeatedly.
Groups all stop calls into a point to make the code cleaner.
Avoid recreating new audio tag whenever the timer song changes.
 2023-05-18 15:29:37 -03:00
Arthurk12
857389e295 fix(timer): music selectors 
Disables track radio selectors when timer feature is in stopwatch mode.
 2023-05-18 15:29:37 -03:00
Arthurk12
cc2387a7dd fix(timer): stop music on unmount 
Stops music when timer indicator component is unmounted.
 2023-05-18 15:29:37 -03:00
Arthurk12
3895d86823 fix(timer): indicator not showing on mobile 
Due to the new layout manager, open panels' checking needed tweaking.
 2023-05-18 15:29:36 -03:00
Pedro Beschorner Marin
a8e7f9c896 fix(timer): add key prop to tracks list 2023-05-18 15:29:36 -03:00
Pedro Beschorner Marin
2b4d40d6e8 refactor(timer): functions order 2023-05-18 15:29:36 -03:00
Pedro Beschorner Marin
47cecbfea2 refactor(timer): add parseInt radix 2023-05-18 15:29:35 -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
Arthurk12
529a5a6b10 fix(timer): music stop 
Forces timer music to stop when timer is deactivated while running.
 2023-05-18 15:29:35 -03:00
Arthur B. Grossi
17aa3d7177 Requested changes 
Filters users collection by 'online' connection status and describes when/how
server detects that the timer has ended to automatically stop it.
Also, fixed a corner case that when timer alarm was disabled, clients didn't
notify that the timer ended.
 2023-05-18 15:29:35 -03:00
Arthur B. Grossi
737b5e6b3a fix(timer): music toggle alignment 
Music label and toggle are closer and centralized.
 2023-05-18 15:29:34 -03:00
Arthur B. Grossi
dbbef569a9 fix(timer): autoplay 
When user enters meeting with music already playing, an event listener is set
to play the music only after user interaction.
Also, to keep timer more cohesive and reduce complexity of the condition for
playing music, timer automatically stops after 90% of users notify that the
timer has expired.
 2023-05-18 15:29:34 -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
3952112f49 fix(timer): start/stop button color 2023-05-18 15:29:33 -03:00
Pedro Beschorner Marin
ea30525cb4 Timer design extra tweaks 2023-05-18 15:29:33 -03:00
Arthurk12
cc2f509c7c Refactored timer design 2023-05-18 15:29:33 -03:00
Pedro Beschorner Marin
585dbef43d Time offset refactor 2023-05-18 15:29:33 -03:00
Pedro Beschorner Marin
c040db8f58 Fix alarm when deactivated 2023-05-18 15:29:32 -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
f4a5421843 Add timer view 2023-05-18 15:29:31 -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
Ramón Souza
e0cea4834b
Merge pull request #17907 from KDSBrowne/bbb-17466 
fix: Localize Regular Expressions for Quick Poll Options
 2023-05-18 09:06:19 -03:00
Ramón Souza
18720e1536 Merge remote-tracking branch 'upstream/v2.7.x-release' into issue-13844 2023-05-17 15:44:39 -03:00
Ramón Souza
c64cf5ccbd
Merge pull request #17935 from Scroody/I-16114 
feat: Disable self-view of webcam
 2023-05-17 14:49:40 -03:00
Scroody
0fa1b9b3eb More requested changes made 2023-05-17 13:54:54 -03:00
Scroody
4a6d1258ae Requested changes made and fix of deactivating mutiple cams 2023-05-17 11:30:06 -03:00
Scroody
99885c20ed Final Adjust 2023-05-16 15:43:06 -03:00
GuiLeme
1b26302745 [issue-17531] - merge upstream/v2.7.x-release 2023-05-16 15:30:15 -03:00
Scroody
8272b487f3 Testing 2023-05-16 14:39:56 -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
40c826b127 preserve font settings on page change 2023-05-16 10:41:24 -03:00
Ramón Souza
99832aa570
Merge pull request #17864 from hiroshisuga/dev2.6_fitToWidthStyle 
style: Change style of fit-to-width button when it's on
 2023-05-16 08:56:39 -03:00
Ramón Souza
341e2c9464
Merge pull request #17862 from hiroshisuga/patch-4 
style: remove unnecessary fit-to-width style
 2023-05-16 08:51:45 -03: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
Ramón Souza
fecf42dada
Merge pull request #17905 from danielpetri1/export-toast-fix 
fix(bbb-html5): Successful annotated export toast
 2023-05-15 16:39:16 -03:00
Ramón Souza
01246a6307 fix whiteboard right-click 2023-05-15 16:21:27 -03:00
danielpetri1
6435fbbf25 Linting changes 2023-05-15 18:56:01 +00:00