Commit Graph

32708 Commits

Author SHA1 Message Date
Anton Georgiev
f561099729 Merge branch 'jdk-17-upgrade' of github.com:himanshugoyal1065/bigbluebutton into test-java-11 2022-02-24 16:53:04 +00:00
Anton Georgiev
8e0fc7ddc0
Merge pull request #14451 from ramonlsouza/24-25-feb24
chore: Merge 2.4 into 2.5
2022-02-24 10:46:14 -05:00
Ramón Souza
138f4d64e4 Merge remote-tracking branch 'upstream/v2.4.x-release' into v2.5.x-release 2022-02-24 14:49:56 +00:00
Anton Georgiev
ae840d00eb
Merge pull request #14365 from JoVictorNunes/dashboard-user-details
feat(Dashboard): a new modal for displaying user details
2022-02-24 08:13:25 -05:00
Joao Victor
78fd2a2cfc Update user on JSON data update 2022-02-24 09:57:02 -03:00
Joao Victor
39e8ff5de4 Add activity score value in 'Activity Score' heading 2022-02-24 08:13:53 -03:00
Anton Georgiev
778db8a4f7
Merge pull request #14386 from ffdixon/libreoffice-remove-log4j
chore(bbb-libreoffice): Remove older log4j-1* files
2022-02-23 17:02:22 -05:00
Anton Georgiev
eeaa43f93b
format bbb-libreoffice/docker/Dockerfile and pass -f to all 2022-02-23 17:00:53 -05:00
Anton Georgiev
fb711e7748
Merge pull request #14447 from gustavotrott/fix-dashboard-user-demote
fix: Dashboard doesn't update user demote
2022-02-23 16:59:39 -05:00
Gustavo Trott
e4046dbe04 Update last Role of user in Dashboard 2022-02-23 18:42:34 -03:00
Joao Victor
fa64baebd7 Fix calculation of graphics in activity score table 2022-02-23 17:52:19 -03:00
Anton Georgiev
25f1588f10
Merge pull request #14427 from JoVictorNunes/issue-14362
fix(presentation): new message for presentation item status
2022-02-23 15:42:05 -05:00
Joao Victor
febd19d740 Fix cases of draw with most common answers 2022-02-23 17:40:13 -03:00
Joao Victor
aff0d4006e Fix text overflow in poll item 2022-02-23 17:08:47 -03:00
Joao Victor
fd77591db3 A lot of UI-related fixes 2022-02-23 14:38:29 -03:00
João Victor Nunes
4635f14bac
Change message text
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
2022-02-23 08:16:21 -03:00
Anton Georgiev
64fff099b9
Merge pull request #14439 from ramonlsouza/bbb-menu-position
Adjust dropdown menu position
2022-02-22 16:32:12 -05:00
Ramón Souza
4589ecb116 adjust bbbmenu position 2022-02-22 20:37:00 +00:00
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
ebc5eb142d
Merge pull request #14225 from GuiLeme/fix-record-playback-deploy-script
refactor(recording): Refactored record-and-playback's deploy script to work properly
2022-02-22 10:28:01 -05: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
Anton Georgiev
cbb195a228
Merge pull request #14422 from Tainan404/add-jsconfig
chore: Add jsconfig for bigbluebutton-html5/
2022-02-22 08:46:51 -05:00
Joao Victor
6b923a1279 Fix button chevron and webcam selector 2022-02-21 17:40:00 -03:00
Joao Victor
f13103ea7b New message for presentation item status 2022-02-21 15:01:55 -03:00
Tainan Felipe
e947133c80 Add jsconfig 2022-02-21 12:42:29 +00: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
Anton Georgiev
39277b9af5
Merge pull request #14404 from ramonlsouza/issue-14402
Add tooltips to user names in userlist
2022-02-18 11:36:38 -05:00
Ramón Souza
f332af10ba add tooltip to user names in userlist 2022-02-18 15:29:03 +00:00
Anton Georgiev
14cbcaf790
Merge pull request #14403 from bigbluebutton/antobinary-patch-1
fix: Typo in appy-lib #14398
2022-02-18 09:01:20 -05:00
Anton Georgiev
c930a7e48e
fix: Typo in appy-lib #14398
Backport of #14398 Thanks @sebastianberm
2022-02-18 09:00:54 -05:00
Anton Georgiev
0a2f44da2b
Merge pull request #14397 from pedrobmarin/f-p-asl
feat(playback): add shortcuts locale
2022-02-18 08:56:20 -05:00
Anton Georgiev
41164facaa
Merge pull request #14131 from Tainan404/remove-guest-attempt-limit
Remove guest attempts limit on guestWait endpoint
2022-02-18 08:52:27 -05:00