BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,837 Commits 13 Branches 260 Tags 1.1 GiB
b9199992ce
Commit Graph

1647 Commits

Author SHA1 Message Date
KDSBrowne
0f277a66d1 replace if condition in map() with filter() 2018-10-03 11:51:04 +00:00
Anton Georgiev
faac6a0d5d maintain array of user roles so they are unique 2018-09-25 19:24:43 +00:00
KDSBrowne
cf23293e10 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-09-25 12:44:38 +00:00
Anton Georgiev
76180a0580
Merge pull request #6076 from jfsiebel/custom-user-settings 
Custom user settings
 2018-09-25 08:29:48 -04:00
KDSBrowne
86d48298c6 add ability to publish / stop poll 2018-09-24 22:43:54 +00:00
KDSBrowne
3430321a68 Merge remote-tracking branch 'upstream/master' into start-poll-01 2018-09-23 23:08:24 +00:00
KDSBrowne
8320493e6a add ability to start custom poll 2018-09-23 23:05:13 +00:00
KDSBrowne
f3bd048d56 clean up code / add formatted messages / fix bugs 2018-09-23 22:57:03 +00:00
João Francisco Siebel
a445e0d2e5 make whiteboard tools list configurable 2018-09-21 16:42:39 -03:00
João Francisco Siebel
3c3a5ae59a implement multiUserPenOnly configuration 2018-09-21 13:42:00 -03:00
João Francisco Siebel
b832921be2 fix settings list 2018-09-19 17:34:23 -03:00
João Francisco Siebel
bb58a3fde6 let server handle parameters 2018-09-19 17:32:17 -03:00
Anton Georgiev
8c0394f52e
Merge pull request #6085 from oswaldoacauan/fix-missing-stuff-on-meeting-removal 
Fix not clearing pods and token when removing a meeting
 2018-09-19 14:45:02 -04:00
Oswaldo Acauan
1c12b380a2 Fix not clearing pods and token when removing a meeting 2018-09-19 14:48:15 -03:00
Tainan Felipe
210dbbbeaf Merge remote-tracking branch 'upstream/master' into zoom-implementation 2018-09-17 15:20:20 -03:00
João Francisco Siebel
e750ceb0a1 make a single makeCall in auth 2018-09-17 14:05:39 -03:00
João Francisco Siebel
4c35608c2b Add users-settings collection and handle dynamic configuration 2018-09-13 15:09:30 -03:00
Oswaldo Acauan
88f7d6d7dd Merge remote-tracking branch 'upstream/master' into upload-token 2018-09-11 16:17:38 -03:00
Oswaldo Acauan
5c9518bd27 Adjust the presentation upload to use the security token introduced in 2.1. Closes #4948 2018-09-11 16:00:49 -03:00
Anton Georgiev
35c0a12373
Merge pull request #6055 from bigbluebutton/v2.0.x-release 
Pull V2.0.x release into 2.2 (master) to propagate 2.0 fixes
 2018-09-10 15:09:55 -04:00
Bobak Oftadeh
053e0f93fc Fixed issue where unnecessary information was being published to the client. 2018-09-10 08:34:25 -07:00
Anton Georgiev
68e02efe80 add missing Meeting const in addUser.js 2018-09-06 22:33:32 +00:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Anton Georgiev
49c0e7b9b1
Merge pull request #5998 from MaximKhlobystov/ice-connection-state-errors-2 
Better handling of screensharing ice connection state errors.
 2018-09-04 13:14:08 -04:00
Maxim Khlobystov
5825b635ba Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-connection-state-errors-2 2018-08-30 16:07:52 -04:00
prlanzarin
dc767d9bdb Fixed server-side error handling for listen only via SFU, correctly handling KMS abrupt shutdown 2018-08-30 02:41:02 +00:00
prlanzarin
a7bfb985d3 Improvements to Safari/Chrome autoplay policies with placeholder buffer on audiocontext and bogus audio + upstarting audio tag as muted 2018-08-29 19:12:34 +00:00
Tainan Felipe
257b4cc8ac port flash code to js and implement initial work in zoom 2018-08-28 14:14:01 -03:00
Tainan Felipe
25834dd4f8 zoom calc based in flash 2018-08-28 14:13:18 -03:00
Maxim Khlobystov
82a69fb902 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-connection-state-errors-2 2018-08-28 12:49:06 -04:00
prlanzarin
4f99173d38 Using default input stream for SFU listne only 2018-08-28 15:24:06 +00:00
Maxim Khlobystov
fc3e46493e Linting. 2018-08-23 11:49:16 -04:00
Maxim Khlobystov
242200ac91 Replaced Ice with ICE in strings. 2018-08-22 14:51:25 -04:00
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
Anton Georgiev
658b9d81b3
Merge pull request #5512 from lfzawacki/use-get-recording-status 
Use GetRecordingStatus message to start recordings from the bbb-webrtc-sfu side
 2018-05-28 13:55:30 -04:00
Oswaldo Acauan
ec07b4434d Change cursor and annotation to user streams and add optimistic updates 
WIP | Use streams to cursor and optimistic updates

WIP | Use streamss to whiteboard and optimistic updates

WIP | Remove fake delay

Add two way batching (server/client client/server)

Fix null userId exception and remove logs

wip

Add two way batching (server/client client/server) for cursor

Remove message frequency from draw-listeners component since we handle on message publication

Handle clear and undo messages
 2018-05-28 14:46:14 -03:00
Anton Georgiev
e4a6f31abc revert special api changes made for html5 client 2018-05-24 18:42:59 +00:00
Maxim Khlobystov
a0497b2dd9 Assign server time to outgoing chat messages. 2018-05-15 16:08:30 -04:00
Anton Georgiev
13e6eb1a05
Merge pull request #5404 from Tainan404/implement-feedback-screen 
Implement feedback screen
 2018-05-14 10:19:53 -04:00
Lucas Fialho Zawacki
85362e59b8 Remove now unecessary messages sent from HTML5 server 2018-05-10 17:38:30 +00:00
Lucas Fialho Zawacki
2d222b7b2e Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into use-get-recording-status 2018-05-09 19:02:31 +00:00
Lucas Fialho Zawacki
c2801f4476 Send userId as calername in screenshare instead of username 2018-05-09 18:48:14 +00:00
Tainan Felipe
c4c0930317 remove log 2018-05-09 15:12:51 -03:00
Anton Georgiev
f501565e41 adjust meeting props to add freeJoin br room 2018-05-08 17:47:55 +00:00
Tainan Felipe
10a90b4180 WIP 2018-05-08 13:30:00 -03:00
prlanzarin
37564a0c6f Fixed userName/userId usage in kurento-extension 2018-05-07 17:17:48 +00:00
prlanzarin
4a9ba0b37a Added kurento audio bridge callbacks and sip.js depency to SFU 2018-05-07 13:39:39 +00:00
prlanzarin
c2143f9a50 Added first working versions of join/exitAudio for kurento bridge and fixed SFU session termination for freeswitch adapter 2018-04-29 00:18:54 +00:00
prlanzarin
47120111dd Fixed adapter calls in SFU and added bridge hooks for kurento listen only 2018-04-27 21:37:41 +00:00
Fred Dixon
46e9fecdad
Merge pull request #5420 from antobinary/default-chrome-extension 
Set default KEY and LINK for Chrome screenshare extension
 2018-04-26 19:13:52 -04:00
Anton Georgiev
6aea0b6297 add custom vs default key and link 2018-04-26 22:52:46 +00:00
Lucas Fialho Zawacki
a2b670174b Merge branch 'final-recordings' into html5-video-recording 2018-04-26 16:43:18 +00:00
Lucas Fialho Zawacki
ebef86abbe Respcect the recorded=false authority 2018-04-26 01:52:48 +00:00
Anton Georgiev
cffe245c12
Revert "[HTML5 Client] Whiteboard Bulk Operations" 2018-04-25 20:41:19 -04:00
Anton Georgiev
44fde9a83c
Merge pull request #5400 from MaximKhlobystov/whiteboard-bulk-upsert 
[HTML5 Client] Whiteboard Bulk Operations
 2018-04-25 18:03:52 -04:00
