Commit Graph

26950 Commits

Author SHA1 Message Date
Anton Georgiev
8d27ec90bb
Merge pull request #9845 from lkiesow/external-video-sharing-note
Update Note About Sharing External Video
2020-06-16 08:46:12 -04:00
Lars Kiesow
91e629b453
Update Note About Sharing External Video
This patch updates the note about which external videos can be shared
by looking at what react-player supports. Most notably, external video
URLs are added.

This also fixes the misspelled name of Dailymotion.
2020-06-16 00:59:16 +02:00
Fred Dixon
09eb8a6da4
Merge pull request #9843 from bigbluebutton/ffdixon-patch-3
Update minimist to latest version
2020-06-14 17:03:10 -04:00
Fred Dixon
ae19bd0ed2
Update minimist to latest version 2020-06-14 17:02:13 -04:00
Fred Dixon
ccf42b0a67
Merge pull request #9836 from lkiesow/html5-camera-profile-docs
[HTML5 Client] Camera Profile Documentation
2020-06-13 19:00:57 -04:00
Lars Kiesow
f1763cede6
[HTML5 Client] Camera Profile Documentation
This patch adds a short comment block to the HTML5 client's
configuration file explaining the options available for the camera
profiles. Having this in the configuration file helps as a quick
reference and means that administrators do not need to find external
sources of information.
2020-06-14 00:37:59 +02:00
Fred Dixon
f6d9f9e2b0
Merge pull request #9414 from BenjaminBeichler/fix-thumbnail-lti-tool
fix broken thumbnail display in LTI-plugin
2020-06-11 17:59:34 -04:00
Anton Georgiev
18bb82f764
Merge pull request #9765 from cherouvim/patch-1
Typo fix on kurento error message.
2020-06-04 12:02:41 -04:00
Ioannis Cherouvim
15b62f9427
Typo fix on kurento error message. 2020-06-04 10:51:50 +03:00
Anton Georgiev
3a9173297b
Merge pull request #8502 from Fenn-CS/secure-gradle-source
http => https to prevent 403 access denied during gradle download
2020-05-28 16:46:43 -04:00
Anton Georgiev
9b5263e8ce
Merge pull request #9042 from basisbit/patch-2
add missing bbb-restart-kms script which was added to 2.2.3 but is missing in the repo
2020-05-28 16:24:27 -04:00
Anton Georgiev
1a7c07e380
Merge pull request #9113 from sualko/feat/html5/settings
add env to specify settings location
2020-05-28 16:21:25 -04:00
Anton Georgiev
56e16d79a3
Merge pull request #9251 from elor/fix-voicebridge-collision
Fix voiceBridge collision (Issue #9024)
2020-05-28 16:17:59 -04:00
Anton Georgiev
1c6841dd1f
Merge pull request #9691 from jfsiebel/fix-breakout-room-logout
Close tab when user logout from a breakout room
2020-05-26 15:12:21 -04:00
Joao Siebel
1f8cae08d6 Close tab when user logout from a breakout room 2020-05-26 13:41:22 -03:00
Anton Georgiev
73715d1f6a
Merge pull request #8579 from pedrobmarin/2.3-audio-stats
Audio stats
2020-05-26 12:37:18 -04:00
Anton Georgiev
ac6fd2824c
Merge branch 'develop' into 2.3-audio-stats 2020-05-26 12:36:15 -04:00
Anton Georgiev
7086bbd1bb
Merge pull request #9688 from antobinary/adjust-eject-akka-apps
Do not ban user who left while in waiting list. Adjusting after mergi…
2020-05-26 10:06:56 -04:00
Anton Georgiev
68f0710cbf
Merge pull request #9686 from KDSBrowne/dev2.3-chat-input-moving
Prevent chat input shifting with error & typing messages
2020-05-26 10:06:39 -04:00
Anton Georgiev
3b843e7c56 Do not ban user who left while in waiting list. Adjusting after merging 2.2. into 2.3 in #9672 2020-05-26 13:55:38 +00:00
Anton Georgiev
90fdbd4efa
Merge pull request #9676 from basisbit/patch-4
Add pull request template
2020-05-26 09:09:43 -04:00
basisbit
4f35b3464f
Create PULL_REQUEST_TEMPLATE.md 2020-05-26 03:05:30 +02:00
Fred Dixon
13d123058a
Merge pull request #9671 from kepstin/missing-font-size
presentation: ignore text shapes with missing calcedFontSize
2020-05-25 18:19:53 -04:00
KDSBrowne
aff51f603f prevent chat input shifting with error & typing messages 2020-05-25 20:56:26 +00:00
Anton Georgiev
839d104fc5
Merge pull request #9673 from antobinary/merge-2.2-into-develop
Merge 2.2 into develop, May 25, 2020 part 2
2020-05-25 15:57:41 -04:00
Anton Georgiev
9f60e925b5 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 19:55:36 +00:00
Anton Georgiev
82930ad4bd
Merge pull request #9672 from antobinary/merge-2.2-into-develop
Merge 2.2 into develop, May 25, 2020
2020-05-25 15:44:33 -04:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
Anton Georgiev
2f665bb114
Bump up to to a "safe" version number 2020-05-24 08:26:40 -04:00
Anton Georgiev
f3199c8292
Merge pull request #9662 from antobinary/do-not-return-on-missing-meetingId-in-header
Logging with JSON stringify was leading to crashes. Reverting, need t…
2020-05-24 08:25:35 -04:00
Anton Georgiev
4a38524778 Logging with JSON stringify was leading to crashes. Reverting, need to investigate further 2020-05-24 08:22:10 -04:00
Fred Dixon
8938383d67
Merge pull request #9654 from bigbluebutton/ffdixon-patch-2
Update bbb-record
2020-05-23 12:49:47 -04:00
Fred Dixon
bcf2b83c7f
Update bbb-record
Fix #9652
2020-05-23 12:49:22 -04:00
Fred Dixon
755d161393
Merge pull request #9597 from basisbit/patch-4
Workaround for freeswitch clock out of sync problems
2020-05-22 22:55:26 -04:00
Anton Georgiev
54fe878a05
Merge pull request #9643 from jfsiebel/save-settings-on-start
Prevent userChangedLocalSettings call failing at start
2020-05-22 14:52:50 -04:00
Joao Siebel
7d9f4c70ad Prevent userChangedLocalSettings call failing at start 2020-05-22 13:54:00 -03:00
Anton Georgiev
9afb42aadf
Merge pull request #9642 from KDSBrowne/remove-user-style-updates
Update message / style for remove user confirmation
2020-05-22 12:45:49 -04:00
KDSBrowne
03d0931c1c add style / message updates 2020-05-22 16:39:54 +00:00
Anton Georgiev
ede8d82384
Merge pull request #9641 from antobinary/locales-may-22
Pulled HTML5 locales May 22, 2020
2020-05-22 11:55:19 -04:00
Anton Georgiev
c9faef96c9 Pulled HTML5 locales May 22, 2020 2020-05-22 11:48:11 -04:00
Anton Georgiev
fdcccbbc29
Merge pull request #9640 from antobinary/ban-eject-user
Distinguish between eject and ban for Remove user
2020-05-22 11:37:11 -04:00
Anton Georgiev
b6194f96cb Add log in akka-apps to show whether user was banned or simply ejected 2020-05-22 11:12:19 -04:00
Anton Georgiev
ca9ae8d861 cleanup 2020-05-22 10:55:11 -04:00
KDSBrowne
afe995393e remove className 2020-05-22 10:47:22 -04:00
KDSBrowne
274335cc9d add checkbox toremove user modal 2020-05-22 10:47:03 -04:00
Anton Georgiev
e7917994d5 add banUser field in EjectUserFromMeetingCmdMsgBody 2020-05-22 10:45:28 -04:00
Anton Georgiev
aeeac803c7
Merge pull request #9620 from antobinary/simplify-publish
Simplify the code used for promote-demote subscriptions
2020-05-21 17:14:16 -04:00
Anton Georgiev
c290c9ee60 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into ban-eject-user 2020-05-21 16:54:31 -04:00
Anton Georgiev
1874cf8392 Add visuals for banning vs ejecting user 2020-05-21 16:40:08 -04:00
Anton Georgiev
b6524e66c7
Fix typo closing parenthesis 2020-05-21 15:11:11 -04:00