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 |
|
Richard Alam
|
c14a946041
|
- generate recording path in akka-apps for audio
|
2017-10-26 14:07:22 -07:00 |
|
Ghazi Triki
|
c1abb17107
|
Check PPTX file and mark it as invalid if all slides are hidden.
|
2017-10-26 21:29:04 +01:00 |
|
Fred Dixon
|
4569e2d25e
|
Merge pull request #4575 from capilkey/fix-fit-to-width-extremes
Relax presentation resize bounds to accommodate fit-to-width
|
2017-10-26 15:00:48 -04:00 |
|
Chad Pilkey
|
18a97923c6
|
relax presentation resize bounds to accomodate fit-to-width
|
2017-10-26 13:20:43 -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 |
|
Richard Alam
|
436b4bcc1b
|
Merge pull request #4570 from ritzalam/add-user-on-reconnect
- add user into user's list when auto-reconnected to bbb-apps
|
2017-10-25 17:59:47 -04:00 |
|
Richard Alam
|
1fc7362b2b
|
- add user into user's list when auto-reconnected to bbb-apps
|
2017-10-25 14:58:09 -07:00 |
|
Ghazi Triki
|
7e4017ad17
|
Remove code that was moved to locale change.
|
2017-10-25 20:28:42 +01:00 |
|
Richard Alam
|
8a30f417bf
|
Merge branch 'riadvice-2.0-gui-fix' into v2.0.x-release
|
2017-10-25 12:20:37 -07: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 |
|
Richard Alam
|
aafcae9d79
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat
|
2017-10-25 11:36:45 -07:00 |
|
Richard Alam
|
e433b90322
|
Merge pull request #4569 from ritzalam/do-not-publish-doc
- do not publish doc and src when building jar
|
2017-10-25 14:24:15 -04:00 |
|