Commit Graph

33616 Commits

Author SHA1 Message Date
Ramon Souza
0794f5188b Merge remote-tracking branch 'upstream/develop' into lgtm-mar15 2022-03-31 09:21:59 -03:00
Anton Georgiev
b52768bfd1
Merge pull request #14709 from antobinary/add-sox
chore: move sox dependency to Dockerfile
2022-03-31 08:21:35 -04:00
Anton Georgiev
84821f47bc chore: move sox dependency to Dockerfile 2022-03-31 01:39:46 +00:00
Anton Georgiev
3d9c8d0e4c
Merge pull request #14706 from ramonlsouza/issue-14689-25
fix: setSwapLayout happens after other components change its value
2022-03-30 17:05:03 -04:00
Anton Georgiev
a99b0f1b82
Merge pull request #14705 from ramonlsouza/issue-14689
fix: Screenshare is not displayed to new users, if autoSwapLayout=true
2022-03-30 17:04:16 -04:00
Ramon Souza
eee4fde845 prevent setSwapLayout race condition 2022-03-30 15:43:00 -03:00
Ramon Souza
92688ca93a prevent setSwapLayout race condition 2022-03-30 15:31:19 -03:00
Ramon Souza
375cf41498 fix smart layout invisible video bug 2022-03-30 15:30:39 -03:00
Anton Georgiev
d66c162669
Merge pull request #14704 from antobinary/merge-25-develop
chore: Merge 2.5 into develop
2022-03-30 14:21:35 -04:00
Anton Georgiev
478605b6b0 Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-develop 2022-03-30 18:19:28 +00:00
Ramon Souza
51726166c2 add moderator notification on breakout time update 2022-03-30 13:23:13 -03:00
Anton Georgiev
4ad4e8e7fa
Merge pull request #14668 from GuiLeme/issue-14335
[issue-14335]- Deprecate password on the endpoints.
2022-03-30 11:47:55 -04:00
Anton Georgiev
6f989b5c09
Merge pull request #14701 from gustavotrott/api-create-meetingExpire25
feat: Add meetingExpire params to API /create
2022-03-30 11:23:34 -04:00
Anton Georgiev
4b10030201
Merge pull request #14702 from antobinary/fs-build
build: drop net-tools from bbb-freeswitch-core
2022-03-30 11:22:49 -04:00
Anton Georgiev
5926217199 build: drop net-tools from bbb-freeswitch-core 2022-03-30 14:57:15 +00:00
Ramon Souza
6874156190 add messageDescription in notifications 2022-03-30 11:01:12 -03:00
Gustavo Trott
4730e4c6db Add params meetingExpireIfNoUserJoinedInMinutes and meetingExpireWhenLastUserLeftInMinutes to API 2022-03-30 10:58:16 -03:00
Anton Georgiev
ed1a68c89f
Merge pull request #14692 from gabriellpr/external-video-unmutable
fix(external-video): Viewers can now mute/unmute their view of external video
2022-03-30 09:56:32 -04:00
gabriellpr
7a476874a4 getmuted return modified 2022-03-30 10:46:04 -03:00
Anton Georgiev
92f463f5e7
Merge pull request #14700 from bigbluebutton/brsdev
fix: false positive when checking if bbb-web is running, run-dev.sh
2022-03-30 09:38:33 -04:00
Paulo Lanzarin
08c59a60b4
fix: false positive when checking if bbb-web is running, run-dev.sh
-a flag would list everything, including UNIX sockets, and then arbitrarily grep for 8090. That would lead to false positives.
Swap -an for -lt (only TCP sockets on LISTEN) so we can drop the extra LISTEN grep. 
Add an extra `:` to the port grep (avoid factoring things like tcp 18090)
2022-03-30 10:31:05 -03:00
Ramon Souza
41778cb959 filter all messages by meetingId 2022-03-30 10:15:47 -03:00
Guilherme Leme
247794ff45 [issue-14335] - Changes in review, the random password has been added if a null one is sent while creating the meeting to avoid crashes in old integrations. 2022-03-30 10:07:46 -03:00
Anton Georgiev
325f744c69
Merge pull request #14695 from bigbluebutton/rsclibjsx
fix: remove spurious console.log in base.jsx
2022-03-29 17:11:19 -04:00
Anton Georgiev
4f1575c233
Merge pull request #14694 from pedrobmarin/b-p-v3-4-0
build(playback): update to v3.4.0
2022-03-29 17:10:28 -04:00
Paulo Lanzarin
1fc6584697
fix: remove spurious console.log in base.jsx 2022-03-29 17:52:29 -03:00
Pedro Beschorner Marin
222517e773 build(playback): bump to v3.4.0
Accumulated changes:
 - https://github.com/bigbluebutton/bbb-playback/releases/tag/v3.3.0
 - https://github.com/bigbluebutton/bbb-playback/releases/tag/v3.3.1
 - https://github.com/bigbluebutton/bbb-playback/releases/tag/v3.4.0
