Commit Graph

33555 Commits

Author SHA1 Message Date
Anton Georgiev
13bed65baf chore: drop obsolete Dockerfile from BBB 2022-04-12 20:34:28 +00:00
Anton Georgiev
c38ce37459 chore: drop labs/docker 2022-04-12 20:33:13 +00:00
Anton Georgiev
aa333ebf25
Merge pull request #14813 from antobinary/servlet
fix: Adjust property path for grails session.cookie.secure
2022-04-12 16:31:59 -04:00
Anton Georgiev
8a75e5cc7a fix: Adjust property path for grails session.cookie.secure 2022-04-12 20:28:07 +00:00
Anton Georgiev
dd8ac845d2
Merge pull request #14797 from JoVictorNunes/chat-time-alignment
fix: chat message time alignment
2022-04-12 16:02:28 -04:00
Anton Georgiev
37de853bf5
Merge pull request #14812 from ramonlsouza/locales25-apr12
chore: Pulled the latest 2.5 HTML5 locales from Transifex
2022-04-12 16:02:07 -04:00
Localization Server
763d8edd55 chore: Pulled the latest 2.4 HTML5 locales from Transifex 2022-04-12 16:43:08 -03:00
Joao Victor
911edbf9f5 Rebase to 2.5 2022-04-12 16:26:13 -03:00
Anton Georgiev
edeb6c1c50
Merge pull request #14809 from ramonlsouza/24-25-merge-apr12
chore: Merge 2.4 into 2.5
2022-04-12 15:22:04 -04:00
Ramon Souza
7a57344177 Merge remote-tracking branch 'upstream/v2.4.x-release' into 24-25-merge-apr12 2022-04-12 14:46:13 -03:00
Anton Georgiev
5f91a3ab86
Merge pull request #14808 from ramonlsouza/issue-14748
Localize keys in shortcut modal
2022-04-12 13:18:33 -04:00
Ramon Souza
7735abb16e localize keys in shortcut modal 2022-04-12 13:49:10 -03:00
Anton Georgiev
96c2fc9d86
Merge pull request #14734 from JoVictorNunes/issue-14721
fix: link sanitizing in welcome message
2022-04-12 10:36:59 -04:00
Anton Georgiev
47eb51fdb7
Merge pull request #14802 from GuiLeme/nokogiri-update-1.13.4
chore: [nokogiri-update] - Update nokogiri to version 1.13.4+
2022-04-12 10:25:45 -04:00
Guilherme Leme
0319ecf371 [nokogiri-update] - Update of nokogiri to version 1.13.4+ 2022-04-12 11:07:59 -03:00
Tainan Felipe
292d39c773 Fix notes showing text in wrong order 2022-04-11 17:43:21 -03:00
Anton Georgiev
bc823b84e0
Merge pull request #14779 from GuiLeme/issue-14749
fix(presentation) - Refactored `temporaryPresId` format to accept german umlauts
2022-04-11 16:10:07 -04: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
ee4af7730e
Merge pull request #14780 from ramonlsouza/i-14689
fix: Screenshare is not displayed to new users, if autoSwapLayout=true
2022-04-11 13:48:20 -04:00
Anton Georgiev
f761391697
Merge pull request #14796 from ramonlsouza/issue-14790
fix: Incorrect position of the microphone icon in the webcam box in RTL - BBB v2.4.5
2022-04-11 13:46:18 -04:00
Ramon Souza
1c3d29daa1 adjust video list icon in rtl 2022-04-11 14:40:37 -03: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
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
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
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
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