Commit Graph

7673 Commits

Author SHA1 Message Date
Gustavo Trott
ecbfee26db Missing parts 2022-04-12 13:56:54 -03:00
Gustavo Trott
77a8aba1f5 Merge remote-tracking branch 'upstream/develop' into breakout-updated 2022-04-12 09:54:25 -03:00
Gustavo Trott
102eee3ba5 Backend portion of breakout Manage Users 2022-04-12 09:50:19 -03:00
Anton Georgiev
1500fb6a29 Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-dev 2022-04-09 00:55:25 +00:00
Anton Georgiev
33575e60e6 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into v2.5.x-release 2022-04-09 00:48:14 +00:00
Anton Georgiev
3afb57fa66
Merge pull request #14788 from ramonlsouza/merge-2425-apr08
chore: Merge 2.4 into 2.5
2022-04-08 20:37:32 -04:00
Ramon Souza
1c873bd8d6 Merge remote-tracking branch 'upstream/v2.4.x-release' into merge-2425-apr08 2022-04-08 17:30:21 -03:00
germanocaumo
cacba3c7e7 feat(html5): add meteor rtt as prometheus metric 2022-04-08 14:27:35 +00:00
Joao Victor
dfa8797f97 Merge remote-tracking branch 'upstream/develop' into breakout-update 2022-04-07 18:01:30 -03:00
Anton Georgiev
4188d254c3
Merge pull request #14765 from ramonlsouza/pr-14751
refactor: Notifications rework
2022-04-07 16:35:29 -04:00
Anton Georgiev
638b313896
Merge pull request #14773 from Tainan404/refactor-notes-viewing-mode
refactor: Refactor shared notes viewing mode
2022-04-07 15:29:41 -04:00
Anton Georgiev
54bfb1a44e
Merge pull request #14755 from Tainan404/remove-innerhtmls
refactor: Remove unnecessary dangerouslySetInnerHTML of the client
2022-04-07 15:28:54 -04:00
Tainan Felipe
3f05270c03 Merge remote-tracking branch 'upstream/v2.5.x-release' into refactor-notes-viewing-mode 2022-04-07 15:40:59 -03:00
Tainan Felipe
fd79d7e3d3 Refactor shared notes viewing mode 2022-04-07 15:35:24 -03:00
Anton Georgiev
052ed973cf
Merge pull request #14772 from ramonlsouza/issue-14745
fix: Closed caption button with style bug
2022-04-07 14:30:59 -04:00
Ramon Souza
cea86377cb fix cc icon styles 2022-04-07 15:14:12 -03:00
Ramon Souza
0a952b3c9d fix autoswaplayout bug 2022-04-07 14:09:52 -03:00
Joao Victor
9b6c43fa2b Use forEach instead of map 2022-04-07 14:06:51 -03:00
Anton Georgiev
cde5c0a5fd
Merge pull request #14756 from JoVictorNunes/issue-14740
fix(breakout invitation): pick users from state instead of props
2022-04-07 11:23:11 -04:00
Anton Georgiev
ebf8342627
Merge pull request #14767 from pedrobmarin/f-p-rocs
fix(pads): read-only content style
2022-04-07 10:11:19 -04:00
Anton Georgiev
03a7f2b3f0
Merge pull request #14764 from pedrobmarin/r-p-isc
refactor(pads): improve session creation
2022-04-07 10:08:17 -04:00
Pedro Beschorner Marin
5104a0d766 fix(pads): read-only content style
Set width to the inner div that will receive the pad's HTML content.
2022-04-07 10:57:27 -03:00
Ramon Souza
298a931179 adjust user join/leave and guest notifications 2022-04-07 10:42:26 -03:00
Pedro Beschorner Marin
307a6cb83c refactor(pads): improve session creation
Add a throttle control to avoid multiple create session calls in a short
period of time.
2022-04-07 10:26:59 -03:00
Ramon Souza
2edc102f80 move user message to all breakouts notification to akka 2022-04-07 09:40:13 -03:00
Joao Victor
a89c8eb0d0 Pass function to get svg ref instead of the ref itself 2022-04-06 16:37:11 -03:00
Joao Victor
5baea83a4d Pick users from state instead of props 2022-04-06 14:35:44 -03:00
Tainan Felipe
a77fee3479 Remove unused code in chat alert 2022-04-06 14:29:50 -03:00
Tainan Felipe
b62e9dc7d6 Add a simple way to show more than one description in modal confirmation 2022-04-06 14:27:05 -03:00
Joao Victor
60d2760705 Fix parentheses 2022-04-06 13:15:00 -03:00
Joao Victor
38053b8a28 Move layout info into Notification container + Fix translation on waiting user alert 2022-04-06 12:07:12 -03:00
Joao Victor
9a674c0df8 Merge remote-tracking branch 'upstream/develop' into breakout-update 2022-04-06 11:25:39 -03:00
Anton Georgiev
0d73bb3050
Merge pull request #14593 from ramonlsouza/issue-14382
feat: Notify users that recording is now on (in recordable session)
2022-04-06 10:02:59 -04:00
Anton Georgiev
dff8c4ee76
Update bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/notify/component.jsx
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
2022-04-06 10:02:48 -04:00
Ramon Souza
fcaf26d1e6 fix no presentation bug 2022-04-06 10:44:09 -03:00
Joao Victor
f5b9cc839c FormattedMessage rather than intl injection 2022-04-06 10:27:51 -03:00
Joao Victor
e1453f672e Remove old UserJoinedMeeting and UserLeftMeeting notifications 2022-04-06 10:21:49 -03:00
Joao Victor
dc16f83e82 Remove old NewGuestUser notification 2022-04-05 18:02:05 -03:00
Ramon Souza
a1a8d68b4d fix presentation size 0 bug 2022-04-05 14:37:52 -03:00
Joao Victor
43213bb573 Remove old UserPromotedToModerator and UserDemotedToViewer notifications 2022-04-05 11:16:30 -03:00
Joao Victor
ef8604088d Remove old HasPublishedPoll notification 2022-04-05 11:09:34 -03:00
Joao Victor
aa93b5832a Remove old MeetingMuted and MeetingUnmuted notifications 2022-04-05 11:05:13 -03:00
Joao Victor
b5765844bb Remove old lock setting notifications 2022-04-05 10:56:22 -03:00
Anton Georgiev
23ee038387
Merge pull request #14585 from danielpetri1/pads-shared-notes-upload
feat: Automatic upload of the shared notes as presentation
2022-04-05 08:06:24 -04:00
Anton Georgiev
a07d5e7969
Merge pull request #14687 from antonbsa/tests-check-settings
test: Handle file download and check current settings
2022-04-04 16:06:27 -04:00
Ramon Souza
71412ebd21 remove notify recording key from settings file 2022-04-04 16:56:01 -03:00
Ramon Souza
06da4e5e0d fix errors caused by develop merge 2022-04-04 16:52:43 -03:00
Ramon Souza
4c328bc4ea Merge remote-tracking branch 'upstream/develop' into issue-14382 2022-04-04 16:25:50 -03:00
Anton Georgiev
158d84fab8
Merge pull request #14602 from ramonlsouza/issue-10813
fix: Do not display data saving toggles when features are disabled
2022-04-04 14:19:08 -04:00
Anton Georgiev
c923bbd4b4
Merge pull request #14571 from JoVictorNunes/issue-14416
fix: prevent redirect after feedback of user
2022-04-04 10:55:19 -04:00