Commit Graph

33771 Commits

Author SHA1 Message Date
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
392fb4f863
Merge pull request #14792 from bigbluebutton/revert-14791-update-set-secret
Revert "Update securitySalt (shared secret) in bbb-web.properties"
2022-04-11 09:48:50 -04:00
Anton Georgiev
6a269428e5
Revert "Update securitySalt (shared secret) in bbb-web.properties" 2022-04-11 09:48:00 -04:00
Guilherme Leme
4627e39435 [issue-14749] - fix downloadable persistence. 2022-04-11 10:26:15 -03:00
Fred Dixon
0fb0ebf176
Merge pull request #14791 from ffdixon/update-set-secret
Update securitySalt (shared secret) in bbb-web.properties
2022-04-11 08:30:25 -04:00
Fred Dixon
b60e77500b Set securitySalt (shared secret) in bbb-web.properties 2022-04-11 07:25:48 -05:00
Anton Georgiev
df599d73c8
Merge pull request #14789 from antobinary/merge-25-dev
chore: Merge 2.5.x into develop
2022-04-08 21:07:35 -04: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
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
Max Franke
6b05e431dd feat(theme): add dark mode theme 2022-04-08 16:05:29 -03: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
gabriellpr
c3f17ca8d3 progress bar working on mobile 2022-04-08 15:39:05 -03: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
Ramon Souza
def29e3388 fix join screenshare 2022-04-08 11:45:17 -03:00
Guilherme Leme
3a93898af0 [issue-14749] - Refactored temporaryPresId format to not rely on UTF-8 encoding when sending the multipart/form-data content-type in futch method. 2022-04-08 11:28:47 -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
Joao Victor
dfa8797f97 Merge remote-tracking branch 'upstream/develop' into breakout-update 2022-04-07 18:01:30 -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
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 B
d3e9d85bc6 fix warnings, uninstall unused lib and move media folder into the core 2022-04-07 15:34:25 -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
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