Maxim Khlobystov
4db94b4489 Some cleanup and code optimizations. 2018-04-25 15:15:36 +00:00
Maxim Khlobystov
fd0c1bf164 Fixed a small misprint in DRAW_END logic. 2018-04-25 14:52:03 +00:00
Maxim Khlobystov
4067f5f808 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into whiteboard-bulk-upsert 2018-04-25 14:39:48 +00:00
João Francisco Siebel
9e2d517052 add user verification and narrow down search 2018-04-25 11:29:55 -03:00
João Francisco Siebel
742303015d handle only HTML5 direct messages ignoring flash messages 2018-04-24 15:42:59 -03:00
Maxim Khlobystov
9e4da16e8f Brought text shapes back. 2018-04-24 18:17:55 +00:00
Maxim Khlobystov
4ef8f0d0c6 Moved pencil to bulk updates. 2018-04-24 13:59:13 +00:00
Anton Georgiev
7d95d06f59
Merge pull request #5342 from Tainan404/issue-5332 
Don't handle flash client direct messages in html5 client.
 2018-04-23 14:13:27 -04:00
Tainan Felipe
be0ce09af0 pass message for allowed functions 2018-04-23 09:30:14 -03:00
João Francisco Siebel
f122fc5a4b Fix problem in firefox on joining audio 2018-04-18 11:15:17 -03:00
Tainan Felipe
a5ddb4bd17 rename function of skipFlashDirectEvent to processForHTML5ServerOnly 2018-04-13 16:26:58 -03:00
João Francisco Siebel
16788eed87 Remove all media tracks on exit audio 2018-04-13 09:39:26 -03:00
Maxim Khlobystov
c7b1d4c704 Dropping some comon shape updates related to the same shape. 2018-04-12 17:13:40 -04:00
Tainan Felipe
d9f90943ee Skip direct messages of flash client 2018-04-12 13:25:54 -03:00
Oleksandr Zhurbenko
68aba8e0a2 Ajusted multi-user change to the new message format 2018-04-11 13:50:00 -07:00
Oleksandr Zhurbenko
0ae0d56348 Adjusted switchSlide to the new message format 2018-04-11 13:05:30 -07:00
Tainan Felipe
d259a875f6 remove duplicated code in whiteboard-multi-user api 2018-04-11 16:37:46 -03:00
Oleksandr Zhurbenko
6045dfd1bc Ignoring annotation history messages that don't target Meteor 2018-04-10 16:49:56 -07:00
Oleksandr Zhurbenko
4afc455e8a Corrected indexing for Slides, Presentation, Pods, and Annotations 2018-04-10 16:27:11 -07:00
Oleksandr Zhurbenko
a39700bc79 Corrected cursor messages, added whiteboardId 2018-04-09 23:08:23 -07:00
Oleksandr Zhurbenko
7c61e4c4b9 Corrected a publisher for presentation-pods 2018-04-09 20:57:24 -07:00
Oleksandr Zhurbenko
0c8f1a3bfd Adjusted multi-user for 2.1 2018-04-09 16:18:49 -07:00
Oleksandr Zhurbenko
a3f21ee1ce Adjustments to support presentation pods in 2.1 2018-04-09 12:48:37 -07:00
Oleksandr Zhurbenko
f4ab6b76f3 Corrected handlers.js 2018-04-05 15:31:39 -07:00
Oleksandr Zhurbenko
df98f394dd Handle SyncGetPresentationPods 2018-04-05 15:29:58 -07:00
Oleksandr Zhurbenko
69d8dedaab Corrected the collection name 2018-04-05 15:00:52 -07:00
Oleksandr Zhurbenko
b2708d2a2a Handling SetPresenterInPod 2018-04-05 14:04:27 -07:00
Oleksandr Zhurbenko
65cf1d6c16 Handle RemovePresentationPod 2018-04-05 13:56:41 -07:00
Maxim Khlobystov
fa58101039 Added time-based grouping for common shapes upserting. 2018-04-05 16:19:41 -04:00
Oleksandr Zhurbenko
e5a4bd09b4 Handle CreateNewPresentationPod message 2018-04-05 12:59:26 -07:00
Anton Georgiev
2f0a33b738
Merge pull request #5296 from oswaldoacauan/fix-5183 
Sends a ejectUserFromVoice after removing a user
 2018-04-03 13:26:30 -04:00
Oswaldo Acauan
9802dc73af Improve ice connection event handlers 2018-04-03 13:49:45 -03:00
Oswaldo Acauan
3d74ad4847 Add event handlers for iceConnection errors 2018-04-03 10:50:18 -03:00
João Francisco Siebel
2ff45a9d7f Rename function name to match his functionality 2018-04-02 14:08:25 -03:00
Oswaldo Acauan
04b98036e7 Sends a ejectUserFromVoice after removing a user 
Fix wrong linter change
 2018-04-02 11:42:13 -03:00
João Francisco Siebel
c598270663 Enforce authToken to re-joining users, resolve #5261 2018-03-29 09:10:30 -03:00
Anton Georgiev
e1fc9a237e resolve "CLIENT LOG: [object Object]" 2018-03-21 19:39:11 +00:00
Anton Georgiev
07b867e52c
Merge pull request #5259 from oswaldoacauan/fix-ghost-and-reconnect-users 
Fix ghost and reconnecting users
 2018-03-19 14:07:46 -04:00
Oswaldo Acauan
0e5fc698b0 Fix reconnecting users being redirected to /logout 2018-03-16 16:22:27 -03:00
Oswaldo Acauan
16a61a891d Move userLeft out of subscription stop to socket close event. Closes #5240 2018-03-16 16:18:10 -03:00
Anton Georgiev
337bcd616c add logs to debug user join handler 2018-03-16 18:57:27 +00:00
Anton Georgiev
d17ca71a60
Merge pull request #5157 from jfsiebel/implement-start-stop-recording-html5 
Implement start stop recording html5
 2018-03-09 14:28:14 -05:00
Oswaldo Acauan
8b9cc79c3d Implement basic GroupChat messages. Closes #4987 2018-03-09 15:42:14 -03:00
Anton Georgiev
9d7d8edbe0 improve isDialInUser function - use same var 2018-03-07 11:42:13 -05:00
Anton Georgiev
89b7da5be2 resolve conflicting double definition of voiceUserId 2018-03-07 11:18:02 -05:00
Anton Georgiev
2abcb91a7f increase voice user logging level in production 2018-03-07 11:18:02 -05:00
João Francisco Siebel
efbf830e31 Change recording indicator to match #5127 changes 2018-02-23 13:26:33 -03:00
João Francisco Siebel
8f43508b4f Linter some code and simplify action button logic display 2018-02-20 15:23:35 -03:00
Oswaldo Acauan
b03966d0d1 Close all user connections when removed 2018-02-20 12:02:04 -03:00
Oswaldo Acauan
8219c28084 Remove debug code 2018-02-20 11:59:47 -03:00
Oswaldo Acauan
3d69023308 Add check for connection and validated status. Fix #5152 2018-02-20 11:37:17 -03:00
Oswaldo Acauan
2f741df97b Impl user-session based connections on server. Fix #5150 
Implement a connectionId for each user, each time a user try to validate we change their connectionId
and end all other connections of that user.
 2018-02-20 11:26:36 -03:00
João Francisco Siebel
c2076c5260 Fix logic for showing start/end recording 2018-02-19 13:30:21 -03:00
João Francisco Siebel
919c2aa644 Implement start/stop recording logic 2018-02-15 17:42:50 -02:00
Anton Georgiev
32abdc8344
Merge pull request #5102 from MaximKhlobystov/handle-reconnected-voice-users 
[HTML5 Client] Adjustments in handling of reconnected voice users
 2018-02-09 14:50:32 -05:00
Oleksandr Zhurbenko
607e2decad Removed a comment 2018-02-08 08:42:32 -08:00
Oleksandr Zhurbenko
894e2b94f2 Fixed exceptions thrown on PresenterAssignedEvtMsg event 2018-02-07 15:10:15 -08:00
Oleksandr Zhurbenko
dddc388a10 Fixed an exception thrown on meeting destruction 2018-02-07 14:57:34 -08:00
Maxim Khlobystov
82a40e4d9a Handle voice users message to update the voice states properly on reconnect. 2018-02-06 11:23:51 -05:00
Tainan Felipe Pauli de Almeida
38e3ce3013 Merge remote-tracking branch 'upstream/v2.0.x-release' into lock-settings 2018-02-06 13:21:22 -02:00
Tainan Felipe Pauli de Almeida
bc2da51bfb Comply lock setting 'Hide other viewer's webcams' 2018-02-06 09:43:14 -02:00
Richard Alam
b05237b075 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-26 12:51:39 -08:00
Ghazi Triki
a2feb9bf5b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
#	bigbluebutton-client/branding/default/style/css/V2Theme.css
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
#	bigbluebutton-client/locale/en_US/bbbResources.properties
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
#	bigbluebutton-html5/private/config/development/server/log.yaml
 2018-01-23 12:27:42 +01:00
