Commit Graph

33608 Commits

Author SHA1 Message Date
Ramón Souza
a80ead35db
Merge pull request #14844 from ramonlsouza/fix-undefined-user
fix: undefined user prop crash in userlist
2022-04-18 17:10:06 -03:00
Ramón Souza
1859568467
Merge pull request #14848 from antobinary/merge-dev-25
fix: add missing darkreader in package-lock.json
2022-04-18 17:09:17 -03:00
prlanzarin
e0bda16c06 refactor(audio): linter pass over local echo/volume meter
Address linter warnings before any further changes in that area
2022-04-18 20:05:26 +00:00
Anton Georgiev
d4215d4c18 fix: add missing darkreader in package-lock.json 2022-04-18 20:01:02 +00:00
Anton Georgiev
2f3fec03f2
Merge pull request #14847 from antobinary/merge-dev-25
chore: Merge BBB 2.5 into 'develop'
2022-04-18 15:52:22 -04:00
Anton Georgiev
e4a5477c83 Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-dev-25 2022-04-18 19:48:18 +00:00
Ramon Souza
749fa58744 fix undefined user condition 2022-04-18 15:02:43 -03:00
Anton Georgiev
22a4f702f8
Merge pull request #14842 from JoVictorNunes/issue-14801
[2.5] fix(Dashboard): apply charset=UTF-8 to csv data
2022-04-18 10:34:11 -04:00
Anton Georgiev
9b726d45f1
Merge pull request #14840 from ramonlsouza/remove-unused-apr18
refactor: remove unused imports/variables
2022-04-18 10:33:02 -04:00
Anton Georgiev
825cfc8d9f
Merge pull request #14666 from OneScreenSolutions/feat-poll-auto-options
feat: Feat poll auto options
2022-04-18 09:52:14 -04:00
Anton Georgiev
96bfc45c5d
Merge pull request #14841 from ramonlsouza/fix-expression-assignment
refactor: assignment in expression
2022-04-18 09:34:30 -04:00
Ramon Souza
90be7416d7 fix assignment in expression 2022-04-18 10:27:46 -03:00
Ramon Souza
be25044820 remove unused imports in breakout-room component + styles 2022-04-18 10:14:05 -03:00
Ramon Souza
18f42e538a remove unused imports/variable in base component 2022-04-18 10:09:55 -03:00
Joao Victor
bdb8ff9c1a fix: apply charset=UTF-8 to csv data 2022-04-18 09:47:14 -03:00
OneScreenSolutions
e29e0fdb07 added sidebarContentPanel condition and fixed drap and drop issue 2022-04-18 14:06:05 +05:00
Anton Georgiev
cbd4b68b33
chore: change release to beta.2 2022-04-14 17:32:31 -04:00
Anton Georgiev
e23888076b
Merge pull request #14671 from JoVictorNunes/issue-14659
fix(menu): update previous open dropdown on user list reordering
2022-04-14 17:31:02 -04:00
Anton Georgiev
9a8264ec6c
Merge pull request #14736 from prlanzarin/u25-wave-idea3
feat(audio): local echo test and audio energy meter
2022-04-14 17:07:28 -04:00
Anton Georgiev
21683e8ea6
Merge pull request #14832 from gustavotrott/remove-breakout-invitation-mode
refactor: Remove "Breakout room invitation"
2022-04-14 15:53:06 -04:00
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
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