BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,749 Commits 13 Branches 260 Tags 1.1 GiB
39e76da995
Commit Graph

33749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
b61ea322e0
Merge pull request #14835 from antobinary/meteor271 
chore: bump up version of npm async
 2022-04-14 15:40:49 -04:00
Pedro Beschorner Marin
a21de5e5b7 fix(layout): enforce data type 
Make sure the broadcasted payload data matches the message body's data
types.
 2022-04-14 19:40:19 +00:00
Anton Georgiev
25b567aadc chore: bump up version of async 2022-04-14 19:39:00 +00:00
Anton Georgiev
272e985608
Merge pull request #14834 from antobinary/meteor271 
revert: switch package-lock.json back to "lockfileVersion": 1
 2022-04-14 15:38:33 -04:00
Lucas Zawacki
7a5086cde8 fix(layout): Remove stray code from merge and fix indentation 2022-04-14 19:22:21 +00:00
Gustavo Trott
9ceed22337
Merge branch 'develop' into remove-breakout-invitation-mode 2022-04-14 16:17:04 -03:00
Anton Georgiev
4fdbf8c575
Merge pull request #14825 from gustavotrott/fix-breakout-user-ejected 
fix: breakout window not closing when user is ejected
 2022-04-14 14:56:20 -04:00
Anton Georgiev
c00b8f5fd9
Merge pull request #14829 from ramonlsouza/issue-6244 
feat: Confirm dialog on clear all annotations
 2022-04-14 14:55:27 -04:00
Anton Georgiev
e4f4b7577e
Merge pull request #14831 from JoVictorNunes/logo-increase 
style: increase logo area size to 3rem
 2022-04-14 14:53:11 -04:00
Anton Georgiev
bc1e4fd1a3
Merge pull request #14830 from ramonlsouza/enable-drag-drop-poll 
chore: Enable drag and drop polls by default
 2022-04-14 14:52:43 -04:00
Lucas Zawacki
378d0f18a0 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into develop-bbb 2022-04-14 18:48:02 +00:00
Joao Victor
3d509baa30 fix: logo area size 2022-04-14 14:53:28 -03:00
Gustavo Trott
70ee42237c Remove past invitation mode 2022-04-14 14:38:14 -03:00
Ramon Souza
e4c585ac9a enable drag and drop polls by default 2022-04-14 13:57:23 -03:00
Ramon Souza
5b52665cd2 add confirmation modal to clear all annotations whiteboard action 2022-04-14 10:54:53 -03:00
Gustavo Trott
1188f6538a
Merge branch 'develop' into fix-breakout-user-ejected 2022-04-14 10:03:34 -03:00
Anton Georgiev
3ce6dbf997
Merge pull request #14665 from JoVictorNunes/breakout-update 
feat: move users among breakouts
 2022-04-14 08:22:49 -04:00
Anton Georgiev
11f879be87 chore: switch package-lock.json back to "lockfileVersion": 1 2022-04-13 23:40:42 +00:00
Lucas Zawacki
e88e10b99e feat(layout): Fix propagation after merge with 2.6 2022-04-13 22:15:21 +00:00
Lucas Zawacki
83847a21aa Merge branch 'v2.5.x-release-Layouts' of github.com:lfzawacki/bigbluebutton into develop-bbb 2022-04-13 21:08:32 +00:00
Anton Georgiev
ec4bb8822c
Merge pull request #14824 from antobinary/merge-25-dev 
chore: Merge BBB 2.5 into develop
 2022-04-13 17:00:21 -04:00
Anton Georgiev
aaef76cd2e Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-dev 2022-04-13 20:58:02 +00:00
Gustavo Trott
b6a1ba9f93 Close breakout when user was removed 2022-04-13 17:53:10 -03:00
Anton Georgiev
6d48e66048
Merge pull request #14774 from antonbsa/fix-test-warnings 
test: Fix warnings
 2022-04-13 15:14:45 -04:00
Anton Georgiev
dd97ed5b5b
Merge pull request #14628 from GuiLeme/issue-14304 
Implementation to read files from `/etc/bigbluebutton/` and override default configs.
 2022-04-13 14:20:51 -04:00
Ramon Souza
0b26f066e0 change captions position to not depend on presentation 2022-04-13 15:10:40 -03:00
João Victor Nunes
f32208ec59
Merge pull request #2 from gustavotrott/breakout-updated 
fix: Dont remove invite of free rooms
 2022-04-13 14:26:55 -03:00
Gustavo Trott
725bed6797 Small fixes 2022-04-13 14:22:02 -03:00
Anton Georgiev
8e81225937
Merge pull request #14822 from antobinary/npm 
chore: Drop .dockerignore and docker-entrypoint.sh files #14814
 2022-04-13 13:20:41 -04:00
Anton Georgiev
c808f1f1dd chore: Drop .dockerignore and docker-entrypoint.sh files #14814 2022-04-13 17:17:08 +00:00
Anton Georgiev
7f986660e4
Merge pull request #14821 from gustavo-em/mobile_translations2 
refactor: Edit mobile translations (WIP)
 2022-04-13 12:54:10 -04:00
gustavo-em
2f6fe788a1 ajusts 2022-04-13 13:44:23 -03:00
gustavo-em
f40fcc1696 translations to mobile app 2022-04-13 13:13:38 -03:00
prlanzarin
bae731e59e fix(audio): PC loopback workaround for local echo in Chrome 
Works around the fact that Chrome doesnt have AEC on streams that dont go through PCs
 2022-04-13 14:37:39 +00:00
Anton Georgiev
ec6f5691c9
Merge pull request #14799 from Tainan404/fix-notes-showing-text 
fix(notes): Fix notes display order
 2022-04-13 08:50:55 -04:00
prlanzarin
c9eeffb71e fix(audio): guarantee audio settings devices are present and labelled 
For scenarios where streams are produced in AudioSettings (local echo,
volume meter), force gUM resolution before devices are enumerated.
This effectively guarantees that all devices are present, labelled and
with deviceIds.
 2022-04-12 21:33:17 +00:00
Anton Georgiev
04f5d30e98
Merge pull request #14815 from antobinary/drop-obsolete-dockerfiles 
chore: update package-lock.json for lockfileVersion: 2
 2022-04-12 16:45:36 -04:00
Anton Georgiev
05baa9b19c chore: update package-lock.json for lockfileVersion: 2 2022-04-12 20:41:38 +00:00
Anton Georgiev
4a7c2aae16
Merge pull request #14814 from antobinary/drop-obsolete-dockerfiles 
chore: Drop obsolete Dockerfiles
 2022-04-12 16:37:00 -04:00
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
João Victor Nunes
9ec06177c1
Merge pull request #1 from gustavotrott/breakout-updated 
Move user among brekout rooms - Backend part
 2022-04-12 14:25:45 -03:00