Oleksandr Zhurbenko
946c731471 Fixed pencil rendering during the race condition between clear annotations and pencil's draw_end message 2018-01-22 15:07:29 -08:00
Ghazi Triki
5227217e85 Fix the regex that checks the Flash stream id by adding the option "-recorded" to the pattern, making sure recorded streams are matched too. 2018-01-20 09:34:11 +01:00
Anton Georgiev
a4d57ac4b6
Merge pull request #4963 from MaximKhlobystov/hangup-audio-userlist-fix 
[HTML5 Client] Fix for the issue with users disappearing from userlist when hanging up audio.
 2018-01-16 13:39:38 -02:00
Maxim Khlobystov
71c2d16918 Made sure user is removed from userlist only in case of dial-in (not web) users. 2018-01-15 11:47:19 -05:00
Anton Georgiev
44cf02424f Adjust user guesStatus User property to handle join in BBB 2.1 
Also add muteOnStart Meeting property and some logs for easier work on redis message handling
 2018-01-11 15:05:19 -05:00
Anton Georgiev
cf921edd8b Merge branch 'issue-4812' of github.com:oswaldoacauan/bigbluebutton into html5-on-2.1-take-2 2018-01-11 14:19:05 -05:00
Oleksandr Zhurbenko
7871681448 Changed all the references of kick to remove, to be consistent 2018-01-09 14:28:48 -08:00
Richard Alam
b93a95ca8e
Merge pull request #4896 from prlanzarin/flash-webcam-fix 
Ghost flash webcams fix
 2018-01-08 10:18:52 -08:00
Oleksandr Zhurbenko
2de02c4f8d Linting 2018-01-07 16:25:56 -08:00
Oleksandr Zhurbenko
4af6d30f6a Switched from the broken 4commerce:env-settings package to native Meteor.settings 2018-01-07 16:24:05 -08:00
prlanzarin
dfb5170e5d Finished filtering out HTML5 and Flash webcams using stream name patterns 2018-01-04 16:24:50 +00:00
Anton Georgiev
f0e15af607
Merge pull request #4814 from oswaldoacauan/issue-4812 
Simplify authentication code/flow and Add subscriptions error handling
 2018-01-03 14:45:38 -02:00
Anton Georgiev
c9379eaa0f add muteOnStart param in Meeting structure 2017-12-22 15:22:24 -05:00
prlanzarin
3a72afa350 Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection 2017-12-21 17:37:07 +00:00
Oswaldo Acauan
eb4c89aefc Fix bug when users re-validate after refresh 2017-12-19 10:19:47 -02:00
Anton Georgiev
d6aa4ed44d
Merge pull request #4733 from oswaldoacauan/fix-4700 
Improvements on Presentation Management
 2017-12-15 19:03:54 -02:00
Anton Georgiev
c9c6797fc9
Merge pull request #4788 from antobinary/audio-work-3 
Handle dial-in users in HTML5
 2017-12-15 13:44:51 -02:00
Oswaldo Acauan
0c89d81675 Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-4812 2017-12-15 09:13:26 -02:00
Oswaldo Acauan
62454b826b Remove duplicated log 2017-12-13 16:20:29 -02:00
Anton Georgiev
38c87c7f75 poll voted - drop requesterId and rename event 2017-12-12 11:19:24 -05:00
prlanzarin
bdc89e0830 Refactored webcam share/unshare handlers 2017-12-08 16:52:37 +00:00
Anton Georgiev
085eb57556 add ejectUserFromVoice for moderator 2017-12-08 11:40:52 -05:00
Anton Georgiev
9f1a80078c handle join and leave of call-in user 2017-12-07 15:50:50 -05:00
Anton Georgiev
bf7c26f02b
Merge pull request #4712 from Tainan404/localize-public-clear 
Localize message from when clear the chat.
 2017-12-07 18:27:55 -02:00
Anton Georgiev
255d64d430
Merge pull request #4687 from Gcampes/audio-refactor-bugfixes 
Audio bugfixes and improvements
 2017-12-05 17:17:35 -02:00
Anton Georgiev
e5060ea6b4
Merge pull request #4734 from OZhurbenko/presenter-functionality-2x 
Whiteboard touch events support, bug fixes, improvements
 2017-12-04 18:59:59 -02:00
Oswaldo Acauan
807bd99f82 Fix stuck state on conversion failure 2017-11-28 10:26:00 -02:00
Oleksandr Zhurbenko
006b7c7af6 Corrected logging for the clearAnnotations method 2017-11-27 11:23:38 -08:00
Oswaldo Acauan
e8de534964 Add error handling on presentation upload and covnersion 2017-11-27 15:44:45 -02:00
Anton Georgiev
64f2613818 send requesterId rather than userId on request to akka-aps 2017-11-24 17:03:17 -05:00
Anton Georgiev
a73f5ec738 send muted boolean on user (un)mute 2017-11-24 17:02:14 -05:00
Tainan Felipe
6845aed0e0 localize message from when clear the chat 2017-11-21 16:31:53 -02:00
Gabriel Carvalho de Campes
74bb2bb5e8 fix permission overlay positioning, localizes messages 2017-11-17 17:01:52 -02:00
prlanzarin
248dc7fa08 Fixed HTML5 video API import 
Added chrome extension ID to HTML5 screenshare call
 2017-11-17 18:55:59 +00:00
Gabriel Carvalho de Campes
effb21fc1f Changes and enhancements on audio, wIP 2017-11-17 09:52:48 -02:00
Gabriel Carvalho de Campes
36c9d85749 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-11-16 09:13:47 -02:00
Anton Georgiev
51652fc790
Merge pull request #4669 from jfsiebel/add-moderator-unmute-config 
add moderatorUnmute feature in HTML5 client
 2017-11-14 16:49:41 -02:00
prlanzarin
f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 
Conflicts:
	bigbluebutton-html5/imports/startup/client/base.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
	bigbluebutton-html5/imports/ui/components/app/container.jsx
	bigbluebutton-html5/imports/ui/components/screenshare/service.js
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
	bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
 2017-11-11 03:41:37 +00:00
prlanzarin
e96fc385f1 Handling HTML5 screensharing stop 
The action bar stop button is temporary
 2017-11-06 15:39:55 +00:00
Joao Siebel
d38ee377a5 Fix problems with null values 2017-11-02 17:23:27 -02:00
Gabriel Carvalho de Campes
e55ee0d28e fix listen only dead end on permissions denied 2017-11-02 10:10:01 -02:00
Anton Georgiev
8853d562ce
Merge pull request #4497 from Gcampes/audio-refactor 
[HTML5] Refactor Audio
 2017-10-31 15:39:37 -02:00
Joao Siebel
86264dcb11 Read allowModeratorToUnmuteAudio property from config 2017-10-30 17:15:43 -02:00
Joao Siebel
4a0fedce3d Remove the unmute flag from config, fix mute and unmute options for listen only user and check server-side 2017-10-30 16:27:17 -02:00
Anton Georgiev
a210f2476a Merge pull request #4572 from KDSBrowne/z07-change-role-refactor 
Change Role refactor
 2017-10-27 13:22:41 -02:00
KDSBrowne
4899b88f27 change condition in changeRole logger message 2017-10-27 08:10:53 -07:00
Gabriel Carvalho de Campes
cf73251feb Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-26 16:26:19 -02:00
Gabriel Carvalho de Campes
81f35bac4f Fix concerns from review 2017-10-26 15:14:56 -02:00
KDSBrowne
ec0daac263 add return to presenterAssigned handler 2017-10-26 08:13:43 -07:00
KDSBrowne
fa4c96491c remove meteor import 2017-10-25 12:05:29 -07:00
KDSBrowne
34313c6eaa replace strings with constants 2017-10-25 12:00:31 -07:00
KDSBrowne
092839228b make changeRole handle any role 2017-10-25 10:29:03 -07:00
Anton Georgiev
f7ba155f97 Merge pull request #4524 from oswaldoacauan/patch-3 
[HTML5] Fix logClient method name
 2017-10-24 17:04:38 -02:00
