Maxim Khlobystov
d67aba6c8a
Listening to ice connection failures when screensharing.
2018-08-22 14:10:08 -04:00
Anton Georgiev
a09ef26166
Merge pull request #5983 from jfsiebel/akka-add-sync-voice-user
...
Add SyncGetVoiceUsersRespMsg message in akka
2018-08-20 13:12:37 -04:00
Anton Georgiev
a0a46e5338
Merge branch 'akka-add-sync-voice-user' of github.com:jfsiebel/bigbluebutton into test-5983
2018-08-20 15:44:23 +00:00
Joao Siebel
c0b33de410
re-use function
2018-08-16 09:21:13 -03:00
Joao Siebel
04631f5e6e
remove 🐛
2018-08-15 14:31:07 -03:00
Joao Siebel
445d710b2a
handle SyncGetVoiceUsersRespMsg on meteor
2018-08-15 13:45:00 -03:00
Anton Georgiev
91b21540fa
Merge pull request #5970 from prlanzarin/html5-guest-always-accept
...
Added support for ALWAYS_ACCEPT guest policy in the HTML5 client
2018-08-14 15:00:06 -04:00
prlanzarin
71307e7b26
Added support for ALWAYS_ACCEPT guest policy in the HTML5 client
2018-08-10 19:30:17 +00:00
Joao Siebel
22b9dda230
handle SyncGetGroupChatsRespMsg and SyncGetGroupChatMsgsRespMsg messages
2018-08-08 13:42:45 -03:00
João Francisco Siebel
5a76eec168
remove chat collection and fix group chat messages subscription
2018-08-06 09:05:07 -03:00
Anton Georgiev
993bf61d24
Merge pull request #5956 from antobinary/adjust-meeting-structure
...
Adjusted meeting model structure to correctly add a meeting
2018-08-03 10:37:42 -04:00
Anton Georgiev
7c132c149a
Added missing properties in Meeting
2018-08-03 14:19:05 +00:00
Joao Siebel
32516bfbbf
implement welcome message and clear message in group chat messages
2018-08-03 11:03:16 -03:00
Joao Siebel
372150d766
Merge branch 'add-html5-group-chat-support' of github.com:jfsiebel/bigbluebutton into add-html5-group-chat-support
2018-08-02 14:23:55 -03:00
Joao Siebel
140968571e
handle clear public chat for group chat
2018-08-02 14:23:20 -03:00
Anton Georgiev
44dc39eaf8
Merge branch 'master' into add-html5-group-chat-support
2018-08-01 14:24:00 -04:00
Anton Georgiev
6533802573
Merge pull request #5932 from oswaldoacauan/presentation-pods
...
Presentation pods support
2018-08-01 13:49:32 -04:00
Anton Georgiev
e64dbda4ce
add check for logClient to handle media calls
2018-08-01 16:06:49 +00:00
Oswaldo Acauan
0ed7c45ec0
Fix Acl for cursor/annotations for pods
2018-08-01 10:21:44 -03:00
Oswaldo Acauan
3c2bb8748a
Fix Acl for cursor/annotations for pods
2018-08-01 10:21:33 -03:00
Joao Siebel
03389a8adc
fix unread message counter for private chats
2018-07-31 14:13:36 -03:00
Anton Georgiev
78847f89ad
attempt to pull 2.0 into 2.2
2018-07-31 16:18:23 +00:00
Anton Georgiev
b99cc7f413
Merge pull request #5923 from MaximKhlobystov/client-logging-error
...
Fix for the client logging error
2018-07-30 14:10:16 -04:00
Maxim Khlobystov
57f8d66b35
Setting the correct validUser value.
2018-07-30 14:02:46 -04:00
João Francisco Siebel
655483576f
fix unread messages counter on public chat and remove some old chat configurations
2018-07-27 10:44:21 -03:00
Oswaldo Acauan
0f94c334e0
Fix cursor while mwb is on
2018-07-26 16:35:38 -03:00
Lucas Fialho Zawacki
f8d8e5c8e5
Prettier obj logs in audio, video, screenshare
2018-07-26 16:29:55 -03:00
Oswaldo Acauan
9eb53234df
Fix remote cursors not showing
2018-07-26 16:23:52 -03:00
Oswaldo Acauan
047b23fd4a
Fix for annotations
2018-07-26 16:15:02 -03:00
Oswaldo Acauan
adb34da217
Fixes for cursor
2018-07-26 16:05:55 -03:00
Lucas Fialho Zawacki
e36c494252
Use newer logging calls for video,audio,screenshare
2018-07-26 15:26:56 -03:00
Joao Siebel
d8391f450b
use group chat messages in html5 client
2018-07-26 11:56:26 -03:00
Lucas Fialho Zawacki
df22f43b11
Add window.Logger to kurento-extension
2018-07-25 19:08:35 -03:00
Lucas Fialho Zawacki
2fc85f75e1
New Logging format for listenonly audio and screenshare
2018-07-25 19:08:24 -03:00
Lucas Fialho Zawacki
b667c53590
Get more detailed logs from the video component
2018-07-25 18:53:12 -03:00
Maxim Khlobystov
e041718e55
Code cleanup
2018-07-25 15:59:14 -04:00
Maxim Khlobystov
249e79660c
Prevented the client logging error when Auth.fullInfo is not provided.
2018-07-25 14:13:22 -04:00
Oswaldo Acauan
b7823c406c
Merge remote-tracking branch 'upstream/v2.2-dev' into presentation-pods
2018-07-24 17:20:37 -03:00
Bobak Oftadeh
0db93d35b9
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into client-logger
2018-07-20 09:42:11 -07:00
Anton Georgiev
488f6c04e1
Merge pull request #5865 from Tainan404/issue-5675
...
Add user when moderator join via audio only in breakout room
2018-07-19 14:09:54 -04:00
Tainan Felipe
42a2bfff58
Add user when voice only user join in the meeting
2018-07-16 14:03:01 -03:00
Ghazi Triki
66a050b00b
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0
...
# Conflicts:
# bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
# bigbluebutton-config/bigbluebutton-release
# bigbluebutton-html5/imports/api/users/server/handlers/guestApproved.js (Not Fixed)
2018-07-16 16:08:38 +01:00
Bobak Oftadeh
a5354c9c10
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fixes3
2018-07-13 12:18:55 -07:00
Bobak Oftadeh
c98bd10024
Replaced console.errors with client logger and alterted logger configurations
2018-07-13 12:16:50 -07:00
Anton Georgiev
97fb0e9b4f
Merge pull request #5827 from Tainan404/issue-5562
...
Allow html5 user to join in any breakout room
2018-07-12 12:21:14 -04:00
Anton Georgiev
80715cc133
Merge pull request #5851 from antobinary/guests
...
Disable HTML5 waiting screen for guest approve
2018-07-11 09:53:18 -04:00
Anton Georgiev
4dbe681a46
disable HTML5 waiting screen for guest approve
2018-07-11 12:46:44 +00:00
prlanzarin
d2bdb67ed3
Propagating configs to WebRTC screenshare script and added support for STUN/TURN config to SFU components
2018-07-09 21:29:59 +00:00
Anton Georgiev
b50dda8566
Merge pull request #5232 from oswaldoacauan/fix-4987
...
Implement basic GroupChat messages
2018-07-06 16:45:14 -04:00
Tainan Felipe
425c5da4ee
allow get all meetings when is free join breakout room
2018-07-06 14:07:08 -03:00
Tainan Felipe
ccd045dbef
add Method for request Breakout join URL
2018-07-06 14:00:44 -03:00
Bobak Oftadeh
bc3e068e2e
Client logger implemented
2018-07-04 14:02:10 -07: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
3414948f0e
Merge pull request #5795 from MaximKhlobystov/mod-only-message
...
Moderator only message support.
2018-07-03 11:48:08 -04:00
Maxim Khlobystov
4a7a3cfcf9
Clearing user system messages when adding a user.
2018-07-03 11:45:44 -04:00
Maxim Khlobystov
d7b99f5ed4
Cleanup.
2018-07-03 11:37:06 -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
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
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
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
prlanzarin
6a63887ebb
Fixed kurento audio bridge meetingId fetching and removed uneeded object assignments
2018-06-28 18:59:36 +00:00
prlanzarin
d4858b6e70
Fixed userId/userName sending to SFU audio component
...
Also did some refactoring to kurento-extension parameters
2018-06-28 18:50:56 +00:00
Tainan Felipe
c21749992d
Tiny fixes
2018-06-28 15:16:28 -03:00
Richard Alam
d891a4e85f
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch
2018-06-28 08:30:17 -07:00
Paulo Lanzarin
7d414e8b7d
Merge branch 'v2.0.x-release' into sfu-opt-audio
2018-06-27 14:44:11 -03:00
prlanzarin
2f5aa09fe5
Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-opt-audio
2018-06-27 17:34:33 +00:00
Anton Georgiev
1e1e605d7a
Merge pull request #5722 from antobinary/breakouts-improvements-3
...
Improvements to Breakouts on HTML5
2018-06-27 12:35:16 -04:00
Tainan Felipe
7dc251fc5a
add treater of webrtc error
2018-06-27 10:56:03 -03:00
Anton Georgiev
79329d036a
set dial-in clientType in html5 client
2018-06-26 20:50:03 +00:00
Anton Georgiev
e2e83e08df
plug clientType in UserJoin* messages, not separate ones
2018-06-26 19:27:42 +00:00
Anton Georgiev
a6c693c93d
add clientType in User and show it in api getMeeting*
2018-06-22 19:19:46 +00:00
Anton Georgiev
3546e49379
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into breakouts-improvements-3
2018-06-20 16:02:06 +00:00
Richard Alam
14327a1edf
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-branch
2018-06-19 12:58:51 -07:00
Anton Georgiev
634b7b34c7
avoid referencing null on user leave
2018-06-19 15:38:53 +00:00
Tainan Felipe
2dbfe499cc
rename variable
2018-06-18 15:59:35 -03:00
Tainan Felipe
9e9e85cddb
skip share/unshare webcam using if not check
2018-06-18 15:35:27 -03:00
Anton Georgiev
ad483dd0e5
Merge pull request #5702 from Tainan404/issue-5692
...
Skip userLeaving when meeting is gone.
2018-06-15 16:26:04 -04:00
Tainan Felipe
d5482651d9
rename variable
2018-06-15 17:24:03 -03:00
Tainan Felipe
f86d80c53d
Remove skip userLeaving and change throw to log
2018-06-15 16:28:19 -03:00
Tainan Felipe
3884d45e5d
skip userLeaving when meeting is ended
2018-06-15 15:16:05 -03:00
JamesJung
0fa7810e34
Add userName to the log sent from client to server ( #5535 )
...
Fix for #5454
2018-06-15 09:45:58 -03:00
Anton Georgiev
7338086572
Do not auth validate Flash users ( #5695 )
...
by @oswaldoacauan
2018-06-14 17:24:55 -03:00
Anton Georgiev
f38271b3f8
pass correct structure for TURNs
2018-06-11 20:20:32 +00:00
Anton Georgiev
de7977122c
fix incorrectly picked breakout expiration time
2018-06-11 16:05:53 +00:00
Anton Georgiev
fd563c2577
make default breakouts expiration time 15 mins, not 15 sec
2018-06-11 16:05:53 +00:00
Richard Alam
dc62b89691
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
2018-06-08 17:49:13 -07:00
Anton Georgiev
d8372fa2a2
cleanup
2018-06-07 16:13:20 +00:00
Anton Georgiev
bbaca66e94
adjust to handle redirectURL being overwritten
2018-06-07 15:59:06 +00:00
Anton Georgiev
eb7a49f142
renamed noRedirect* to redirectToHtml5*
2018-06-07 15:59:06 +00:00
Anton Georgiev
a77ee38741
make breakout url for html5 and use it
2018-06-07 15:59:06 +00:00
Richard Alam
a2eaa9babd
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
...
- some conflicts have been fixed.
The following needs working on:
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
Parking as need to work on something else.
2018-06-06 08:23:13 -07:00
Maxim Khlobystov
80da44bb26
Merge pull request #5594 from oswaldoacauan/streams-cursor-wb
...
Whiteboard and Cursor performance update
2018-05-30 11:42:52 -04:00
Oswaldo Acauan
0eb4752818
Clean up
2018-05-30 11:19:19 -03:00
Anton Georgiev
f13d37867e
Merge pull request #5601 from BobakOftadeh/ui-userlist-changes
...
User list UI changes implemented
2018-05-29 16:41:20 -04:00
Bobak Oftadeh
136fa72a7e
User list UI changes implemented
2018-05-29 12:23:13 -07:00
Anton Georgiev
06ad7805a4
Merge pull request #5583 from antobinary/adjust-api
...
Revert special api changes made for html5 client
2018-05-28 17:46:30 -04:00