Commit Graph

21827 Commits

Author SHA1 Message Date
Chad Pilkey
d1e649189e add option to user gear menu to look up their directory data 2018-07-11 10:33:38 -07:00
Chad Pilkey
827ac02a13 simplified the code that sends messages to redis from bbb-apps 2018-07-10 10:49:27 -07:00
Chad Pilkey
891d8cdada remove unused send method from bbb-apps ClientGW 2018-07-10 08:16:18 -07:00
Anton Georgiev
b50dda8566
Merge pull request #5232 from oswaldoacauan/fix-4987
Implement basic GroupChat messages
2018-07-06 16:45:14 -04:00
Anton Georgiev
ee6325e29f
Merge pull request #5828 from antobinary/merge-bbb-web
Merge #4842 to bbb2.2
2018-07-06 14:05:44 -04:00
Anton Georgiev
f20569aed7 Merge branch 'java-optimise' of github.com:riadvice/bigbluebutton into merge-bbb-web 2018-07-06 17:40:54 +00:00
Anton Georgiev
c1a739a883
Merge pull request #5298 from OZhurbenko/akka-create-default-pods-groupchats
Added missing messages for presentation pods and group chats
2018-07-04 14:28:16 -04:00
Richard Alam
d0a2623a59
Merge pull request #5806 from ritzalam/fix-compile-error-due-to-merge
Fix compile error
2018-07-04 11:54:39 -04:00
Richard Alam
020943393e - accidentally deleted when fixing merge conflicts 2018-07-04 08:52:36 -07:00
Richard Alam
700c8a84fd
Merge pull request #5801 from ritzalam/end-meeting-when-no-more-auth-users
End meeting when last authed user left
2018-07-04 10:10:13 -04:00
Richard Alam
a69029092b
Merge pull request #5802 from riadvice/red5-connection-params-log
Better params check and logging for RTMP connections
2018-07-03 17:39:37 -04:00
Ghazi Triki
1d9ef19dd0 Better params check and logging for RTMP connections. 2018-07-03 22:35:33 +01:00
Richard Alam
fb234ae882 - end meeting after 2 minutes (configrable) after the last authenticated user leaves 2018-07-03 13:48:57 -07:00
Anton Georgiev
7fce137bf5
Merge pull request #5800 from antobinary/current
Pull BBB 2.0 into BBB 2.2
2018-07-03 16:21:08 -04:00
Anton Georgiev
eca2e50e1a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into current 2018-07-03 20:17:42 +00:00
Anton Georgiev
d80f3a579e
Merge pull request #5799 from antobinary/locales-07-03
Pulled HTML5 locales - July 03, 2018
2018-07-03 15:26:37 -04:00
Anton Georgiev
576214f465 pull locales July 03, 2018 2018-07-03 19:17:54 +00:00
Anton Georgiev
3414948f0e
Merge pull request #5795 from MaximKhlobystov/mod-only-message
Moderator only message support.
2018-07-03 11:48:08 -04:00
Anton Georgiev
4b30bb7a37
Merge pull request #5759 from KDSBrowne/fix-5637
Prevent settings modal re-opening after dismiss
2018-07-03 11:45:54 -04:00
Maxim Khlobystov
4a7a3cfcf9 Clearing user system messages when adding a user. 2018-07-03 11:45:44 -04:00
Anton Georgiev
3eeef57944
Merge pull request #5748 from musickiper/adj-chatlist-view-on-iphone-view
Typing chat on iPhone partially hides the post button
2018-07-03 11:44:32 -04:00
Maxim Khlobystov
d7b99f5ed4 Cleanup. 2018-07-03 11:37:06 -04:00
Anton Georgiev
cd6417aa33
Merge pull request #5779 from oswaldoacauan/whiteboard-fixes
Whiteboard fixes and improvements
2018-07-03 11:33:35 -04:00
Maxim Khlobystov
593a2ab744 Typo. 2018-07-03 11:31:00 -04:00
Anton Georgiev
915c1bae8b
Merge pull request #5757 from Tainan404/issue-5714
Add some messages about audio errors
2018-07-03 11:22:45 -04:00
Maxim Khlobystov
efbc24db6f Add support for moderator only message. 2018-07-03 11:13:38 -04:00
KDSBrowne
49f75c32c5 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-5637 2018-07-03 15:09:31 +00:00
KDSBrowne
8e84c83e9f clean up 2018-07-03 15:09:20 +00:00
Anton Georgiev
52a0c68d64
Merge pull request #5792 from prlanzarin/audio-state-fix
Fixed audio state bug (#5519)
2018-07-03 10:18:49 -04:00
Anton Georgiev
ff34d648e9
Merge pull request #5793 from prlanzarin/sfu-opt-audio
Fixed full audio exit when SFU listen only is enabled
2018-07-03 09:37:45 -04:00
Fred Dixon
7080f4316d
Merge pull request #5794 from riadvice/v2.0.x-bbb-check
Fix SIP connection test and improve logging for SIP Application class
2018-07-03 06:56:54 -04:00
Ghazi Triki
1c6611a7fb Fix SIP connection test and improve logging for SIP¨Application class. 2018-07-02 22:24:57 +01:00
prlanzarin
19f2802ef9 Fixed full audio exit when kurento listen only is enabled 2018-07-02 16:50:09 +00:00
prlanzarin
8c50ddf762 Removed audio failure listeners on graceful exit 2018-07-02 16:36:54 +00:00
prlanzarin
769143ad48 Fixed audio state bug regarding ICE connection 2018-07-02 15:36:48 +00:00
Fred Dixon
854816b053
Merge pull request #5784 from capilkey/2.0-screenshare-sound-n-lock-fix
Screenshare sound and lock fixes
2018-06-30 09:20:32 -04:00
Anton Georgiev
381e72beed
Merge pull request #5790 from antobinary/v2.2-dev-recover
HTML5: Adjust guest status body params
2018-06-29 18:32:28 -04:00
Anton Georgiev
e2b86eb37c adjust guest status body params 2018-06-29 22:29:55 +00:00
Richard Alam
bd1634f81e
Merge pull request #5789 from ritzalam/ritzalam-upload-vtt
- make text tracks always a json array
2018-06-29 16:44:03 -04:00
Richard Alam
f62c872353 - make text tracks always a json array 2018-06-29 13:42:59 -07:00
Fred Dixon
72c851056b
Merge pull request #5788 from ffdixon/bbb-fix-19
Only use chromeExtensionLinkURL if it is set
2018-06-29 16:33:35 -04:00
Fred Dixon
da97ac14a5 Only use chromeExtensionLinkURL if it is set 2018-06-29 15:32:43 -05:00
Richard Alam
745419019c
Merge pull request #5787 from ritzalam/merge-latest-20-branch
Merge latest 20 branch
2018-06-29 16:26:38 -04:00
Richard Alam
914f36630a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch 2018-06-29 13:25:09 -07:00
Richard Alam
a396791985
Merge pull request #5776 from riadvice/v2.0.x-release-ui-fixes
V2.0.x release ui fixes
2018-06-29 15:57:12 -04:00
Richard Alam
29eee15cf0
Merge pull request #5775 from kepstin/log-cleanup
Improve bigbluebutton cleanup cron job
2018-06-29 15:56:50 -04:00
Chad Pilkey
6dcf3e2dcb force a revalidation of lock state when the local user's role changes 2018-06-29 12:56:40 -07:00
Richard Alam
a6b3a3fe5b
Merge pull request #5771 from riadvice/show-custom-layout-name
Show layout name as in xml file when its name cannot be matched from locale file
2018-06-29 15:56:29 -04:00
Chad Pilkey
4b77c38041 play a sound when the either screenshare publish window closes 2018-06-29 12:44:04 -07:00
Chad Pilkey
b0cec4b055 allow changing mute on userlist when mic is locked and you are mod 2018-06-29 12:43:07 -07:00