Anton Georgiev
9f2b364710 Merge pull request #4553 from OZhurbenko/fix-settings-cancel 
[HTML5] - Fix for Settings not being closed
 2017-10-24 16:58:40 -02:00
gcampes
d32330b208 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-24 11:19:58 -02:00
Oswaldo Acauan
e76459be65 Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3 2017-10-24 11:11:18 -02:00
Oswaldo Acauan
fda223e81d Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3 2017-10-24 11:01:58 -02:00
Oswaldo Acauan
45d604c63d Refactor logger from client to server 2017-10-24 10:58:46 -02:00
Oswaldo Acauan
28c19ec82d Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-24 07:57:52 -02:00
Oleksandr Zhurbenko
6049223e3a Fixed a typo 2017-10-23 16:16:54 -07:00
Anton Georgiev
eb9dd49b75 Merge pull request #4551 from Tainan404/fix-errors-linter 
[HTML5] Fix issue introduced on #4488
 2017-10-23 15:53:32 -02:00
Tainan Felipe
5ac96e6979 solve merge issues 2017-10-23 13:47:14 -02:00
Oswaldo Acauan
1dcfb9e3fa Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-23 13:31:33 -02:00
Anton Georgiev
4566d82a2a Merge pull request #4488 from Tainan404/fix-errors-linter 
[HTML5] Fix errors linter
 2017-10-23 12:27:38 -02:00
gcampes
ff35ad9602 delete unused files, cleanup code 2017-10-23 10:41:09 -02:00
Oswaldo Acauan
a26e20d76b Fix wrong prop name record => recording 2017-10-20 17:00:34 -02:00
gcampes
029a13d2a0 better error handling, code cleanup 2017-10-20 08:11:51 -02:00
gcampes
3bd709c629 Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor 2017-10-19 09:39:50 -02:00
Oswaldo Acauan
cbc3ea9e36 Add handlers for recording messages 2017-10-19 08:44:41 -02:00
gcampes
b15322e7f2 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-18 17:42:49 -02:00
gcampes
1dda597fca Toast notifications on audio and overall changes 2017-10-18 17:40:01 -02:00
Joao Siebel
da9e2ef3a4 Fix function name in updateVoiceUser 2017-10-18 10:30:33 -02:00
gcampes
d1bc675465 changes setdevices to bridge 2017-10-17 17:16:42 -02:00
Oswaldo Acauan
0dd371087b Fix logClient method name 2017-10-13 11:49:48 -03:00
Tainan Felipe
873d227819 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-13 10:35:38 -03:00
gcampes
03be5d9e59 changes join listen only 2017-10-12 18:39:32 -03:00
gcampes
f89e189a88 fixes listenonly issue 2017-10-12 16:22:10 -03:00
Oleksandr Zhurbenko
430ddc0d3b Removing unnecessary 2x from the collections, publishers, subscriptions and logs 2017-10-12 12:07:02 -07:00
Tainan Felipe
4bda76c5bb Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-12 15:36:52 -03:00
Tainan Felipe
e74c44dd9d fix errors linter 2017-10-12 14:02:46 -03:00
gcampes
fafbba06cb Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-12 13:58:39 -03:00
gcampes
5ad95faffc changes verto bridge. WIP 2017-10-12 12:04:34 -03:00
gcampes
6b44504e5d Adds timeout to transfer, fix css, remove logs 2017-10-12 11:49:50 -03:00
gcampes
ceea7b7ed6 Implements audio transfer from echo test 2017-10-12 09:50:23 -03:00
Oleksandr Zhurbenko
1ec0c11fe4 Permissions fix 2017-10-11 19:01:07 -07:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
Oleksandr Zhurbenko
70b3a14aec Moved meetingDestruction to where it is supposed to be 2017-10-11 18:15:13 -07:00
Oleksandr Zhurbenko
2e61493a0c Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into merge-2.0-1.1-api 2017-10-11 18:12:09 -07:00
Oleksandr Zhurbenko
337f53e72b Moved files up to api/ 2017-10-11 18:09:35 -07:00
Oleksandr Zhurbenko
854ca6b409 Moved voice-users, whiteboard-multi-user, auddio and bbb 2017-10-11 18:07:27 -07:00
Oleksandr Zhurbenko
37fb59ffcc Merged 2.0 and 1.1 users api 2017-10-11 18:02:23 -07:00
Oleksandr Zhurbenko
b8a4dbb278 Merged 2.0 and 1.1 slides api 2017-10-11 17:59:35 -07:00
Oleksandr Zhurbenko
ea029e552e Adjusted naming 2017-10-11 17:56:34 -07:00
Oleksandr Zhurbenko
ad071d4edb Merged 2.0 and 1.1 annotations -> shapes api 2017-10-11 17:52:57 -07:00
Oleksandr Zhurbenko
75315d5b44 Changed the modifier's name 2017-10-11 17:41:50 -07:00
Oleksandr Zhurbenko
0e58027486 Merged 2.0 and 1.1 presentations api 2017-10-11 17:40:51 -07:00
Oleksandr Zhurbenko
d2e1ab842e Merged 2.0 and 1.1 polls api 2017-10-11 17:33:57 -07:00
Oleksandr Zhurbenko
82603d8ad5 Permissions fix 2017-10-11 15:18:48 -07:00
Oleksandr Zhurbenko
eb75c6d9fb Merged 2.0 and 1.1 meetings api 2017-10-11 15:17:42 -07:00
Oleksandr Zhurbenko
48d4736c71 Renamed deskshare to screenshare 2017-10-11 14:53:02 -07:00
Oleksandr Zhurbenko
bfa6541f96 Merged 2.0 and 1.1 screenshare apis 2017-10-11 14:52:19 -07:00
Oleksandr Zhurbenko
3f8e24c12e Merged 2.0 and 1.1 cursor apis 2017-10-11 14:34:23 -07:00
gcampes
79e7bc1909 adds missing code to bridge 2017-10-11 18:30:38 -03:00
Oleksandr Zhurbenko
47d9b53cc2 Merged 2.0 and 1.1 breakouts, chat, and captions 2017-10-11 14:25:18 -07:00
gcampes
3cba60201e Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-11 18:22:36 -03:00
gcampes
f943e5dd08 changes error handlers in audio 2017-10-11 18:04:10 -03:00
Anton Georgiev
a850d1c9c1 Merge pull request #4494 from oswaldoacauan/redis-queue-rewrite 
[HTML5] Redis class refactor
 2017-10-11 17:40:28 -03:00
Anton Georgiev
aa39361360 Merge pull request #4483 from OZhurbenko/presenter-functionality-2x 
Fix for the Pencil Mongo additions
 2017-10-11 15:22:39 -03:00
Tainan Felipe
d6a6ff5eca remove .scss extension and changed path 2017-10-11 14:54:00 -03:00
Oswaldo Acauan
c08f6a9c4f Fix file permissions 2017-10-11 12:22:08 -03:00
Tainan Felipe
a667e3d05b Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-11 11:46:16 -03:00
Anton Georgiev
351a0e43cb Merge pull request #4470 from KDSBrowne/xx-07-allow-html5-modorator 
[HTML5] -Allow HTML5 Moderator
 2017-10-11 09:04:54 -03:00
Oleksandr Zhurbenko
bbe1f99527 Improvements 2017-10-10 16:20:52 -07:00
Tainan Felipe
50cc876cf7 fix errors linter 2017-10-10 19:08:51 -03:00
Oleksandr Zhurbenko
8b5a53a59a Moved pencil_chunk_size to the config 
... And adjusted the way we fetch annotation statuses from the config
 2017-10-10 14:50:11 -07:00
Oswaldo Acauan
3e5dacdaf1 Change meetingQueue delete 2017-10-10 15:30:45 -03:00
gcampes
02cdcb2562 changes to styles and texts in audio flow 2017-10-10 15:03:29 -03:00
prlanzarin
67da01e81c Merge remote-tracking branch 'gutobenn/html5-kurento-screenshare-presenter' into html5-video-screenshare 2017-10-10 17:10:03 +00:00
Anton Georgiev
66f8be63d2 Merge pull request #4475 from oswaldoacauan/fix-token-security 
[HTML5] Add a check for the passed credentials agains the token in Acl
 2017-10-10 12:48:41 -04:00
