Richard Alam
|
3e59fabf8c
|
Merge branch 'add-presentwin-to-layout' of https://github.com/capilkey/bigbluebutton into capilkey-add-presentwin-to-layout
|
2017-10-29 13:00:36 -07:00 |
|
Chad Pilkey
|
f471bb7380
|
add proper window identification to PresentationWindows
|
2017-10-29 15:53:54 -04:00 |
|
Richard Alam
|
4a02399ad2
|
Merge branch 'antobinary-pods_vol4'
|
2017-10-29 12:52:03 -07:00 |
|
Richard Alam
|
ffab469980
|
Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4
|
2017-10-29 12:23:30 -07: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 |
|
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 |
|
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 |
|
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 |
|
Chad Pilkey
|
00c5a31ffb
|
condense the layout tools down to one button
|
2017-10-27 11:47:12 -04:00 |
|
Richard Alam
|
a7a8c2a0cc
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat
|
2017-10-27 08:03:25 -07:00 |
|
Richard Alam
|
4fdff6f78b
|
Merge pull request #4582 from ritzalam/synch-with-v2.0
Synch with v2.0
|
2017-10-27 10:52:57 -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
|
2aec000df6
|
Merge branch 'riadvice-2.0-gui-fix' into v2.0.x-release
|
2017-10-27 07:49:47 -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 |
|
Richard Alam
|
5b958fc0ad
|
Merge branch 'riadvice-pptx-hidden-slides' into v2.0.x-release
|
2017-10-27 07:45:30 -07:00 |
|
Richard Alam
|
26238e9d61
|
Merge branch 'pptx-hidden-slides' of https://github.com/riadvice/bigbluebutton into riadvice-pptx-hidden-slides
|
2017-10-27 07:41:35 -07:00 |
|
Anton Georgiev
|
970205f92d
|
Merge pull request #4556 from jfsiebel/fix-user-list-mute-unmute-logic
fix allowedToMuteAudio and allowedToUnmuteAudio logic and created action
|
2017-10-27 12:01:14 -02:00 |
|
Anton Georgiev
|
1efe354031
|
work on default pod race condition and controlling current pres
|
2017-10-26 17:54:21 -04:00 |
|
Richard Alam
|
51b9634bcd
|
- cahpterBreakLength config option
|
2017-10-26 14:14:00 -07:00 |
|