Commit Graph

9704 Commits

Author SHA1 Message Date
danielpetri1
ffeb8c3acb Allow multiple MIME types per extension 2023-06-06 10:08:14 +00: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
Ramón Souza
9f345c91bb fix dock param 2023-06-02 14:46:17 -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
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
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
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
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
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
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
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
Paulo Lanzarin
2b374533ae
Merge pull request #17904 from prlanzarin/u26/fix/video-button-ios-uacheck
fix: remove legacy iOS UA checks that borked camera sharing in iPads
2023-05-15 15:16:56 -03:00
Ramón Souza
dcef3e3d7b
Merge pull request #17845 from ramonlsouza/issue-17839
fix: ignore restore on update for first load of initial presentation
2023-05-15 13:41:27 -03:00
KDSBrowne
b0ae991b1f format new line character in question string 2023-05-15 16:35:32 +00:00
prlanzarin
a693133b5a fix: remove legacy iOS UA checks that borked camera sharing in iPads
There are a couple of hardcoded UA checks targeted at iOS endpoints
introduced circa 2.2-beta. One of those pops up an "unsupported" toast
when the device joins a conference - the other blocks camera
sharing.

Those checks are outdated since we transitioned to minBrowserVersions
approach that redirects the client to an unsupported view upon join. I
also assume the checks are bugged since, in some environments, it flags
iPadOS endpoints as iOS and version-checks it to a hardcoded "12.2"
threshold (which is incompatible with iPadOS versioning). That caused
camera sharing not to work, which is a false negative.

