Commit Graph

27152 Commits

Author SHA1 Message Date
Anton Georgiev
e4e4446633
Merge pull request #9999 from antobinary/merge-2.2-into-2.3-july-6
Merge 2.2.19 into 2.3
2020-07-07 11:22:19 -04:00
Anton Georgiev
b0e1dc8378 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-2.3-july-6 2020-07-07 14:35:34 +00:00
Anton Georgiev
420f8bf0a4 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-2.3-july-6 2020-07-07 14:13:58 +00:00
Anton Georgiev
4321b4c967
Merge pull request #9971 from pedrobmarin/skip-norecord
Skip recording process step for norecord meetings
2020-07-06 11:17:13 -04:00
Fred Dixon
7d42aa0ea6
Merge pull request #9578 from znerol-forks/feature/develop/config-support-default-server-name
bbb-conf: respect underscore in nginx server_name
2020-07-05 16:02:52 -04:00
Fred Dixon
a6eda3da91
Merge pull request #9924 from prlanzarin/upstream-2.2-webhooks-timeout
bbb-webhooks: add a timeout configuration to be used on POST requests
2020-07-05 16:01:19 -04:00
Fred Dixon
1da679a9ad
Merge pull request #9923 from kepstin/rec-fixes
Recording bugfixes for presentation format
2020-07-05 16:00:42 -04:00
Fred Dixon
2d88c8d517
Merge pull request #9685 from KDSBrowne/dev2.3-minimize-presentation
Make presentation area not visible when minimized
2020-07-03 13:50:55 -04:00
Fred Dixon
22f88bf8d0
Merge pull request #9977 from tdjac0bs/bbb_libreoffice_container
Detach libreoffice from bbb-web ( running as a docker container )
2020-07-02 16:07:58 -04:00
Tiago Jacobs
9c6daad83c Improve uninstall scripts 2020-07-02 16:20:36 -03:00
Tiago Jacobs
daea7328ad Add scripts for install/uninstall ( and service scripts ) 2020-07-02 16:01:37 -03:00
Pedro Beschorner Marin
44fc68c07c Skip recording process step for norecord meetings 2020-07-01 12:33:41 -03:00
Pedro Beschorner Marin
526f79e8f2 Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop 2020-06-30 18:15:18 -03:00
KDSBrowne
296092739c Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into dev2.3-minimize-presentation 2020-06-30 20:54:59 +00:00
Anton Georgiev
ec94b0f781
Merge pull request #8888 from pedrobmarin/fix-mod-webcams
Fix webcamsOnlyForModerator
2020-06-30 16:19:15 -04:00
Anton Georgiev
a2142c9006
Merge pull request #9963 from antobinary/add-url-to-logs
Added clientURL to client logs
2020-06-30 15:59:39 -04:00
Anton Georgiev
0a399af81f add clientURL to logs from client 2020-06-30 15:18:01 -04:00
Fred Dixon
175a23e5ad
Merge pull request #9962 from ffdixon/update-bbb-conf-1
Ensure ESL password is updated
2020-06-30 13:19:21 -04:00
Fred Dixon
db9ed99ea7 Ensure ESL password is updated 2020-06-30 12:17:12 -05:00
Anton Georgiev
f54e9ffe37
Merge pull request #9929 from daminebenq/audio-and-webcam-autotests-fix
fixes webcam and audio automated tests
2020-06-30 08:33:13 -04:00
Anton Georgiev
0f54dfdcb8
Merge pull request #9949 from antobinary/decouple-mute-unmute
Prevent 'unmute' calls for others caused by incorrect state
2020-06-26 16:07:35 -04:00
Anton Georgiev
e22856d29e prevent triggers of unmute others caused by incorrect state 2020-06-26 18:51:01 +00:00
Fred Dixon
fda9d98cee
Merge pull request #9941 from bigbluebutton/dependabot/bundler/record-and-playback/core/rack-2.2.3
Bump rack from 2.1.1 to 2.2.3 in /record-and-playback/core
2020-06-25 21:23:56 -04:00
dependabot[bot]
151de8f375
Bump rack from 2.1.1 to 2.2.3 in /record-and-playback/core
Bumps [rack](https://github.com/rack/rack) from 2.1.1 to 2.2.3.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.1.1...2.2.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-26 01:19:32 +00:00
Mohamed Amine Ben Salah
9cf4b71605 fixes webcam and audio automated tests 2020-06-24 16:51:20 -03:00
prlanzarin
440fe5c57f bbb-webhooks: add a timeout configuration to be used on POST requests
Added the new config requestTimeout (and env var REQUEST_TIMEOUT). It is piped to the request module POST operation to avoid clogging the queue when there are no responses to hooks or the HTTPS socket connection cant be established
2020-06-24 18:03:55 +00:00
Calvin Walton
3d800b68f1 Fix generation of fallback images if the presentationName contains spaces 2020-06-24 12:12:19 -04:00
Anton Georgiev
40465e7c00
Merge pull request #9922 from daminebenq/force-english-browser-puppeteer
force english use in puppeteer
2020-06-24 12:10:36 -04:00
Calvin Walton
b4456e323a Skip copying presentation thumbnails if they don't exist 2020-06-24 11:42:58 -04:00
Calvin Walton
26f5450245 Fix removing reconnect indicator from usernames when counting participants 2020-06-24 11:23:59 -04:00
Mohamed Amine Ben Salah
e59dcd336a force english use in puppeteer 2020-06-24 12:18:35 -03:00
Fred Dixon
fdaf29ad85
Merge pull request #9919 from ffdixon/update-default-pdf
Update default pdf
2020-06-24 09:37:15 -04:00
Fred Dixon
dd29a0d9a1 Bump to update bbb-webrtc-sfu 2020-06-24 08:36:19 -05:00
Fred Dixon
1582625925 Thicken the lines on the first page 2020-06-24 08:35:53 -05:00
Anton Georgiev
95b5602c3d
Merge pull request #9907 from jfsiebel/bbb-conf-guest-policy
Remove warning about unsupported defaultGuestPolicy in HTML5 client
2020-06-23 12:58:09 -04:00
Anton Georgiev
8bab72d809
Resolve conflict after merging 2.2 into 2.3 2020-06-23 11:05:07 -04:00
Joao Siebel
3896d0cb5a Remove warning about unsupported defaultGuestPolicy in HTML5 client 2020-06-23 12:01:26 -03:00
Anton Georgiev
fa7027ecf7
Merge pull request #9900 from bigbluebutton/revert-9780-fix-audio-reconnect-2.2
Revert "Improve audio reconnection for muted users for 2.2"
2020-06-22 16:29:36 -04:00
Anton Georgiev
ff1357cbbd
Revert "Improve audio reconnection for muted users for 2.2" 2020-06-22 16:28:22 -04:00
Fred Dixon
6fc4dbae64
Merge pull request #9897 from bigbluebutton/improve-end-meeting-text
Make end meeting more clear
2020-06-22 10:55:14 -04:00
Fred Dixon
86c6451bcc
Make end meeting more clear 2020-06-22 10:54:23 -04:00
Anton Georgiev
d40f56c657
Merge pull request #9896 from KDSBrowne/unread-note-placement
Fix shared note unread indicator placement
2020-06-22 10:18:38 -04:00
KDSBrowne
c47ff6026d fix position of shared note unread indicator 2020-06-22 13:48:52 +00:00
Anton Georgiev
dfbc1ef9b4
Merge pull request #9895 from jfsiebel/merge-2.2-06-2020
Merge 2.2 into develop
2020-06-22 08:59:26 -04:00
Joao Siebel
9981b021ef Merge remote-tracking branch 'upstream/develop' into merge-2.2 2020-06-22 09:00:43 -03:00
Anton Georgiev
aed4d648a9
Merge pull request #9780 from Tainan404/fix-audio-reconnect-2.2
Improve audio reconnection for muted users for 2.2
2020-06-19 16:58:55 -04:00
Anton Georgiev
16189780c8
Update bigbluebutton-html5/imports/ui/services/audio-manager/index.js 2020-06-19 16:58:41 -04:00
Anton Georgiev
8a5f201c98
Update bigbluebutton-html5/imports/api/voice-users/server/methods/muteToggle.js 2020-06-19 16:58:33 -04:00
Anton Georgiev
7a04ac0355
Update bigbluebutton-html5/imports/api/voice-users/server/methods/muteToggle.js 2020-06-19 16:58:24 -04:00
Anton Georgiev
0ac1773e3a
Merge pull request #9888 from Tainan404/listener-for-voice-user-22
Add a listener to voice user ejecting user from audio on socket disconnection
2020-06-19 16:54:22 -04:00