Commit Graph

9740 Commits

Author SHA1 Message Date
KDSBrowne
e138d17b4f preserve canvas position on slide change 2023-06-07 05:12:07 +00:00
Anton Georgiev
1146ab9be9 Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into merge-26-27-june-6 2023-06-06 09:28:53 -04:00
Ramón Souza
dd49ebfb8a fix edit shape 2023-06-06 09:11:58 -03:00
Ramón Souza
4686f856a6 client side checks 2023-06-06 08:57:36 -03:00
Ramón Souza
baf3690f5a fix dock param 2023-06-06 08:56:05 -03:00
Ramón Souza
22b02ead28 Merge remote-tracking branch 'upstream/v2.7.x-release' into 16120 2023-06-06 08:45:29 -03:00
Daniel Petri Rocha
d2762657ee
Merge branch 'v2.6.x-release' into mime-fixes 2023-06-06 12:12:13 +02:00
danielpetri1
ffeb8c3acb Allow multiple MIME types per extension 2023-06-06 10:08:14 +00:00
Anton Georgiev
70b3220f41 Merge branch 'v2.7.x-release' of github.com:bigbluebutton/bigbluebutton into june5-27 2023-06-05 17:09:35 -04:00
Scroody
09286137c2 Approach to solve issue changed. 2023-06-05 16:46:04 -03:00
André Castro
8af887c572
.jsx 2023-06-05 13:52:38 -03:00
Scroody
0f64f5ba1a Code replicated to other components 2023-06-05 13:42:24 -03:00
Tiago Jacobs
7b5b29aaea
Merge pull request #18076 from Tainan404/custom-subscription-hook
Add a way to create custom hooks to subscription and apply on userlist
2023-06-02 16:58:50 -03:00
Tainan Felipe
07c5d2f5b3
Merge branch 'develop' into chat-popup 2023-06-02 15:57:06 -03:00
Tainan Felipe
9fb13c653d
Merge pull request #17955 from Tainan404/add-chat-header 2023-06-02 15:55:58 -03:00
Tainan Felipe
2f6b06d442
Merge pull request #17725 from ramonlsouza/who-is-typing 2023-06-02 15:55:49 -03:00
Tainan Felipe
b3a4526aa9
Merge pull request #17755 from ramonlsouza/migrate-message-form 2023-06-02 15:55:30 -03:00
Ramón Souza
9f345c91bb fix dock param 2023-06-02 14:46:17 -03:00
Tainan Felipe
963048698b Add away to create custom hooks to subscription and apply on userlist 2023-06-02 11:59:05 -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
46849eae84 change webcam placeholder border color 2023-06-02 10:06:41 -03:00
Ramón Souza
7c86eee147 fix pin/unpin shared notes 2023-06-01 17:04:31 -03:00
Scroody
bfaa640fb4 Fix: pinning shared notes should restore presentation 2023-06-01 16:28:33 -03:00
Ramón Souza
c85797e4fc
Merge pull request #18057 from ramonlsouza/fix-uploader-dropdown
fix: presentation uploader dropdown styles
2023-06-01 13:57:51 -03:00
Ramón Souza
10f6c2a9d1
Merge pull request #18055 from Scroody/I-18034
Fix: new message notification doesn't disappear.
2023-06-01 11:38:38 -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
Scroody
44997a83e1 Requested changes and code optmization 2023-06-01 11:09:14 -03:00
Ramón Souza
bf55c143be fix presentation uploader dropdown 2023-06-01 09:29:56 -03:00
Scroody
b2f99a5516 New message notification doesn't disappear 2023-05-31 13:42:49 -03:00
prlanzarin
854f1e6e1b fix(video): drag-and-drop virtual background isnt applied
Drag-and-drop based virtual BG activation isn`t working since we refactored the logic to determine whether a peer is attached or not
2023-05-31 11:51:06 -03:00
Paulo Lanzarin
ca1a1f8cb6
Merge pull request #17980 from prlanzarin/u27/fix/screenshare-audio-output
fix(screenshare): use the same audio outputDeviceId as microphone
2023-05-31 11:37:57 -03:00
Paulo Lanzarin
3553a7eb35
Merge pull request #18051 from prlanzarin/u27/refactor/stale-ios-locale
refactor(video): remove stale iOSWarning locale declaration
2023-05-31 11:32:22 -03:00
Paulo Lanzarin
727d3f4369
Merge pull request #18050 from prlanzarin/u27/fix/screenshare-autoplay-lodash
fix(screenshare): client crash due to stale lodash usage
2023-05-31 11:30:54 -03:00
prlanzarin
bf482fa373 refactor(video): remove stale iOSWarning locale declaration 2023-05-31 11:17:03 -03:00
prlanzarin
4961bfdf73 fix(screenshare): client crash due to stale lodash usage 2023-05-31 11:12:21 -03:00
prlanzarin
f4a761cea4 Merge remote-tracking branch 'origin/v2.7.x-release' into u27/fix/screenshare-audio-output 2023-05-31 11:06:49 -03:00
Ramón Souza
0756d030a5
Merge pull request #17968 from Scroody/I-16114
Fix: Self cam coming back after trying to add effects or settings
2023-05-31 11:06:24 -03:00
Anton Georgiev
2a98312acd
Merge pull request #18024 from ramonlsouza/fix-connection-settings
fix: connection status modal "adjusting your settings" button not working as expected
2023-05-31 10:03:32 -04:00
Anton Georgiev
1fce8d1c22
Merge pull request #18003 from gabriellpr/improve-poll-test
test: Improve smart slides
2023-05-31 10:03:06 -04:00
Paulo Lanzarin
7f637d5def
Merge pull request #17981 from prlanzarin/u27/fix/screenshare-size-dispatch-exception
fix(screenshare): size dispatch fails due to wrong scope
2023-05-31 10:43:02 -03:00
prlanzarin
f34f8e5a9c fix(video): autoplay handling fails due to wrong mediaElement reference 2023-05-31 10:33:39 -03:00
Anton Georgiev
f6d2ed10f3
Merge pull request #18042 from ramonlsouza/issue-18039
fix: Viewer gets blank presentation after minimize/restore
2023-05-30 14:55:41 -04:00
Ramón Souza
7fed378671 do not return focus after closing modal 2023-05-30 13:45:41 -03:00
Anton Georgiev
a672b482f5
Merge pull request #17924 from ramonlsouza/issue-17894
fix: Right-clicking whiteboard area makes UI disappear
2023-05-30 11:26:38 -04:00
Ramón Souza
c8cd7f3a33 change checks 2023-05-30 10:18:11 -03:00
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
Gustavo Trott
2f68313df0 Merge remote-tracking branch 'upstream/v2.7.x-release' into develop 2023-05-30 08:43:14 -03:00
Scroody
a53419576a Fix: White squares displayed when rotatin to mobile orientation 2023-05-29 16:44:33 -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
Tainan Felipe
222c61b99f Add break word 2023-05-26 12:29:13 -03:00
Tainan Felipe
479debafdf Refactor: Change component from popup to callout 2023-05-26 12:25:17 -03:00
Scroody
5dcd018500 Removed empty E 2023-05-26 11:04:35 -03: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
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
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
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
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
Tainan Felipe
d98383a818 Refactor: Add Chat popup 2023-05-25 10:21:02 -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
Gustavo Trott
d1a60157e5 Insert Poll result as Chat msg in graphql 2023-05-24 10:56:22 -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
Tainan Felipe
53b76eda20 Rename valiable 2023-05-23 13:30:00 -03:00
Tainan Felipe
a42f7ecc7d Change: make code compliant with database models 2023-05-23 10:38:31 -03:00
Tainan Felipe
8962358ce5 Merge remote-tracking branch 'upstream/develop' into add-chat-header 2023-05-23 10:27:23 -03:00
Ramón Souza
2f55218395
remove console.log 2023-05-23 09:31:11 -03:00
Tainan Felipe
9629ae1e7c
Merge branch 'migrate-message-form' into pull-17755 2023-05-23 09:14:33 -03:00
Gustavo Trott
ed2c94eaea Add externalVideo and screenshare to Graphql 2023-05-23 09:09:38 -03:00
Ramón Souza
ac2df2ca50 Merge remote-tracking branch 'upstream/develop' into migrate-message-form 2023-05-23 08:16:31 -03:00
Tainan Felipe
43b4fb8752 Fix: emoji picker and refactor service functions 2023-05-22 17:43:38 -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
Tainan Felipe
980f5f25db Merge remote-tracking branch 'upstream/develop' into pull-17755 2023-05-22 11:56:57 -03:00
Ramón Souza
7312021d9b fix self view label value 2023-05-22 10:19:49 -03:00
Gustavo Trott
660abc886d
Remove unnecessary column 2023-05-22 09:58:09 -03:00
Gustavo Trott
c7b78552c3
Remove unnecessary column 2023-05-22 09:57:20 -03:00
Ramón Souza
810a9895f8 change enable/disable self cam label based on state 2023-05-22 09:06:39 -03:00
Gustavo Trott
62e2051a9f
Merge pull request #17954 from gustavotrott/graphql-welcomeMsg
refactor (graphql-server): Include welcomeMsg and set permissions
2023-05-19 15:36:22 -03:00
Tainan Felipe
8862803efe Fix typo 2023-05-19 15:35:04 -03:00
Tainan Felipe
9206ca606a Refactor: user graphql and TS in chat header 2023-05-19 15:30:24 -03:00
Gustavo Trott
0fa28dd5d1 Include welcomeMsg to graphql and set permissions 2023-05-19 15:28:20 -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
Arthurk12
10e1b70bf9 chore(timer): adds log message to beep 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
Gustavo Trott
e86d84fef0
Merge pull request #17876 from Tainan404/new-chat-implementation
Refactor: Chat using graphql and pagination
2023-05-18 15:09:50 -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