KDSBrowne
d9ae121130 remove wrapping body in an object 2017-10-10 08:05:16 -07:00
Anton Georgiev
f50fb6aea8 modify format of TURN server config for webrtc 2017-10-10 11:12:35 -03:00
Tainan Felipe
5393051d9d fix errors linter 2017-10-10 10:06:34 -03:00
Oleksandr Zhurbenko
1ab85be722 Permissions 2017-10-09 18:55:53 -07:00
Oleksandr Zhurbenko
4d8233fe10 Fix for the pencil Mongo additions 2017-10-09 18:30:29 -07:00
gcampes
317c3e5ee9 changes to bridge and audio components. WIP 2017-10-09 17:48:10 -03:00
Oswaldo Acauan
96ea918919 Fix file permissions 2017-10-09 17:20:27 -03:00
Oswaldo Acauan
73d4607288 Skip checkToken in client calls 2017-10-09 15:53:45 -03:00
Oswaldo Acauan
7d664c8be7 Add a check for the passed credentials agains the token in Acl 2017-10-09 09:49:07 -03:00
KDSBrowne
584f7e4bc8 add checks to handler 2017-10-06 11:12:33 -07:00
KDSBrowne
d89f0e511f Merge branch 'v2.0.x-release' into xx-07-allow-html5-modorator 2017-10-06 11:02:17 -07:00
KDSBrowne
9da39339cd remove unused checks 2017-10-06 10:56:56 -07:00
KDSBrowne
d70bfdb337 remove code duplication 2017-10-06 10:52:14 -07:00
KDSBrowne
36ebec64c5 change modifier name 2017-10-06 09:16:55 -07:00
KDSBrowne
fc4b0dbcb1 add changeRole handler call to changeRole modifier 2017-10-06 09:10:23 -07:00
KDSBrowne
5c1ff8efbc fix promoted users not being able to execute moderator actions 2017-10-06 08:18:27 -07:00
KDSBrowne
b20ab84abd make changeRole.js return publishUserMessage 2017-10-06 06:31:56 -07:00
gcampes
40795950c2 updates to the audio manager 2017-10-04 17:49:11 -03:00
Anton Georgiev
6b1a29eab4 Merge pull request #4426 from OZhurbenko/presenter-functionality-2x 
HTML5 - Whiteboard/Presentation fixes, improvements, refactoring
 2017-10-04 14:05:03 -04:00
Anton Georgiev
0bc3490ecc Merge pull request #4419 from KDSBrowne/xx-03-kick-user-bug 
[HTML5] - Handle UserEjectedFromMeetingEvtMsg
 2017-10-04 11:47:07 -04:00
KDSBrowne
f635dbf2ae remove import and function call 2017-10-04 08:45:05 -07:00
KDSBrowne
d347864b19 update removeUser modifier props 2017-10-04 08:22:56 -07:00
KDSBrowne
7225590c05 fix userEjected modifier and change if condition 2017-10-04 07:57:16 -07:00
KDSBrowne
e241d6bf68 remove unused voice-user method 2017-10-04 07:39:13 -07:00
Oleksandr Zhurbenko
ab95c87f48 Fixed wb toolbar console warnings cause by improper props validation 2017-10-03 14:28:44 -07:00
gcampes
81a430039d add echo test component. WIP 2017-10-03 17:42:10 -03:00
KDSBrowne
83d4474b51 remove if statment and unused imports 2017-10-03 13:03:18 -07:00
KDSBrowne
078e8b579a remove Logger messages and switch allowHTML5Moderator to false 2017-10-03 12:38:59 -07:00
KDSBrowne
af4676ea38 pass userId to publishUserMessage 2017-10-03 12:20:03 -07:00
KDSBrowne
2d62b79165 switch to correct event name 2017-10-03 12:12:19 -07:00
Oleksandr Zhurbenko
76bcdd55d6 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-10-03 10:34:10 -07:00
KDSBrowne
3eed1ec1c0 remove voice user check in userEjected.js 2017-10-03 08:45:36 -07:00
KDSBrowne
9bad8d8d5d add kickVoiceUser and fix presenter assign bug 2017-10-03 08:25:56 -07:00
Oswaldo Acauan
230a2d5263 Fix silent changes caused by the old pr revert 2017-10-02 11:12:58 -03:00
gcampes
37456c9db4 updates do sip bridge 2017-09-29 17:42:34 -03:00
Oswaldo Acauan
89c2947d78 Merge remote-tracking branch 'upstream/v2.0.x-release' into presentation-manager-merge 2017-09-29 17:32:31 -03:00
KDSBrowne
bc0647ad50 fix merge conflicts 2017-09-29 12:04:27 -07:00
KDSBrowne
3b6aed34ae check for voice user and remove if exists 2017-09-29 11:58:24 -07:00
Anton Georgiev
7c5683c866 Merge pull request #4291 from Klauswk/html5-refactor-userlist 
[HTML5 2.0] Refactor UserList Components
 2017-09-29 14:08:12 -04:00
Oswaldo Acauan
c186840c3c Fix current presentation being unset 2017-09-29 11:13:54 -03:00
Oswaldo Acauan
0e10fa2aa6 Fix typo 2017-09-29 11:10:35 -03:00
gcampes
82e62ee2a6 fix to sip bridge 2017-09-29 10:59:30 -03:00
gcampes
a26f622ba9 gets audio to work 2017-09-29 10:58:13 -03:00
gcampes
6d0d6f6651 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor 2017-09-29 10:52:12 -03:00
Oswaldo Acauan
19e3075dec Add missing body check 2017-09-29 10:50:46 -03:00
Oswaldo Acauan
a5135f28e6 Renamte presentationChange handler 2017-09-29 10:50:05 -03:00
Oswaldo Acauan
c8042ce65b Rename handlers from change to set to match akka 2017-09-29 10:42:17 -03:00
gcampes
d15f0e1183 linter autofix 2017-09-29 10:42:08 -03:00
gcampes
cbb897b23f audio connects. WIP 2017-09-29 10:38:10 -03:00
Oswaldo Acauan
54efe44345 Rename share method to set to match akka 2017-09-29 10:29:55 -03:00
Oswaldo Acauan
2a7fd5ba4d Rename share method to set to match akka 2017-09-29 10:01:01 -03:00
Oswaldo Acauan
7f5d5b8064 Change defaultFileName check to match config 2017-09-29 09:44:36 -03:00
Oswaldo Acauan
bc6283e722 Remove constraint for not deleting the current presentation 2017-09-29 09:41:45 -03:00
Oswaldo Acauan
27b89361c0 Add missing check 2017-09-29 09:40:40 -03:00
KDSBrowne
a60b7e26a6 add kickUser method 2017-09-28 10:41:02 -07:00
KDSBrowne
10c75afe99 switch handler, modifier and collection prop to ejected 2017-09-27 14:20:22 -07:00
Oleksandr Zhurbenko
b3723c34d4 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-26 14:08:41 -07:00
Oleksandr Zhurbenko
b02cbb3208 Removed redundand brackets 2017-09-26 13:36:47 -07:00
Oswaldo Acauan
a3f74842b4 Bug fixes 2017-09-26 16:45:33 -03:00
gcampes
152527d1ab Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor 2017-09-26 14:25:11 -03:00
Oleksandr Zhurbenko
76808b3e7d Fixed a bug with the current slide being unset 2017-09-25 17:00:08 -07:00
Oleksandr Zhurbenko
ce04cfb83b Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-25 16:48:03 -07:00
Anton Georgiev
91f912ce4b Merge pull request #4416 from OZhurbenko/mongo-indexing 
Added indexes for the html5 Mongo collections
 2017-09-25 15:57:07 -04:00
