Commit Graph

19371 Commits

Author SHA1 Message Date
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
Tainan Felipe
7abf8694cd add chat push notification andsrefactor audio notification 2017-10-27 17:29:48 -02:00
Gabriel Carvalho de Campes
ba019e52db fix issue preventing end meeting button to appear 2017-10-27 15:08:43 -02: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
Anton Georgiev
a210f2476a Merge pull request #4572 from KDSBrowne/z07-change-role-refactor
Change Role refactor
2017-10-27 13:22:41 -02:00
KDSBrowne
4899b88f27 change condition in changeRole logger message 2017-10-27 08:10:53 -07: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
Gabriel Carvalho de Campes
144705ce9b change func call to a variable 2017-10-27 11:44:42 -02:00
Gabriel Carvalho de Campes
75f82b923d gets default language from config 2017-10-27 11:23:18 -02:00
Gabriel Carvalho de Campes
436e7df7d4 removes unused css, removes unneeded code 2017-10-27 11:19:24 -02:00
Gabriel Carvalho de Campes
5a9a5fd1b0 code cleanup 2017-10-27 10:02:19 -02:00
Gabriel Carvalho de Campes
00bf09c4f9 Fix issue with locales 2017-10-27 09:36:27 -02:00