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

6612 Commits

Author SHA1 Message Date
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
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
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
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
Chad Pilkey
41c1adb717 fix exception when the PollModule is commented out 2017-10-26 12:46:11 -04:00
Ghazi Triki
870fb7de06 Exported shared notes window have a human readable time stamp. 2017-10-26 12:34:24 +01:00
Ghazi Triki
7e4017ad17 Remove code that was moved to locale change. 2017-10-25 20:28:42 +01:00
Richard Alam
1d79d39bba Merge branch '2.0-gui-fix' of https://github.com/riadvice/bigbluebutton into riadvice-2.0-gui-fix 2017-10-25 12:11:23 -07:00
Ghazi Triki
d1a76be4b0 Improve HTTPS needed for webcam. 2017-10-25 19:41:20 +01:00
Ghazi Triki
7fb1ef867d Change alert labels when locale is changed. 2017-10-25 19:10:30 +01:00
Ghazi Triki
f091d0d318 Code cleanup. 2017-10-25 18:17:41 +01:00
Ghazi Triki
900955e6b2 Make alert buttons larger. 2017-10-25 17:53:36 +01:00
Richard Alam
42f35b9549 Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4 2017-10-25 07:22:30 -07:00
Ghazi Triki
3f51c54744 Improve screen sharing switch display button style. 2017-10-25 08:06:06 +01:00
Richard Alam
cbdd70fff6 - update locales 2017-10-24 13:21:28 -07:00
Ghazi Triki
16e5e4e304 Updated PendingGuestsWindow to display guests and authenticated users. 2017-10-24 20:53:16 +01:00
Anton Georgiev
8e06408a33 set current presenter in pod 2017-10-24 15:49:57 -04:00
Ghazi Triki
e8b52f31e1 Improve GuestSettingsWindow implementation. 2017-10-24 17:40:03 +01:00
Ghazi Triki
b36bf8f4c1 Rename GuestWindow to PendingGuestsWindow and change the users VBox to a List. 2017-10-24 15:56:56 +01:00
Ghazi Triki
525fd7b294 Move guest settings button from the top bar to the user settings menu. 2017-10-23 23:05:08 +01:00