KDSBrowne
cad085a495 add kicked prop 2017-09-25 11:38:36 -07:00
KDSBrowne
9a145c64a8 fix set properties and client kicked condition 2017-09-25 11:32:09 -07:00
KDSBrowne
31223e86ec remove nested user and voiceUser keys 2017-09-25 08:57:39 -07:00
Oswaldo Acauan
dd83d213fa Fix missing conversion handlers 2017-09-22 17:43:07 -03:00
Oswaldo Acauan
36699bedb1 Merge remote-tracking branch 'upstream/master' into presentation-manager-merge 2017-09-22 15:11:48 -03:00
Klaus
4d51e0c045 Fix unsplited styles and code duplicated 2017-09-22 11:24:24 -03:00
Oleksandr Zhurbenko
e054358947 Created a whiteboard config and moved static values there 2017-09-21 16:44:32 -07:00
Oleksandr Zhurbenko
d19814dc55 Prevented html5 from throwing exceptions if the slide file doesn't exist 2017-09-21 14:02:50 -07:00
Klaus
29922c896a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist 2017-09-21 15:40:18 -03:00
KDSBrowne
b35b16f642 rename functions to past tense 2017-09-21 10:55:07 -07:00
KDSBrowne
30da581d6d rename user prop to match 2.x 2017-09-21 10:50:06 -07:00
KDSBrowne
b988dadf89 switch relative with absolute import path 2017-09-21 10:40:19 -07:00
KDSBrowne
93d7c9f4ce change variable declaration 2017-09-21 10:21:25 -07:00
KDSBrowne
8418317e03 handle UserEjectedFromMeetingEvtMsg 2017-09-21 09:21:42 -07:00
Oleksandr Zhurbenko
a46469557f Minor corrections and improvements based on the #4345 reviews 2017-09-20 14:34:22 -07:00
Oleksandr Zhurbenko
2b10d5c1a7 Fixed based on the review of #4345 2017-09-20 14:05:17 -07:00
Anton Georgiev
90db7326b8 Merge pull request #4415 from KDSBrowne/x2.0.9-clear-chat-bug 
[HTML5] - Fix clear chat feature
 2017-09-20 14:13:05 -04:00
Anton Georgiev
e22da926bb Merge pull request #4414 from KDSBrowne/x2.0.8-stun-turn-delete 
[HTML5] - Remove requestStunTurn
 2017-09-19 15:53:08 -04:00
gcampes
ea637a1e49 first changes to audio components and services. WIP 2017-09-19 16:31:04 -03:00
KDSBrowne
2e1fb712a1 use userId instead of username 2017-09-19 12:01:02 -07:00
KDSBrowne
bd8c57eb45 remove log messages 2017-09-19 11:57:08 -07:00
KDSBrowne
6b6d431a5b switch variable positions in object 2017-09-19 11:55:32 -07:00
KDSBrowne
9b3bb04a90 fix clear chat feature 2017-09-19 10:39:13 -07:00
KDSBrowne
4388fc4b0f remove requestStunTurn 2017-09-19 08:42:10 -07:00
Augusto Bennemann
2067c50c55 HTML5 video for bbb2.0 2017-09-19 10:53:27 -03:00
Oleksandr Zhurbenko
838382b6f9 Moved presentation overlays' rendering to a separate function 2017-09-18 16:54:52 -07:00
Oleksandr Zhurbenko
ff4e7bffd0 Fixed a bug with the helper's import 2017-09-18 16:52:20 -07:00
Oleksandr Zhurbenko
537175dad2 Moved part of the presentation display calculations to the server side 2017-09-18 15:20:44 -07:00
Oleksandr Zhurbenko
d57f60fe09 Adjusted publish calls to #4385 2017-09-18 12:18:37 -07:00
Oleksandr Zhurbenko
c9552247b2 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-18 12:08:14 -07:00
Oleksandr Zhurbenko
9e1c8a4fb7 Permissions fix 
Can't afford WebStorm :-(
 2017-09-17 19:01:48 -07:00
Oleksandr Zhurbenko
c7d737e9b8 Improvements based on the PR review 2017-09-17 18:58:37 -07:00
Augusto Bennemann
31f2e1cac7 HTML5 ScreenShare Presenter 2017-09-12 17:47:06 -03:00
KDSBrowne
4b7d790a57 change variable name 2017-09-12 11:13:27 -07:00
KDSBrowne
571c3763dd add publishVoiceMessage 2017-09-12 10:58:06 -07:00
KDSBrowne
39bd590329 rework header creation 2017-09-12 08:52:02 -07:00
Oleksandr Zhurbenko
39ba2d12de Fixed permissions 2017-09-11 12:13:42 -07:00
Oleksandr Zhurbenko
eca8090bac Adjusted the PR 'methods' to #4322 2017-09-11 12:12:39 -07:00
Oleksandr Zhurbenko
43b3b89c6a Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-11 12:11:03 -07:00
Anton Georgiev
802b3bb4fb Merge pull request #4322 from KDSBrowne/x2.0-header-functions 
[HTML5] - Add header functions
 2017-09-11 14:00:15 -04:00
KDSBrowne
89de2f771b change parameter name to header 2017-09-11 10:19:06 -07:00
Augusto Bennemann
1aa5cc5235 HTML5 ScreenShare Viewer 
HTML5 ScreenShare Viewer
 2017-09-11 13:40:56 -03:00
Anton Georgiev
bf35fa7a4c Merge pull request #4354 from KDSBrowne/x2.0.1-fix-lock-issue-userlist 
[HTML5] - Fix Userlist Lock Notification
 2017-09-11 12:07:17 -04:00
KDSBrowne
467ffaba49 change log message 2017-09-11 06:46:19 -07:00
Oleksandr Zhurbenko
7e6ad07b76 Added indexes for the html5 Mongo collections 2017-09-07 16:41:03 -07:00
Oswaldo Acauan
c0307e36a6 Presentation Uploader to 2.0 2017-09-07 15:18:14 -03:00
KDSBrowne
b0f3ca7a1a remove unused import 2017-09-07 10:41:26 -07:00
KDSBrowne
876097a0f4 fix line endings 2017-09-07 10:38:00 -07:00
KDSBrowne
b2b36254ab remove check from handler add exhaustive check to modifier 2017-09-07 10:33:23 -07:00
KDSBrowne
bc8718e263 fix line endidngs 2017-09-07 09:47:20 -07:00
KDSBrowne
21c5ffee8f remove need for separate headerBuilder function 2017-09-07 09:37:13 -07:00
KDSBrowne
13e6357b19 fix line endings 2017-09-07 07:31:19 -07:00
KDSBrowne
9193ae8849 handle UserLockedInMeetingEvtMsg 2017-09-06 12:53:07 -07:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -07:00
KDSBrowne
67ab2d5379 alternate solution test 2017-09-06 07:17:46 -07:00
Oleksandr Zhurbenko
65da71c12a Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-05 18:53:51 -07:00
Oleksandr Zhurbenko
3014b26439 PR review fixes 2017-09-05 18:36:15 -07:00
KDSBrowne
c14e779bb4 add check to payload 2017-09-05 08:53:02 -07:00
Anton Georgiev
718828353e Merge pull request #4321 from Klauswk/fix-acl-inconsistency 
[HTML5] Fix inconsistency inside the ACL, #4310
 2017-09-05 09:54:40 -04:00
Anton Georgiev
a68222dfff Merge pull request #4181 from JaeeunCho/destroy_meeting_users 
[HTML5 2.0] End meeting by moderator
 2017-09-05 09:54:19 -04:00
