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

6628 Commits

Author SHA1 Message Date
Richard Alam
e665f2ac6e
Merge pull request #4616 from ritzalam/implement-multi-chat 
- setup polling of guest while waiting for approval from moderator
 2017-10-31 15:55:21 -04:00
Richard Alam
3056622283 - setup polling of guest while waiting for approval from moderator 2017-10-31 12:50:54 -07:00
Chad Pilkey
db44e24b9d
Merge pull request #4609 from capilkey/load-swf-cdn 
Allow loading SWFs from a CDN
 2017-10-31 13:46:07 -04:00
Anton Georgiev
0b7424d147
Merge pull request #4615 from antobinary/pods_vol4 
Presentation Pods -  Handle default presentation pod missing ownerId
 2017-10-31 15:42:08 -02:00
Chad Pilkey
052eed88d0 allow loading SWFs from a CDN 2017-10-30 17:28:32 -04:00
Richard Alam
0036b5734d - create guest lobby html page 2017-10-30 14:21:09 -07:00
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
e313647655 - fix presentation window name for sample multi pod layout 2017-10-30 12:08:56 -07:00
Richard Alam
974c1d7780 - sample default layou for chat 2017-10-30 10:00:31 -07: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
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
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
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
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
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
Anton Georgiev
d38a05105c work on maintaining correct state (current presentation in pod) 2017-10-27 19:17:50 -04:00
Fred Dixon
132f552e78
Merge pull request #4586 from capilkey/pod-compatible-layouts 
Changed the layout module to use custom names instead of the class name
 2017-10-27 18:51:04 -04:00
Chad Pilkey
15a495f931 changed the layout module to use custom names instead of the class name 2017-10-27 18:30:23 -04:00
Richard Alam
89809e83e9 Merge branch 'condense-layout-tools-2.1' of https://github.com/capilkey/bigbluebutton into capilkey-condense-layout-tools-2.1 2017-10-27 09:31:08 -07:00
Chad Pilkey
00c5a31ffb condense the layout tools down to one button 2017-10-27 11:47:12 -04:00
Richard Alam
84b12dfa94 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-10-27 07:51:17 -07:00
Richard Alam
ef4034bd61 Merge branch '2.0-gui-fix' of https://github.com/riadvice/bigbluebutton into riadvice-2.0-gui-fix 2017-10-27 07:47:04 -07:00
Anton Georgiev
1efe354031 work on default pod race condition and controlling current pres 2017-10-26 17:54:21 -04:00
Chad Pilkey
590e6ecec0 Merge pull request #4573 from capilkey/fix-poll-btn-exception 
Fix exception when the PollingModule is commented out
 2017-10-26 12:52:44 -04:00