Commit Graph

33332 Commits

Author SHA1 Message Date
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
2be15611c1
Merge pull request #14775 from gustavotrott/gitignore-bsp-in-akka-projects
chore: Add .bsp directory to .gitignore
2022-04-07 16:42:10 -04:00
Gustavo Trott
f7d1b153a6 Keep blank line on end of gitignore files 2022-04-07 17:36:26 -03:00
Anton Georgiev
4188d254c3
Merge pull request #14765 from ramonlsouza/pr-14751
refactor: Notifications rework
2022-04-07 16:35:29 -04:00
Gustavo Trott
df1fc781f6 Add .bsp directory to .gitignore 2022-04-07 17:34:01 -03:00
Ramón Souza
1810e1728b
Update akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/RegisterUserReqMsgHdlr.scala
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
2022-04-07 17:31:32 -03: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
Anton Georgiev
7c709d9492
Merge pull request #14770 from JoVictorNunes/forEach-insteadof-map
fix: forEach instead of map
2022-04-07 13:41:04 -04:00
Joao Victor
9b6c43fa2b Use forEach instead of map 2022-04-07 14:06:51 -03:00
Anton Georgiev
9fdf4038be
Merge pull request #14769 from antobinary/drop-post-msg
fix: Drop old postMessage leftover
2022-04-07 11:34:33 -04:00
Anton Georgiev
3cee20c489 fix: Drop old postMessage leftover 2022-04-07 15:27:41 +00: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
6dea6a1d6e add user join/leave notifications - akka-apps 2022-04-07 09:41:36 -03:00
Ramon Souza
ec3b43b3bd add guest user notifications - akka-apps 2022-04-07 09:41:26 -03:00
Ramon Souza
28414c1a5a add lock settings notifications - akka-apps 2022-04-07 09:41:21 -03:00
Ramon Souza
d62b2d4f2e add user promote/demote notifications - akka-apps 2022-04-07 09:41:16 -03:00
Ramon Souza
d64d605ed6 add poll published notifications - akka-apps 2022-04-07 09:41:10 -03:00
Ramon Souza
921c563f7d add meeting mute/unmute notifications - akka-apps 2022-04-07 09:41:03 -03:00
Ramon Souza
5554a0fb41 add start/stop recording notifications - akka-apps 2022-04-07 09:40:56 -03:00
Ramon Souza
2edc102f80 move user message to all breakouts notification to akka 2022-04-07 09:40:13 -03:00
Ramon Souza
a80fe263a3 move breakout room ended notification to akka 2022-04-07 09:39:32 -03:00
Anton Georgiev
1768caf417
Merge pull request #14761 from bigbluebutton/remove-labs
chore: Delete html5-embed
2022-04-06 19:18:25 -04:00
Anton Georgiev
c627d70617
chore: Delete html5-embed
10 years old since last change; accessible via tags
2022-04-06 19:08:27 -04:00
Anton Georgiev
d3669def55
Merge pull request #14760 from JoVictorNunes/issue-14753
fix(presentation snapshot): function to get ref instead of ref directly
2022-04-06 15:44:07 -04: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
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
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
Anton Georgiev
8a66702b0b
Merge pull request #14741 from GuiLeme/Changes-in-Nokogiri-on-ruby
[Update to nokogiri] - Change in the Gemfile to run in the new version.
2022-04-06 08:07:59 -04:00
Joao Victor
dc16f83e82 Remove old NewGuestUser notification 2022-04-05 18:02:05 -03:00
Anton Georgiev
770da5b0c4
Merge pull request #14743 from ramonlsouza/initial-presentation-size-bugfix
fix: presentation does not appear if user joins shortly after meeting start
2022-04-05 15:16:36 -04:00
Guilherme Leme
021200a800 [Update to nokogiri] - Gemfile.lock 2022-04-05 14:41:03 -03:00
Ramon Souza
a1a8d68b4d fix presentation size 0 bug 2022-04-05 14:37:52 -03:00
Guilherme Leme
a5601c0c8f [Update to nokogiri] - Change in the Gemfile to run in the new version. 2022-04-05 14:23:17 -03:00