JaeeunCho
43f6fd9c03 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-09-01 11:22:45 -07:00
Augusto Bennemann
5ec827e17d HTML5 video with kurento (port) 2017-09-01 12:26:57 -03:00
KDSBrowne
2f9d4bcc0e move isMeetingLocked condition check to userlist service 2017-08-31 11:12:53 -07:00
Oswaldo Acauan
a2268494e6 Move old files to the 2.0 folder 2017-08-31 09:56:51 -03:00
Oswaldo Acauan
6070a4ea25 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x 2017-08-31 09:49:59 -03:00
Oleksandr Zhurbenko
28f7f8ad11 Minor fixes and adjustments 2017-08-30 16:12:03 -07:00
KDSBrowne
c244ef91ec fix line endings 2017-08-30 11:35:40 -07:00
KDSBrowne
a01451f9fd handle LockSettingsInMeetingChangedEvtMsg and fix userlistitem lock notification 2017-08-30 11:00:56 -07:00
KDSBrowne
7cdf031a22 fix typo 2017-08-30 09:33:18 -07:00
KDSBrowne
f31a2df133 implement suggested changes 2017-08-30 09:31:08 -07:00
KDSBrowne
a8137c3054 switch to one function to create headers 2017-08-30 07:58:46 -07:00
Klaus
ade47254d3 Fix inconsistency inside the ACL, #4310 2017-08-28 16:48:46 -03:00
KDSBrowne
1ba4be58fd removed unused functions 2017-08-28 09:14:18 -07:00
KDSBrowne
92c9af6d96 add functions to create headers 2017-08-28 07:29:26 -07:00
Oleksandr Zhurbenko
5d2b215591 Added timers for the pencil and shape draw listeners and fixed a bug with clearing the Annotations collection 2017-08-27 01:12:27 -07:00
Oleksandr Zhurbenko
1a92a7f6a1 Changed annotations' rendering, refactored draw listeners, adjusted permissions for the publishAnnotation 2017-08-25 15:45:06 -07:00
Oleksandr Zhurbenko
f3481a7e4b Turned on multi-user drawings 2017-08-23 21:27:41 -07:00
Oleksandr Zhurbenko
2686c67ee7 Fixed a bug with pencil data not being added to the collection 2017-08-21 17:32:03 -07:00
Oleksandr Zhurbenko
d5f07a574c Fixed publishShape message for 4 common shapes 
Line, Rectangle, Triangle, Ellipse
 2017-08-18 19:47:31 -07:00
JaeeunCho
73b6054b42 [HTML5] implemented promote/demote user 2017-08-18 11:23:05 -07:00
Oleksandr Zhurbenko
643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-16 19:24:59 -07:00
Oleksandr Zhurbenko
76d778d9e5 Fixed 'Clear All' annotations for the multi-user mode 2017-08-15 15:30:11 -07:00
Klaus
7c12ccb39e Handling meeting end 2017-08-14 15:52:18 -03:00
Klaus
de6b40a666 Fix counter in breakout notification 2017-08-11 17:17:35 -03:00
Klaus
17dce149d9 fix dropdown going missing 2017-08-11 15:02:26 -03:00
Klaus
babc981867 Messages been correct handle 2017-08-11 14:14:50 -03:00
JaeeunCho
b20ea78e2a fixed conflict 2017-08-10 14:34:21 -07:00
Oleksandr Zhurbenko
cd4150ebf5 Adjusted permissions for the multi-user cursorMove 2017-08-09 20:59:53 -07:00
JaeeunCho
8590d2f414 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-08-08 12:31:56 -07:00
Klauswk
0ce41afabb Merge branch 'bbb-2x-mconf' into html5-toggle-mute 2017-08-08 13:59:00 -03:00
Oswaldo Acauan
716ee5902f Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-08 11:52:26 -03:00
Klaus
526518e740 Remove duplicate lines 2017-08-04 17:20:24 -03:00
Klaus
0807960da4 Fix missing method for mute user 2017-08-04 17:05:18 -03:00
Oswaldo Acauan
0022c121d3 Fix chat bug and styles 2017-08-04 14:58:55 -03:00
Oleksandr Zhurbenko
227f9d540f Added permissions to Move Cursor presenter action 2017-08-03 14:18:01 -07:00
Oleksandr Zhurbenko
43566245ac Added permissions to Undo and Clear All presenter actions 2017-08-03 14:09:19 -07:00
Anton Georgiev
6afb7ca8b3 Merge pull request #4124 from Klauswk/html5-2x-chat-options 
[HTML5 2.0] Add public chat new options
 2017-08-03 14:33:32 -04:00
Oswaldo Acauan
bc3679c0b4 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-03 09:53:44 -03:00
Anton Georgiev
1494c23858 Merge pull request #4189 from Klauswk/html5-hotfix-voiceuser 
[HTML5 2.0] Fix VoiceUser microphone state
 2017-08-03 08:53:01 -04:00
Oswaldo Acauan
b53636ec19 Fix avatar colors and text capitalization 2017-08-03 09:36:26 -03:00
Oswaldo Acauan
14f586faad Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-03 09:23:12 -03:00
Klaus
e02e5d75ce Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-08-03 09:17:50 -03:00
Oleksandr Zhurbenko
fa1458c3eb Handling and publishing multi-user mode switch 2017-08-02 18:24:38 -07:00
Klaus
7b8eb8027c Merge clear annotations and annotationsWhiteboard 2017-08-02 17:14:01 -03:00
Klaus
4495c2e897 Move from annotation/ to annotations/ 2017-08-02 16:52:13 -03:00
Klaus
c5646069fd Using the older insert method inside addShape 2017-08-02 16:46:29 -03:00
Klaus
63fee3b615 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-08-02 11:36:16 -03:00
Klaus
d45ae64558 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-08-02 11:29:33 -03:00
Klaus
a0368e55cf Fix voiceUser mic states 2017-08-02 10:11:53 -03:00
Oleksandr Zhurbenko
b207a1275e Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-01 13:49:46 -07:00
Anton Georgiev
64b597c420 Merge pull request #4179 from Klauswk/html5-2x-voice-user 
[HTML5 2.0] Move AudioUsers to his own Collection
 2017-08-01 14:38:26 -04:00
Oswaldo Acauan
df35a22676 Merge branch 'bbb-2x-mconf' into userlist-2x-design 2017-08-01 14:29:12 -03:00
Klaus
0a9abf6273 Remove user.listenOnly 2017-08-01 14:02:41 -03:00
Klaus
6cc46b8627 Add const to voiceUser 2017-08-01 13:04:20 -03:00
JaeeunCho
e4f94f1d91 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-08-01 08:55:02 -07:00
JaeeunCho
04636ca25b [HTML5] added endMeeting by moderator 2017-08-01 08:53:05 -07:00
Klaus
fc6713013a Move method to VoiceUser 2017-08-01 12:00:07 -03:00
Anton Georgiev
04a7781ea6 Merge pull request #4172 from mmarangoni/call-manager 
[HTML5] Remove audio API duplication & Join Audio fix
 2017-08-01 10:23:09 -04:00
Klaus
ed7d9a3a63 Change wrong log 2017-08-01 10:55:00 -03:00
Klaus
9d42ca9bd7 Move from users to voice-users 2017-08-01 10:10:12 -03:00
Anton Georgiev
2fd4bc4330 handle PresentationConversionCompletedEvtMsg 2017-07-31 17:08:09 -04:00
Matthew Marangoni
2494f48f52 removed unused constructor 2017-07-31 13:54:18 -07:00
Klaus
1ff3df770a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-voice-user 2017-07-31 17:01:04 -03:00
Klaus
d06c49a6b8 Move from voice-user to voice-users 2017-07-31 16:36:41 -03:00
Anton Georgiev
7d50c01a4a Merge pull request #4126 from Klauswk/html5-2x-handle-meeting-end 
[HTML5 2.0] Handling meeting end
 2017-07-31 15:29:15 -04:00
Anton Georgiev
1b2591653b Merge pull request #4168 from oswaldoacauan/user-join-req-msg 
[HTML5] Implements the new join flow
 2017-07-31 15:25:24 -04:00
Oswaldo Acauan
f217304e19 Add publish to UserJoinMetting to the auth flow 2017-07-31 15:48:56 -03:00
Anton Georgiev
7b40122c89 Merge pull request #4121 from mmarangoni/call-manager 
[HTML5] Implemented AudioManager
 2017-07-31 14:29:42 -04:00
Klaus
0a1091f871 Merge branch 'slides-refactor-2x' of https://github.com/klauswk/bigbluebutton into slides-refactor-2x 2017-07-31 09:04:07 -03:00
Klaus
03f0061e2c Fix lint 2017-07-31 09:03:46 -03:00
Oleksandr Zhurbenko
4e31181690 Resolve Alex cherry-pick 2017-07-31 08:30:08 -03:00
Klaus
9bc9116e5c handling a few messages 2017-07-31 08:10:52 -03:00
Oleksandr Zhurbenko
c61dcbce36 Fixed a cursor display/publish for both presenters and viewers 
Plus linting warnings, no multi-user yet
 2017-07-28 17:29:40 -07:00
