Commit Graph

5985 Commits

Author SHA1 Message Date
Richard Alam
7a7712d986 - start implementing lock settings 2017-07-09 15:00:13 -07:00
Richard Alam
8d91ef8132 - convert several old client messages to new ones 2017-07-09 07:44:29 -07:00
Richard Alam
5dbb8d5515 - implement emoji status message 2017-07-08 13:39:41 -07:00
Richard Alam
6588e6e89a Merge pull request #4052 from capilkey/improve-shell-resize
Skip layout change when dimensions are invalid
2017-07-08 15:11:45 -04:00
Richard Alam
366e2033c5 Merge pull request #4060 from perroned/fix-ss-2x
Restores 1.1 JWS Screensharing on 2.0
2017-07-08 15:11:24 -04:00
Richard Alam
77de38e2f3 Merge branch 'move-chat-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-chat-messages-2x 2017-07-08 08:41:20 -07:00
perroned
f77b29bad3 Restores 1.1 ss 2017-07-08 11:29:13 -04:00
Richard Alam
0cf4227273 Merge branch 'implement-bbb-web-msgs' into implement-meeting-status 2017-07-08 08:04:13 -07:00
Richard Alam
2212d95a28 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into implement-meeting-status 2017-07-08 07:23:30 -07:00
Chad Pilkey
e30ba20323 avoid exception when cursor user isn't found 2017-07-07 20:16:43 -04:00
Chad Pilkey
550b880db7 convert chat messages to 2x 2017-07-07 19:14:00 -04:00
Chad Pilkey
fc3d7a05aa remove the screenshare code from the presentation module 2017-07-07 17:01:27 -04:00
Anton Georgiev
a0f90f181d assign proper userId for assignedBy 2017-07-07 11:25:48 -04:00
Anton Georgiev
dd38cebe58 trigger UI changes if we are the presenter 2017-07-07 10:51:11 -04:00
Anton Georgiev
0ec660c8d3 handle assign presenter in flash client and akka apps 2017-07-07 10:32:38 -04:00
Richard Alam
44f7b0c622 - remove old users model 2017-07-05 11:20:48 -07:00
Chad Pilkey
f0ce1c416f change main app shell resize handler 2017-07-04 17:17:56 -04:00
Richard Alam
955b162915 - send new presentation conversion progress messages 2017-07-04 10:32:30 -07:00
Pedro Beschorner Marin
79cf6bb623 Moved sharednotes messages to 2.0 format 2017-07-03 17:28:12 +00:00
Chad Pilkey
4e5df30ac4 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into fix-2.0-layout 2017-06-29 16:57:28 -04:00
Chad Pilkey
9f904e6267 reorganized the layout code in akka-apps and fixed layout broadcast 2017-06-29 16:55:25 -04:00
Richard Alam
a11c45fa02 - implement handlers for guest policy 2017-06-29 11:34:08 -07:00
Chad Pilkey
15c938e9cd fixed layout message response and removed redundant props 2017-06-29 14:32:31 -04:00
Richard Alam
04e55a1dd4 Merge branch 'move-caption-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-caption-messages-2x 2017-06-28 07:47:56 -07:00
Chad Pilkey
02e8c4f4cb forgot a semi-colon 2017-06-26 18:29:21 -04:00
Chad Pilkey
4c66393dbd Merge remote-tracking branch 'upstream/bbb-2x-mconf' into move-caption-messages-2x 2017-06-26 18:09:56 -04:00
Richard Alam
4baf8369ff - apply voice status to correct user 2017-06-26 14:01:25 -07:00
Richard Alam
00cee79501 - do not show when user joins listen-only 2017-06-26 14:00:51 -07:00
Richard Alam
2316e73c26 Merge branch '2.0-Polls' of https://github.com/antobinary/bigbluebutton into antobinary-2.0-Polls 2017-06-26 14:00:38 -07:00
Chad Pilkey
adfdd3c230 add try/catch block to client message receiver 2017-06-26 16:48:05 -04:00
Richard Alam
99046fb685 - handle emoji status changed message in client 2017-06-26 12:38:00 -07:00
Chad Pilkey
76026da06c moved caption messages to 2.0 format 2017-06-26 15:00:32 -04:00
Richard Alam
9dc41437e8 - handle user left 2017-06-26 10:34:22 -07:00
Richard Alam
dfa1557116 - display default presentation 2017-06-26 07:24:38 -07:00
Richard Alam
f7376e11c0 - get presentation info 2017-06-25 16:11:29 -07:00
Richard Alam
2931b719c6 - get presentation info 2017-06-25 13:26:37 -07:00
Richard Alam
9317cdfcc0 Merge branch 'capilkey-move-presentation-messages-2x' into merge-presentation 2017-06-25 11:25:23 -07:00
Richard Alam
34cab65b2e Merge branch 'move-presentation-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-presentation-messages-2x 2017-06-24 15:46:22 -07:00
Richard Alam
ae4fc536b1 - fix use leaving voice conf 2017-06-24 06:47:19 -07:00
Richard Alam
77da487c60 - handle user muted and talking messages 2017-06-23 18:14:55 -07:00
Richard Alam
ceb4d74e55 - handle user join and left voice conference 2017-06-23 14:34:05 -07:00
Anton Georgiev
9a0a4d5669 work on displaying poll result annotation in flash client 2017-06-23 17:26:53 -04:00
Richard Alam
4dda2543ac - handle user joined voice conf 2017-06-23 12:26:28 -07:00
Richard Alam
7ffd1a80bd - assign presenter when no presenter present 2017-06-23 11:12:17 -07:00
Chad Pilkey
1c226fd3af 2.0 presentation message work, presentation conversion msgs in bbb-web missing 2017-06-23 13:27:56 -04:00
Richard Alam
c4616f1ce0 - load modules after validate token 2017-06-22 14:42:10 -07:00
Richard Alam
48b6fcdb09 - use LiveMeeting to store state 2017-06-22 13:52:39 -07:00
Anton Georgiev
9dc00519db Polls 2.0 on Flash client 2017-06-22 11:38:42 -04:00
Richard Alam
13efe38e87 - include webcam streams in users list 2017-06-22 08:30:39 -07:00
Richard Alam
0bc5e24886 - cleanup 2017-06-22 08:04:00 -07:00