BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,018 Commits 13 Branches 260 Tags 1.1 GiB
943af59e6f
Commit Graph

19018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a1a0c4526c
Merge pull request #4594 from riadvice/2x-client-theme 
Fix toolbar background color option
 2017-10-29 12:21:05 -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
Ghazi Triki
ac7ae1d382 Fix toolbar background color option. 2017-10-29 16:43:26 +01: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
Fred Dixon
ec87a575f7
Update bigbluebutton.properties 
Revert serverURL to previous value
 2017-10-29 11:12:25 -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
Fred Dixon
2266919e3b
Merge pull request #4588 from ffdixon/v2.0.x-release 
Remove old reference to libreoffice.service
 2017-10-28 09:50:06 -04:00
Fred Dixon
1f43daeab0 Remove old reference to libreoffice.service 2017-10-28 09:48:20 -04: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
f5d65b8983
Merge pull request #4577 from Gcampes/kick-user-meeting-end 
Remove user on meeting end
 2017-10-27 21:19:20 -02: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
79c42c2156 Merge branch 'capilkey-condense-layout-tools-2.1' 2017-10-27 15:07:35 -07:00
Richard Alam
d1c6624510 - fix compile issue 2017-10-27 15:06:29 -07: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
Richard Alam
14691b2bf1 - change trigger for start/stop voice recording 2017-10-27 09:29:27 -07:00