Commit Graph

33312 Commits

Author SHA1 Message Date
Guilherme Leme
0319ecf371 [nokogiri-update] - Update of nokogiri to version 1.13.4+ 2022-04-12 11:07:59 -03:00
Anton Georgiev
5a4f63a7e2
Merge pull request #14798 from antobinary/fred-conf
fix(conf): setip should not wipe out existing properties
2022-04-11 15:17:34 -04:00
Anton Georgiev
6f554e9776 fix(conf): setip should not wipe out existing properties 2022-04-11 19:07:11 +00:00
Anton Georgiev
547ca21622
Merge pull request #14795 from antobinary/fred-conf
fix(bbb-conf): Update securitySalt (shared secret) in bbb-web.properties
2022-04-11 14:45:55 -04:00
Anton Georgiev
243f8ec70a
Merge pull request #14782 from pedrobmarin/c-p-v3-4-1
chore(playback): v3.4.1
2022-04-11 13:48:59 -04:00
Anton Georgiev
1d495968dc
Merge pull request #14793 from ramonlsouza/issue-14762
Enable sidebar resize in media area of 'focus on' layouts
2022-04-11 13:16:52 -04:00
Ramon Souza
283c21e4ab enable sidebar resize in media on 'focus on' layouts 2022-04-11 13:48:46 -03:00
Anton Georgiev
ec1893ba10 chore: Fix typo in bigbluebutton-config/bin/bbb-conf 2022-04-11 15:40:42 +00:00
Anton Georgiev
0275b8710b
Merge pull request #14787 from Arthurk12/camera-cancellable-button-2.5
refactor(webcam): cancellable button
2022-04-11 10:17:50 -04:00
Fred Dixon
c73943471f Set securitySalt (shared secret) in bbb-web.properties 2022-04-11 13:54:51 +00:00
Anton Georgiev
f6c66cc4ea
Merge pull request #14777 from pedrobmarin/c-p-v1-1-0
chore(pads): v1.1.0
2022-04-08 20:40:17 -04: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
Anton Georgiev
35998bc68a
Merge pull request #14781 from germanocaumo/more-prom-metrics
refactor(prom-html5) More prometheus metrics
2022-04-08 16:20:40 -04:00
Arthurk12
f2d5e7af2c refactor(webcam): cancellable button
Makes it possible to cancel webcam sharing while connecting.
Simplifies button state logic.
2022-04-08 18:54:47 +00:00
Pedro Beschorner Marin
675c8f55c0 chore(playback): v3.4.1
Style changes and dependencies updated.

https://github.com/bigbluebutton/bbb-playback/pull/189
2022-04-08 13:46:02 -03:00
germanocaumo
cacba3c7e7 feat(html5): add meteor rtt as prometheus metric 2022-04-08 14:27:35 +00:00
germanocaumo
640fe57a26 fix(html5): rename stream-cursor prom metric
Removes meetintId info from the event name in prometheus metric to better concur with other events.
2022-04-08 14:22:29 +00:00
germanocaumo
a04fbc56e1 feat(html5): add error logs and redis prometheus metrics
New config: settings.private.prometheus.collectRedisMetrics disabled by default
2022-04-08 14:21:55 +00:00
Pedro Beschorner Marin
b1d33ebc92 chore(pads): v1.1.0
The new `bbb-pads` version includes an extra layer of fault tolerance
upon repeated command events that trigger Etherpad's API calls.

Issue reference https://github.com/bigbluebutton/bigbluebutton/issues/14757

https://github.com/bigbluebutton/bbb-pads/releases/tag/v1.1.0
2022-04-08 10:02:02 -03: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
Gustavo Trott
df1fc781f6 Add .bsp directory to .gitignore 2022-04-07 17:34:01 -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
Anton Georgiev
72f1b66e6e
Merge pull request #14771 from ramonlsouza/issue-14766
fix: "Autoswaplayout: true" doesn't work as expected
2022-04-07 13:39:34 -04: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
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
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
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
Anton Georgiev
29b550c9f2
Merge pull request #14752 from ramonlsouza/issue-14750
fix: Presentation sometimes starts minimized (2.4.6)
2022-04-06 10:18:58 -04:00
Ramon Souza
fcaf26d1e6 fix no presentation bug 2022-04-06 10:44:09 -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
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