I consider the checks to be outdated, so I removed all references to
them.
2023-05-15 13:22:52 -03:00
danielpetri1
c0c7f9d516 Add successful file export toast 2023-05-15 16:12:12 +00:00
KDSBrowne
783428bf71 localize true/false and yes/no regex patterns 2023-05-15 16:01:53 +00: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
Ramón Souza
494b547b49
Merge pull request #17879 from Scroody/fix-poll-results-editable-for-presenter
fix: Making poll results editing possible to presenter
2023-05-12 11:42:23 -03:00
Ramón Souza
aca4179248 add isTalking animation 2023-05-12 11:17:04 -03:00
André Castro
e9ae302d54
Making editing possible to presenter 2023-05-12 11:15:41 -03:00
Ramón Souza
102063ca60 disable drop bg, pin and focus for grid items 2023-05-12 10:34:35 -03:00
Ramón Souza
1d27aaa35b fix grid on user leave 2023-05-12 09:03:54 -03:00
Anton Georgiev
1c9ba032a6
Merge pull request #17554 from AtilaU19/reconection-fixes
fix: overlapping screen end alerts and invisible cameras on reconnections
2023-05-11 17:15:12 -04:00
GuiLeme
4c2806a018 [issue-17531] - changes in review and ES-lint fixes 2023-05-11 18:06:48 -03:00
Ramón Souza
ffe8754733 add grid layout 2023-05-11 17:20:26 -03:00
KDSBrowne
eb1f5f5935 update to react 18 2023-05-11 16:16:10 +00:00
Anton Georgiev
9c513f2bab
Merge pull request #17777 from danielpetri1/notes-current-issue
fix(bbb-html5): Inconsistent current presentation indicator
2023-05-11 09:10:07 -04:00
Anton Georgiev
adc654880c
Merge pull request #17868 from Scroody/I-17734
Fix: Order of first and last names in save users
2023-05-10 17:43:40 -04:00
Anton Georgiev
52df800720
Merge pull request #17837 from Scroody/I-17684
Fix: editable polls.
2023-05-10 17:43:08 -04:00
Anton Georgiev
a91ae56b34
Merge pull request #17822 from ramonlsouza/issue-17720
fix: Toast notifications shows again when the language is switched
2023-05-10 15:49:08 -04:00
Scroody
1c777fca3b Fix: Order of first and last names in save users 2023-05-10 15:33:51 -03:00
Gustavo Trott
32276c084b Fix second user trying to open private chat 2023-05-10 14:55:33 -03:00
hiroshisuga
d07afd5414
Update component.jsx 2023-05-10 23:54:17 +09:00
hiroshisuga
c2422a96dd
Update styles.js 2023-05-10 23:53:11 +09:00
hiroshisuga
63318919d8
Update styles.js 2023-05-10 23:34:49 +09:00
Ramón Souza
5b1c0bef9d
Merge pull request #17846 from Scroody/I-17832
Fix: Closed captions hindering elements
2023-05-10 10:15:10 -03:00
KDSBrowne
4ad5b93f3b update tabindex value 2023-05-10 02:15:08 +00:00
KDSBrowne
1b51377147 fix getContentAnchorEl console error 2023-05-10 01:31:48 +00:00
bigbluebutton
a7b8704b06 update material ui from v4 to v5 2023-05-10 00:09:54 +00:00
Anton Georgiev
677ecd7406
Merge pull request #17561 from KDSBrowne/bbb-005
fix: Update Question Regex to Exclude URLs
2023-05-09 17:51:09 -04:00
Arthurk12
9c5b2e9d06 fix(camera as content): close modal
Adds missing code to close the webcam modal when camera as content
is stopped via webcam modal's button.
2023-05-09 17:21:49 -03:00
Carlos
1aa659a1ff fix(camera as content): removed extra configs in the modal 2023-05-09 17:21:48 -03: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
d0c460f9c0 fix(camera as content): device sharing
Prevents the same camera device from being shared twice(webcam and "camera
as content"). The camera device shared using the camera as content feature
is tracked locally and then taken into account in the video-preview modal.
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
e902f2ee27 feat(screenshare): add contentType field
This commit adds a contentType field in the back-end components of the
screenshare feature in order to accomodate the new '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
Scroody
cdfa38ad85 Change of approach 2023-05-09 15:51:35 -03:00
Scroody
0cc3a4e818 Fix: Closed captions hindering elements 2023-05-09 14:26:27 -03:00
GuiLeme
d2c5b33eec [issue-17839] - back-end part for hide_presentation_on_join issue 2023-05-09 12:01:55 -03:00
Anton Georgiev
2645bc8d83
Merge pull request #17827 from hiroshisuga/patch-3
fix(poll): fix Yes/No quick poll button
2023-05-09 10:38:42 -04:00
Ramón Souza
854d0a162e wip: ignore restore on update for first load of initial presentation 2023-05-09 10:58:40 -03:00
Anton Georgiev
9d1a4e1dfc
Merge pull request #17829 from ramonlsouza/issue-17819
fix: Joining a meeting with pinned shared notes you don't see presentation area
2023-05-08 16:13:52 -04:00
Scroody
46b9cfa1e2 Id correction 2023-05-08 16:03:24 -03:00
Scroody
d0b73e9c0b Fix: editable polls. 2023-05-08 15:50:43 -03:00
Ramón Souza
a97d0216eb fix pinned shared notes on join 2023-05-08 10:01:08 -03:00
hiroshisuga
c66177d543
Update component.jsx 2023-05-07 00:20:55 +09:00
Ramón Souza
b5b98ff911 fix notifications being displayed more than once 2023-05-05 16:55:37 -03:00
Ramón Souza
7898482c58 remove error message from chat input on submit 2023-05-05 15:00:21 -03:00
Anton Georgiev
9814e4ebaf
Merge pull request #17811 from antonbsa/layout-tests-migration
test: Layout tests additions and serial mode migration
2023-05-04 16:27:16 -04:00
Anton Georgiev
5f0686697a
Merge pull request #17792 from Scroody/I-17741
fix: Default cursor not appearing when entering meeting.
2023-05-04 10:38:31 -04:00
Anton Georgiev
d2cfe301d7
Merge pull request #17806 from ramonlsouza/fix-multi-user-cursor
fix: cursor not appearing for non-presenter when multi-user whiteboard is enabled
2023-05-04 10:37:11 -04:00
Ramón Souza
c3ad0e7727 fix cursor for multi-user whiteboard 2023-05-04 09:20:36 -03:00
GuiLeme
90078aedc7 [issue-17531] - resolve conflicts with 2.7 2023-05-04 08:56:27 -03:00
GuiLeme
f650ade561 [issue-17531] - prevent user from exporting annotations when there is no annotation 2023-05-04 08:48:32 -03:00
Tainan Felipe
66052802c0 Fix: duplicate messages when start a new chat 2023-05-03 17:14:05 -03:00
Anton Georgiev
80079bd3bf
Merge pull request #17798 from Scroody/meteor-migration
fix: Meteor migration async annotation tweaks
2023-05-03 15:12:12 -04:00
Scroody
ab8e8b9ddb Changes to annotations async 2023-05-03 13:56:47 -03:00
Scroody
1a75eb884e Tweeks to annotations async 2023-05-03 13:53:28 -03:00
GuiLeme
f3969c083a [issue-17531] - disabled dropdown when uploading a presentation to not throw errors 2023-05-03 08:50:36 -03:00
Scroody
85669f0038 Fix: Default cursor not appearing when entering meeting. 2023-05-02 15:32:10 -03:00
Ramón Souza
f6ae122fd0
Merge pull request #17728 from ramonlsouza/fix-private-typing-indicator
fix: typing indicator does not work in private chat
2023-05-02 11:26:04 -03:00
Ramón Souza
fdaf5af5ce
Merge pull request #17759 from ramonlsouza/issue-17739
fix: Part of the camera border is not resizable when positioned below the chat
2023-05-02 11:25:49 -03:00
danielpetri1
72c0606a80 Fix current presentation indicator 2023-05-01 14:01:04 +00: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 Zawacki
f81652a4dd feature(reactions): Unify reaction messages with emoji status and pass it through akka 2023-04-28 11:47:15 -03:00
Lucas Fialho Zawacki
f18130c4f3 fix(reactions): Correct style after merge 2023-04-28 11:35:41 -03:00
André Castro
2c52c1a596
Merge branch 'v2.6.x-release' into I-17465 2023-04-27 19:25:56 -03:00
Ramón Souza
65e16518dc
Merge pull request #17676 from Scroody/fix-draggable-cameras-no-presentation
Fix: Draggable cameras when presentation minimized.
2023-04-27 19:16:01 -03:00
Ramón Souza
d082d0b044 fix sidebar resizing on cameradock 2023-04-27 18:59:13 -03:00
Lucas Fialho Zawacki
2a3e2d4993 feat(user-actions): enabled option in settings.yml 2023-04-27 18:37:18 -03:00