Commit Graph

32568 Commits

Author SHA1 Message Date
Bohdan Zhemelinskyi
d2b870e428 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into cleanConfig 2022-01-27 20:13:54 +00:00
Anton Georgiev
d8350f813c
Merge pull request #14221 from antobinary/merge-jan-27
build: drop xenial related files
2022-01-27 14:43:35 -05:00
Anton Georgiev
0c9de5746f build: drop xenial related files 2022-01-27 19:42:07 +00:00
Anton Georgiev
f3f01d02f7
Merge pull request #14220 from antobinary/merge-jan-27
Merge 2.4.2+ into 'develop'
2022-01-27 14:23:20 -05:00
Anton Georgiev
8237862117 build: resolve conflicts opts dependencies 2022-01-27 19:18:59 +00:00
Ramón Souza
457175dbba allow moderators to see disconnected users data 2022-01-27 18:45:04 +00:00
Anton Georgiev
46cb753c44 Merge branch 'dev-24-0125' of github.com:ramonlsouza/bigbluebutton into merge-jan-27 2022-01-27 16:03:12 +00:00
Bohdan Zhemelinskyi
fe91b448c2 Merge branch 'v2.4.x-release' of https://github.com/bigbluebutton/bigbluebutton into fixPhoneJoinPermission 2022-01-27 15:43:48 +00:00
Anton Georgiev
a387008733
Merge pull request #14216 from pedrobmarin/f-b-mbp
fix(build): missing bbb-pads
2022-01-27 08:44:54 -05:00
Ramón Souza
682892f930
Merge pull request #3 from gustavotrott/dev-24-0125-backend
Resolves conflicts on backend
2022-01-27 09:42:26 -03:00
Gustavo Trott
4e3711c1bd Resolve conflicts on backend marging 24->Develop 2022-01-27 08:29:14 -03:00
Gustavo Trott
759535eb62 Implements message to all breakout rooms 2022-01-26 17:02:38 -03:00
Pedro Beschorner Marin
0e01274eaf fix(build): missing bbb-pads
Add bbb-pads at bigbluebutton's build packages list
2022-01-26 15:14:27 -03:00
Anton Georgiev
8f3b2a7ed8
Merge pull request #14212 from ramonlsouza/fix-screenshare-regression
fix: screenshare position regression
2022-01-26 13:04:50 -05:00
Joao Victor
8d0038d438 remove unused message 2022-01-26 14:21:34 -03:00
Joao Victor
883c3b054c fix possible race condition 2022-01-26 14:16:10 -03:00
Ramón Souza
08e13d4fe0 fix screenshare position regression 2022-01-26 16:55:01 +00:00
hiroshisuga
2c3b180ee0
add error-catch 2022-01-26 07:46:20 +09:00
Ramón Souza
16cd3c4ebb Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125 2022-01-25 16:56:52 +00:00
Pedro Beschorner Marin
165cd54609
Merge pull request #14200 from antobinary/bbb-pads-conf
fix(config): correct path for bbb-pads.service
2022-01-25 13:46:59 -03:00
Anton Georgiev
6d8491f32e fix(config): correct path for bbb-pads.service 2022-01-25 16:35:45 +00:00
Anton Georgiev
116b99e469
Merge pull request #14159 from antonbsa/tests-reorganization-and-fix-selectors
test: Improves organization, fixes selectors and adds/improves tests
2022-01-25 08:54:32 -05:00
Anton Georgiev
814009a6d2
Merge pull request #14175 from ramonlsouza/issue-13963
fix: close sidebar panel for non-presenters
2022-01-25 08:52:32 -05:00
Anton Georgiev
71615bd477
Merge pull request #14186 from ramonlsouza/unused-remove
refactor: remove unused imports/variables
2022-01-25 08:52:14 -05:00
Anton Georgiev
0159683bfe
Merge pull request #14197 from pedrobmarin/f-p-adqta
fix(pads): add double quotes to APIKEY
2022-01-25 08:52:00 -05:00
Anton Georgiev
1af1fcbc9e
Merge pull request #14196 from pedrobmarin/f-p-aptbc
feat(pads): add pads to bbb-conf
2022-01-25 08:51:48 -05:00
Pedro Beschorner Marin
becce20fa5 fix(pads): add double quotes to APIKEY
JSON file format requires double quoted string data. Add quotes when configuring
ETHERPAD_API_KEY at bbb-pads build scripts.
2022-01-25 08:47:24 -03:00
Pedro Beschorner Marin
d7c9112578 feat(pads): add pads to bbb-conf
Add bbb-pads service to bbb-conf `status`, `start` and `stop` scripts.
2022-01-25 08:32:18 -03:00
Anton Georgiev
18a357455c
Merge pull request #12535 from pedrobmarin/r-w-rfmr
refactor!(webhooks): remove from main repository
2022-01-24 20:22:16 -05:00
Anton Georgiev
0cd8cb9d2f
Merge pull request #13916 from pedrobmarin/r-r-e-acea
refactor(etherpad): access control et al.
2022-01-24 20:20:15 -05:00
Anton Georgiev
5f4c5cdedb
Merge branch 'develop' into r-r-e-acea 2022-01-24 16:05:57 -05:00
Anton Georgiev
2e72946bc1
Merge pull request #14088 from zhem0004/fixPhoneBan
Fix: Removing phone users always bans them
2022-01-24 15:50:30 -05:00
Anton Georgiev
e905d08f3d
Merge pull request #14022 from danielpetri1/bbb-conf-checks
bbb-record: refactoring, more config checks, list-workflows option
2022-01-24 15:48:08 -05:00
Bohdan Zhemelinskyi
98c45a2167 Changes on feedback 2022-01-24 20:46:32 +00:00
Anton Georgiev
4a324ff7e6
Merge pull request #14193 from ramonlsouza/update-caniuse-lite
chore: update caniuse-lite
2022-01-24 15:26:52 -05:00
Ramón Souza
7ceb95fc99 update caniuse-lite 2022-01-24 20:17:22 +00:00
Anton Georgiev
a761f0177a
Merge pull request #14143 from frankemax/fix-userdata-injection
fix(userdata): consistent breakout room userdata
2022-01-24 15:10:38 -05:00
Anton Georgiev
16f5b104d3
Merge pull request #14112 from pedrobmarin/f-a-aaamcp
feat(api): allowRequestsWithoutSession as a meeting create param
2022-01-24 15:08:26 -05:00
Anton Georgiev
b8ba4b5c71
Merge pull request #14075 from gustavotrott/api-create-virtual-background-param
Add param to disable Virtual Backgrounds in API /create
2022-01-24 15:04:30 -05:00
Anton Georgiev
9b98a1de0a
Merge pull request #14192 from ramonlsouza/audit-fix
chore: update npm dependencies
2022-01-24 14:47:21 -05:00
Ramón Souza
c04818e27f update depedencies 2022-01-24 19:32:58 +00:00
Ramón Souza
f814348360 npm audit fix 2022-01-24 19:11:58 +00:00
Anton Georgiev
ecf597d1dd
Merge pull request #14189 from JoVictorNunes/issue-14188
fix: Add check to avoid undefined previous slide
2022-01-24 12:58:27 -05:00
Joao Victor
6b90f571e7 Add check to avoid undefined value 2022-01-24 14:52:24 -03:00
Pedro Beschorner Marin
90953c9679
Merge pull request #14063 from SashoVihVas/position-in-waiting-queue
Add position in waiting queue for guest users
2022-01-24 14:33:10 -03:00
Pedro Beschorner Marin
c9043655f1
Merge branch 'develop' into position-in-waiting-queue 2022-01-24 14:31:03 -03:00
Richard Alam
ce9774558b
Merge pull request #14187 from bigbluebutton/antobinary-patch-1
refactor: Switch user_action logs from debug to info
2022-01-24 12:09:22 -05:00
Anton Georgiev
14c7baef21
refactor: Switch user_action logs from debug to info 2022-01-24 12:02:16 -05:00
Bohdan Zhemelinskyi
a77eca86cd Added logic 2022-01-24 16:24:28 +00:00
Anton Georgiev
8760443c75
Merge pull request #14067 from SashoVihVas/develop-private-guest-lobby-messages
Add private guest lobby messages
2022-01-24 10:55:25 -05:00