2022-03-29 17:44:20 -03:00
Pedro Beschorner Marin
1949da3513 feat(playback): add theme toggle's locale
Reference: https://github.com/bigbluebutton/bbb-playback/pull/183
2022-03-29 17:42:07 -03:00
Anton Georgiev
23c91a8258
chore: change release to alpha.6 2022-03-29 16:34:05 -04:00
Anton Georgiev
4021051367
Merge pull request #14568 from ramonlsouza/meteor-261
chore: upgrade meteor to 2.6.1
2022-03-29 16:30:04 -04:00
Anton Georgiev
49960b09f7 build: change tag to v2022-03-29-bbb-25-meteor-261 2022-03-29 20:28:24 +00:00
Anton Georgiev
fc688f2038 Merge branch 'meteor-261' of github.com:ramonlsouza/bigbluebutton into meteor-261 2022-03-29 20:27:26 +00:00
Ramon Souza
4da4b8d7a9 Merge remote-tracking branch 'upstream/develop' into pr-issue-14493 2022-03-29 17:27:20 -03:00
Anton Georgiev
a51069e357
Merge pull request #14693 from antobinary/record-core-libs
build: move ruby-bundler libsystemd-dev to docker image
2022-03-29 16:22:12 -04:00
Anton Georgiev
9b370a84be
Merge pull request #14674 from ramonlsouza/issue-14673
fix: fullscreen instead of Exit Full Screen (presentation)
2022-03-29 16:12:38 -04:00
Anton Georgiev
2c90124869
Merge pull request #14690 from gustavotrott/fix-user-ejected-reconnecting
fix: Rejected user keep trying to reconnect
2022-03-29 16:10:51 -04:00
Anton Georgiev
ee9a0146a8 build: move ruby-bundler libsystemd-dev to docker image 2022-03-29 20:09:44 +00:00
gabriellpr
2330ad8a8f unmutable external video solved 2022-03-29 17:06:31 -03:00
Gustavo Trott
35ecbdbf80 Wait for user removal before kill connections 2022-03-29 16:08:34 -03:00
Anton Georgiev
0836351747
Merge pull request #14662 from danimo/recordplaybackfix
make bbb-record-core package install again on focal
2022-03-29 15:04:07 -04:00
Joao Victor
a6eefb4737 fix user feedback upload error message 2022-03-29 14:08:59 -03:00
Calvin Walton
97c0f51964 bbb-record-core: Restore systemd unit cwd to 'scripts' dir
The rap scripts might load or run some scripts using relative paths from
the scripts directory, so restore that.

Bundler automatically looks up in parent dirs to find the Gemfile, so
loading gems will work correctly.
2022-03-29 12:57:16 -04:00
Calvin Walton
c722b799be bbb-record-core: Use bundler deployment option
This makes the bundle install error out if the Gemfile.lock is out of
date (Gemfile was updated) rather than silently updating it during the
build.
2022-03-29 12:52:12 -04:00
Calvin Walton
db2d8efa0d bbb-record-core: Update systemd units to use bundler
Several scripts internally run bundler setup, so no explicit bundler
command is needed. For the others, start up using /usr/bin/bundle
(installed by ruby-bundler) to load the environment.
2022-03-29 12:41:27 -04:00
Anton Georgiev
01866b2c3e
Merge pull request #14686 from mariogasparoni/real-time-whiteboard-annotation
refactor(whiteboard): text tool updates
2022-03-29 11:59:36 -04:00
Calvin Walton
98dfb2789a bbb-record-core: Use bundler from ruby-bundler package 2022-03-29 11:28:02 -04:00
Calvin Walton
cbaae2c753 Update bbb-record-core dependencies.
Since gems are no longer being built during package install, dev
packages are no longer needed. Install the runtime libraries instead.

Drop the libxslt & libxml dependencies, since current nokogiri versions
used bundled copies of those libraries.
2022-03-29 11:06:00 -04:00
Arthurk12
420bd8b526 refactor(whiteboard): text tool updates
Makes the whiteboard text tool send annotation updates.
Partially reverts 40b18b0662.
2022-03-29 11:46:47 -03:00
Anton B
6eead03fb3 set dynamic steps by current settings 2022-03-29 10:53:07 -03:00
Anton Georgiev
2064601673
Merge pull request #14685 from ramonlsouza/issue-7579
fix: adjust chat area size
2022-03-29 09:29:27 -04:00