Commit Graph

32630 Commits

Author SHA1 Message Date
Anton Georgiev
98e8a96f83
Merge pull request #14434 from prlanzarin/u25-pierre-d1
refactor(audio): remove duplicated loadBridges method definition
2022-02-22 15:03:46 -05:00
prlanzarin
adc13add67 refactor(audio): remove duplicated loadBridges method definition
Seems to have been introduced by a partial merge commit

There were a bunch of style changes introduced by that partial commit as well; I kept those changes to avoid introducing further conflicts between v2.4-2.5...
2022-02-22 13:42:20 -03:00
Anton Georgiev
f11469d5c2
Merge pull request #14428 from JoVictorNunes/issue-14424
fix(styles): button chevron and webcam selector
2022-02-22 09:53:21 -05:00
Anton Georgiev
508fdcc3db
Merge pull request #14432 from ramonlsouza/issue-14401
fix: remove hide-on-update behavior from tooltip component
2022-02-22 09:02:31 -05:00
Ramón Souza
6c099af1a0 remove hide-on-update behavior from tooltip component 2022-02-22 13:56:43 +00:00
Anton Georgiev
69095149dc
Merge pull request #14400 from MaximKhlobystov/25-test-adjustments
test: Playwright adjustments for 2.5
2022-02-22 08:47:32 -05:00
Joao Victor
6b923a1279 Fix button chevron and webcam selector 2022-02-21 17:40:00 -03:00
Fred Dixon
dff4bfde2f
Merge pull request #14415 from ffdixon/fix-bbb-fsesl-akka
Make bbb-pads dependent on bbb-web; fix permissions for bbb-fsesl-akka logs
2022-02-19 21:46:15 -04:00
Fred Dixon
9f27c9b36d Fix log permissions for bbb-fsesl-akka 2022-02-19 19:45:45 -06:00
Fred Dixon
c9f18cbdf6 Need bbb-pads to be dependent on bbb-web 2022-02-19 19:38:54 -06:00
Fred Dixon
7385715bdb
Merge pull request #14414 from ffdixon/pads-update
removed in favour of #14412
2022-02-19 21:06:22 -04:00
Fred Dixon
37e3667a62
Merge pull request #14412 from danimo/fix-pads
fix: set public.pads.url instead of public.note.url in bbb-conf
2022-02-19 21:05:45 -04:00
Fred Dixon
86c742137d removed in favor of #14412 2022-02-19 19:01:37 -06:00
Fred Dixon
a9820ac63a
Merge pull request #14413 from ffdixon/set-pads-url
Set public.pads.url for bbb-pads
2022-02-19 20:18:58 -04:00
Fred Dixon
a982aeaec8 Set public.pads.url for bbb-pads 2022-02-19 18:17:48 -06:00
Daniel Molkentin
75641f9bee fix: set public.pads.url instead of public.note.url in bbb-conf
partially fixes #14410
2022-02-19 17:44:42 +01:00
Anton Georgiev
f52376e594
chore: Update release to 2.5-alpha-2 2022-02-19 04:03:17 -05:00
Anton Georgiev
073a8cfcb7
Merge pull request #14408 from antobinary/akka-apps-build
build: Use $1 if no EPOCH in akka-apps version
2022-02-19 04:01:50 -05:00
Anton Georgiev
eb7c11acf6 build: Use $1 if no EPOCH in akka-fsesl version 2022-02-19 08:53:36 +00:00
Anton Georgiev
95d0f1b642 build: Use $1 if no EPOCH in akka-apps version 2022-02-19 08:51:40 +00:00
Anton Georgiev
60302d3e35
Merge pull request #14405 from antobinary/2.4.4-branch
Merge 2.4.4 into 2.5-alpha-1
2022-02-18 12:19:13 -05:00
Anton Georgiev
6a583e4e5a resolve 2.4.4 conflicts into 2.5 2022-02-18 16:53:42 +00:00
Maxim Khlobystov
6146971c40 Fixes for Playwright selectors + all 3 browsers used by default 2022-02-18 06:41:44 -05:00
Anton Georgiev
f86fd0fe80
Merge pull request #14392 from zhem0004/fixSystemdIn2.5
fix: change StartLimitAction to none
2022-02-17 13:21:18 -05:00
Anton Georgiev
838961de10
Merge pull request #14393 from antobinary/bbb-version-in-html5
build: Automatically set bbbServerVersion in settings.yml
2022-02-17 12:45:34 -05:00
Anton Georgiev
89bbddf254 chore: Enable displayBbbServerVersion in settings.yml 2022-02-17 17:21:54 +00:00
Anton Georgiev
db6941970c build: automatically set BBB version in settings.yml 2022-02-17 17:21:02 +00:00
Anton Georgiev
078702ea35
Merge pull request #14391 from bigbluebutton/client-build-in-settings.yml
build: Set bbb-html5 client built in settings.yml
2022-02-17 10:10:43 -05:00
Anton Georgiev
7c03e8d873
build: Set bbb-html5 client built in settings.yml
"html5ClientBuild: HTML5_CLIENT_VERSION"
2022-02-17 10:06:50 -05:00
Bohdan Zhemelinskyi
172cc02b0b changeStartLimitActionToNone 2022-02-17 15:05:18 +00:00
Anton Georgiev
eb9cea331f
Merge pull request #14389 from gustavotrott/sbt-force-update
fix: Force update of common-message and common-web libs
2022-02-17 09:11:05 -05:00
Gustavo Trott
def7fc65c3 Update common-message and common-web using sbt update 2022-02-17 10:58:41 -03:00
Anton Georgiev
886b7088e0
Merge pull request #14388 from bigbluebutton/antobinary-patch-3
chore: updated bbbServerVersion to 2.5
2022-02-17 08:55:04 -05:00
Anton Georgiev
0a3f879bd8
chore: updated bbbServerVersion to 2.5 2022-02-17 08:54:17 -05:00
Anton Georgiev
4ba0078340
Merge pull request #14281 from gustavo-em/version_in_client
feat: (Optional) Showing BBB version in About modal
2022-02-17 08:47:14 -05:00
Fred Dixon
6a26610a5f
Merge pull request #14387 from ffdixon/remove-shell-permissions
Disable login for freeswitch and meteor users
2022-02-16 18:56:30 -04:00
Fred Dixon
5b7a261148 Disable login for freeswitch and meteor users 2022-02-16 16:50:58 -06:00
Anton Georgiev
2df3382bda
Merge pull request #14307 from bigbluebutton/antobinary-patch-1
build: Node 16 for SFU, NPM 8.4.1, image tag update for BBB 2.5
2022-02-16 16:11:30 -05:00
Anton Georgiev
2d3c12def3
Merge pull request #14264 from GuiLeme/issue-14014
Created endpoint to insert file into presentation.
2022-02-16 15:10:12 -05:00
Anton Georgiev
75983c6646
Merge pull request #14377 from gustavotrott/build-scripts-clear-jar-cache
(build) Clear cache before publish common-message and common-web
2022-02-16 09:06:49 -05:00
Gustavo Trott
25210738e5 Clear cache of common-message and common-web before publish 2022-02-16 10:59:32 -03:00
Anton Georgiev
9f9184c749
Merge pull request #14368 from gustavotrott/soffice-docker-set-timeout
fix: Use the config officeToPdfConversionTimeout in the Office conversion Docker
2022-02-16 08:46:42 -05:00
Gustavo Trott
6acc077699 Truncate timeout longer than 3 digits, to avoid sudoers problem 2022-02-16 10:28:35 -03:00
Gustavo Trott
8a1e527da4 Add timeout param to Etherpad sudoers command 2022-02-16 10:01:57 -03:00
Gustavo Trott
7c128ce7d4 Adds soffice timeout to build script 2022-02-16 09:51:44 -03:00
Paulo Lanzarin
8a5039cddc
Merge pull request #14371 from bigbluebutton/sfu270a8
build: bump bbb-webrtc-sfu to 2.7.0-alpha.8
2022-02-15 19:00:03 -03:00
Paulo Lanzarin
9281ed1174
build: bump bbb-webrtc-sfu to 2.7.0-alpha.8 2022-02-15 18:56:08 -03:00
Anton Georgiev
52e302c28a
Merge pull request #14370 from bigbluebutton/antobinary-patch-2
fix(FS): Allow patch with different whitespace
2022-02-15 15:53:00 -05:00
Anton Georgiev
023455575f
fix(FS): Allow patch with different whitespace 2022-02-15 15:47:28 -05:00
Anton Georgiev
7db0de32db
Merge pull request #14367 from ramonlsouza/issue-3672
refactor: create 'common' folder for all reusable components
2022-02-15 13:36:51 -05:00