Anton Georgiev
|
8a87b9d6d2
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4
|
2017-10-30 16:06:47 -04:00 |
|
Anton Georgiev
|
fcdb479581
|
Handle default presentation pod missing ownerId
request new pod from client side, and when handling it, just populate the ownerId of the existing pod
|
2017-10-30 16:04:43 -04:00 |
|
Richard Alam
|
38ade4d7ec
|
Merge pull request #4605 from ritzalam/implement-multi-chat
Rights management and layout id
|
2017-10-30 15:36:19 -04:00 |
|
Richard Alam
|
243e4c1536
|
- update bbb-apps-common version
|
2017-10-30 12:34:23 -07:00 |
|
Richard Alam
|
0ffd9b4bad
|
- override meetingId and userId for messages from client making sure that clients do not spoof
messages from other users or meetings.
|
2017-10-30 12:11:40 -07:00 |
|
Richard Alam
|
bb63fa78a9
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat
|
2017-10-30 12:11:24 -07:00 |
|
Richard Alam
|
e313647655
|
- fix presentation window name for sample multi pod layout
|
2017-10-30 12:08:56 -07:00 |
|
Richard Alam
|
83ae14a44a
|
Merge pull request #4603 from ritzalam/implement-multi-chat
Implement multi chat
|
2017-10-30 14:46:58 -04:00 |
|
Richard Alam
|
ed88dba7e5
|
- record start/stop webcam events into redis
|
2017-10-30 11:45:52 -07:00 |
|
Richard Alam
|
974c1d7780
|
- sample default layou for chat
|
2017-10-30 10:00:31 -07:00 |
|
Richard Alam
|
d0fb1b3191
|
Merge pull request #4602 from ritzalam/implement-multi-chat
- check if pod has been initialized before accessing the presentation…
|
2017-10-30 10:56:55 -04:00 |
|
Richard Alam
|
19a692e6bf
|
- check if pod has been initialized before accesing the presentation page to prevent an exception.
|
2017-10-30 07:55:37 -07:00 |
|
Richard Alam
|
14b1f6b994
|
Merge pull request #4600 from ritzalam/implement-multi-chat
Record start/stop webcam events
|
2017-10-29 19:14:16 -04:00 |
|
Richard Alam
|
1b045a04d2
|
- fix video recording of events
|
2017-10-29 16:12:46 -07:00 |
|
Richard Alam
|
528c401110
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat
|
2017-10-29 14:30:18 -07:00 |
|
Richard Alam
|
6c1ce36cd9
|
Merge pull request #4597 from capilkey/close-chat-pods
[2.1] Close all ChatWindows when module is stopped
|
2017-10-29 16:11:24 -04:00 |
|
Richard Alam
|
4c99626c84
|
Merge pull request #4596 from capilkey/add-presentwin-to-layout
Add proper window identification to PresentationWindows
|
2017-10-29 16:11:11 -04:00 |
|
Richard Alam
|
b128ba3fea
|
Merge pull request #4593 from antobinary/pods_vol4
Improvements to Presentation Pods
|
2017-10-29 16:11:00 -04:00 |
|
Chad Pilkey
|
596d8d1e01
|
close all ChatWindows when module is stopped
|
2017-10-29 15:57:12 -04:00 |
|
Chad Pilkey
|
f471bb7380
|
add proper window identification to PresentationWindows
|
2017-10-29 15:53:54 -04:00 |
|
Anton Georgiev
|
ebdaedd3ae
|
work on remove presentation from pod. WIP
|
2017-10-29 13:12:27 -04:00 |
|
Richard Alam
|
976b8cb687
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat
|
2017-10-29 09:13:07 -07:00 |
|
Anton Georgiev
|
d888af2583
|
cleanup; moved assignments after constructor
|
2017-10-29 11:53:16 -04:00 |
|
Anton Georgiev
|
2b25a6ff24
|
pass podId to showPresentation
|
2017-10-29 11:41:34 -04:00 |
|
Fred Dixon
|
f72fe51c1c
|
Update bigbluebutton.properties
Reverted serverURL to previous value
|
2017-10-29 11:15:34 -04:00 |
|
Anton Georgiev
|
d4e91dee4a
|
do not allow closing of DEFAULT_PRESENTATION_POD
|
2017-10-29 10:42:03 -04:00 |
|
Anton Georgiev
|
bbba00f083
|
make podId param in PresenterCommands event
|
2017-10-29 10:41:23 -04:00 |
|
Richard Alam
|
0c19bb9288
|
Merge branch 'antobinary-pods_vol4'
|
2017-10-28 18:02:47 -07:00 |
|
Richard Alam
|
5be0dec165
|
Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4
|
2017-10-28 17:32:29 -07:00 |
|
Richard Alam
|
fb90502a92
|
- sample layout.xml
|
2017-10-28 17:31:22 -07:00 |
|
Anton Georgiev
|
ef95a29dde
|
add podId to zoom event
|
2017-10-28 20:09:49 -04:00 |
|
Anton Georgiev
|
8dddd206c3
|
send presenter group to late joiner
|
2017-10-28 20:08:54 -04:00 |
|
Richard Alam
|
2761b3ce68
|
Merge pull request #4591 from ritzalam/implement-multi-chat
Implement multi chat
|
2017-10-28 19:05:21 -04:00 |
|
Richard Alam
|
09c5e602f7
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat
|
2017-10-28 16:03:33 -07:00 |
|
Richard Alam
|
20eab4c3cf
|
Merge pull request #4587 from antobinary/pods_vol4
Improvements on Presentation Pods
|
2017-10-28 19:02:25 -04:00 |
|
Richard Alam
|
c47569ae6c
|
- add logs
|
2017-10-28 16:02:05 -07:00 |
|
Richard Alam
|
1c304bb26c
|
Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4
|
2017-10-28 15:54:17 -07:00 |
|
Richard Alam
|
515ff2a6c9
|
- add more logging
|
2017-10-28 15:54:07 -07:00 |
|
Anton Georgiev
|
462dd1aae4
|
pass temp parameter to GetListOfPresentationsRequest
|
2017-10-28 18:32:39 -04:00 |
|
Anton Georgiev
|
65d65959cf
|
Merge branch 'antobinary-pods_vol4' of github.com:ritzalam/bigbluebutton into pods_vol4
|
2017-10-28 18:26:23 -04:00 |
|
Anton Georgiev
|
374d454357
|
propagate events to SlideView
|
2017-10-28 18:25:11 -04:00 |
|
Richard Alam
|
7885023e19
|
Merge branch 'implement-multi-chat' of github.com:ritzalam/bigbluebutton into antobinary-pods_vol4
|
2017-10-28 14:58:35 -07:00 |
|
Richard Alam
|
a683dca073
|
- fix initialization of var in command/event
- comment again positionPage method
|
2017-10-28 14:33:37 -07:00 |
|
Richard Alam
|
a5397054ae
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into antobinary-pods_vol4
|
2017-10-28 14:13:31 -07:00 |
|
Anton Georgiev
|
2703372d1c
|
handle current Pod Presenter in dropdown
|
2017-10-28 17:02:40 -04:00 |
|
Chad Pilkey
|
dba9359d13
|
Merge pull request #4589 from capilkey/chat-pod-layout
Make Chat Pods layout compatible
|
2017-10-28 14:50:54 -04:00 |
|
Chad Pilkey
|
47b98e0def
|
chat windows now open in order and the first is included in the layouts
|
2017-10-28 14:41:15 -04:00 |
|
Richard Alam
|
ffbacbfcfe
|
- display presentation on viewer when presenter uploads new presentation
|
2017-10-28 07:58:10 -07:00 |
|
Richard Alam
|
519da9033d
|
Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4
|
2017-10-27 17:16:57 -07:00 |
|
Anton Georgiev
|
99f409f41e
|
cleanup
|
2017-10-27 19:28:22 -04:00 |
|