Oswaldo Acauan
e93f3c0fd5 Remove logs 2017-07-28 10:49:48 -03:00
Oswaldo Acauan
83c117ddde Match user-list with the new styles 2017-07-28 10:43:39 -03:00
Klaus
e43a44e828 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-07-28 08:47:56 -03:00
Oleksandr Zhurbenko
ae3b4bb7fb Fixed initial whiteboard request history handler 
Linter fixes
 2017-07-27 19:56:41 -07:00
Oleksandr Zhurbenko
0cb46d2156 Fixed initial whiteboard history request handler 2017-07-27 18:21:02 -07:00
Klaus
eac898e81d Merge branch 'bbb-2x-mconf' into html5-2x-chat-options 2017-07-27 17:36:01 -03:00
Klauswk
e751bcdadf Merge branch 'bbb-2x-mconf' into slides-refactor-2x 2017-07-27 17:27:35 -03:00
Klaus
e23d75c16b Captions mapped 2017-07-27 17:18:44 -03:00
Anton Georgiev
13b406313e drop handling of fsesl->akka-apps events 2017-07-27 11:27:06 -04:00
Klaus
b015c98f82 Mapped annotations 2017-07-27 10:45:40 -03:00
Klaus
c13155aa6a Move shapes to annotations 2017-07-27 09:35:55 -03:00
Anton Georgiev
4c19d0589b reorganize object destruction 2017-07-26 14:01:38 -04:00
Matthew Marangoni
0ab3bcc599 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager 2017-07-26 10:59:05 -07:00
Matthew Marangoni
7c0d802f27 fixed undefined extension 2017-07-26 10:58:39 -07:00
Anton Georgiev
5ca6f63d7e Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into html5-2x-fix-audio 2017-07-26 13:49:57 -04:00
Klaus
a1e57c84c3 Mapped meeting 2017-07-26 14:36:57 -03:00
Klaus
06b5538054 Mapped polls 2017-07-26 14:08:00 -03:00
Klaus
d05e3c6b14 Presentation mapped 2017-07-26 13:59:21 -03:00
Klaus
ff42dbc58b Refactored slides 2017-07-26 13:39:53 -03:00
Anton Georgiev
305b47e535 improve getSessionToken function and use it on verto_extension 2017-07-26 11:43:47 -04:00
Klaus
355f777d0d User mapped 2017-07-26 11:50:02 -03:00
Klaus
9ab4430f68 Fix merge stuff 2017-07-26 11:31:35 -03:00
Klaus
745b9070f6 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-07-26 11:11:40 -03:00
Klaus
eea2c0ee8b Refactor user 2017-07-26 11:09:07 -03:00
Anton Georgiev
dbcf6dbd2c screenshare displays except at refresh 2017-07-26 09:18:15 -04:00
Oleksandr Zhurbenko
6ea4d39da9 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-07-25 15:08:29 -07:00
Anton Georgiev
4e34a7f551 screenshare displays except at refresh 2017-07-25 16:56:40 -04:00
Klaus
9cd3ac3f87 Merge branch 'bbb-2x-mconf' into fix-presenter-rule 2017-07-25 13:43:26 -03:00
Klaus
22d80b605f Fix presenter assign 2017-07-25 13:21:07 -03:00
Anton Georgiev
1bdeb248c1 Merge pull request #4117 from Klauswk/html5-2x-fix-audio 
[HTML5 2.0] Fix join audio on the HTML5 client 2.0
 2017-07-25 10:30:43 -04:00
Klaus
51f7161e45 Flat breakouts 2017-07-25 10:51:33 -03:00
Klaus
b1bb4a6866 Flat poll 2017-07-25 09:26:45 -03:00
Oleksandr Zhurbenko
5aed767436 Moved SwitchSlide method to 2.0 2017-07-24 14:04:49 -07:00
Klaus
916713b1df Add safe true, preventing mess with the arrays, and refactored the shapes 2017-07-24 17:32:35 -03:00
Oleksandr Zhurbenko
a0f9015860 Moved ClearAll and Undo to 2.0 2017-07-24 13:29:02 -07:00
Anton Georgiev
75c39f9340 Merge branch 'html5-2x-screenshare' of github.com:antobinary/bigbluebutton into html5-2x-fix-audio 2017-07-24 16:06:52 -04:00
Anton Georgiev
350dd16fb7 Merge branch 'html5-2x-fix-audio' of github.com:Klauswk/bigbluebutton into html5-2x-fix-audio 2017-07-24 15:34:18 -04:00
Anton Georgiev
b7d6427e63 rename deskshare to screenshare and adjust condition for viewing 2017-07-24 15:29:34 -04:00
Matthew Marangoni
2f48cca53e Merge branch 'call-manager-2x' of https://github.com/Klauswk/bigbluebutton into Klauswk-call-manager-2x 2017-07-24 12:14:18 -07:00
Klaus
97b38fb0e6 Presentation reflects akkaApps 2017-07-24 15:46:53 -03:00
Matthew Marangoni
8902742573 wrapped BBB instantiation into init function and added to startup 2017-07-24 11:36:56 -07:00
Anton Georgiev
cacac6c9c6 Merge branch 'html5-2x-screenshare' of github.com:Klauswk/bigbluebutton into html5-2x-screenshare 2017-07-24 14:17:04 -04:00
Klaus
78a6fee038 Slides reflecting akkaApps 2017-07-24 14:50:44 -03:00
Klaus
d72df301c6 Move to 2.0 2017-07-24 11:15:46 -03:00
Klaus
5c2369b992 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager 2017-07-24 11:00:30 -03:00
Klaus
73068ff8d2 Handling meeting end 2017-07-21 16:34:28 -03:00
Klaus
39288e6e70 Add clear history, copy and save as chat options 2017-07-21 13:27:28 -03:00
Klaus
7cf05cdbf5 Add public history clear eventHandler and method 2017-07-21 11:39:40 -03:00
Matthew Marangoni
4e66ecf0e2 moved BBB import to startup 2017-07-20 08:57:12 -07:00
Matthew Marangoni
01f98fb4be renamed htmlBBB to simply BBB 2017-07-20 07:57:15 -07:00
Matthew Marangoni
f521ef0402 Merge remote-tracking branch 'upstream/master' into call-manager 2017-07-19 11:55:45 -07:00
Matthew Marangoni
8139fa03ab fixed issue with status being improperly used in custom events 2017-07-19 11:54:48 -07:00
Klaus
b2556695c4 Fix show public messages 2017-07-19 14:57:07 -03:00
Klaus
2bf0fc65db Fix statment 2017-07-19 14:20:19 -03:00
Klaus
b70702dabe Dynamic fetching the stun/turn servers 2017-07-19 09:44:47 -03:00
Matthew Marangoni
1feb7629d6 detailed errors and error codes are displayed in the audio notifications when an audio failed case is received 2017-07-18 17:04:12 -07:00
Klaus
a7ca723fe6 Audio only working on html5 2017-07-18 11:59:05 -03:00
Anton Georgiev
2d4db1c9de Merge pull request #4113 from oswaldoacauan/fix-meeting-add 
[HTML5 2.0] Fix meeting add
 2017-07-18 10:02:08 -04:00
Oswaldo Acauan
a0de0545b4 Fix welcomeMessage from meeting object 2017-07-18 10:31:00 -03:00
Oswaldo Acauan
c6f517b3cb Fix selector and get welcomeMessage from meeting object 2017-07-18 10:25:11 -03:00
Oswaldo Acauan
04b6b753fe Fix missing prop on meeting object 2017-07-18 10:23:16 -03:00
Oleksandr Zhurbenko
d49efd548d Fixed shape's display 
The version went missing during the switch to 2.0
 2017-07-17 16:47:18 -07:00
Oleksandr Zhurbenko
a03ff03a84 Fixed shape's thickness 2017-07-17 16:41:07 -07:00
Oleksandr Zhurbenko
23263c997b Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-07-17 16:01:05 -07:00
Klauswk
7173c0e20c Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages 2017-07-17 16:54:37 -03:00
Anton Georgiev
ed5460cba6 Merge pull request #4040 from Klauswk/html5-2x-captions-messages 
[HTML5 2.0] Move captions messages to 2.0
 2017-07-17 15:52:15 -04:00
Klaus
5767583a86 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-captions-messages 2017-07-17 15:37:06 -03:00
Klaus
3af281d648 Merge remote-tracking branch 'upstream/master' into merge-master-mconf 2017-07-17 13:33:45 -03:00