Chad Pilkey
|
c9ec18d10a
|
Merge pull request #4099 from capilkey/cleanup-old-1.1-apps
Cleanup of whiteboard, caption, and poll
|
2017-07-15 17:33:34 -04:00 |
|
Chad Pilkey
|
cc1e47ecef
|
fixed the poll annotation drawing
|
2017-07-15 15:34:30 -04:00 |
|
Chad Pilkey
|
2dfd202a0b
|
reorganized akka-apps whiteboard, cleaned up caption and poll
|
2017-07-15 15:31:49 -04:00 |
|
Richard Alam
|
ab9741df2f
|
Merge pull request #4097 from perroned/fix-log-error
Comma to plus
|
2017-07-15 11:16:24 -04:00 |
|
perroned
|
0a6bb57580
|
Comma to plus
|
2017-07-15 10:59:45 -04:00 |
|
Richard Alam
|
335c547b82
|
Merge pull request #4077 from perroned/WebRTC-Screenshare-logging
Adds some WebRTC Screenshare logging
|
2017-07-15 09:19:45 -04:00 |
|
Richard Alam
|
407fdaad3d
|
Merge pull request #4090 from perroned/verto-stun-turn
Enable stun/turn use within verto
|
2017-07-15 09:18:41 -04:00 |
|
Richard Alam
|
ae614b8908
|
Merge pull request #4094 from perroned/screenshare-show-button
Sets showButton to true
|
2017-07-15 09:18:03 -04:00 |
|
Richard Alam
|
a23d8e293e
|
Merge branch 'capilkey-cleanup-old-1.1-apps' into bbb-2x-mconf
|
2017-07-15 06:16:42 -07:00 |
|
Richard Alam
|
259825272a
|
Merge branch 'cleanup-old-1.1-apps' of https://github.com/capilkey/bigbluebutton into capilkey-cleanup-old-1.1-apps
|
2017-07-15 06:10:52 -07:00 |
|
Chad Pilkey
|
3c60131a5c
|
remove pre-2.0 layout message code
|
2017-07-14 16:57:20 -04:00 |
|
Chad Pilkey
|
f210df7724
|
Merge pull request #4095 from capilkey/cleanup-old-1.1-apps
Remove pre-2.0 poll message code
|
2017-07-14 16:55:58 -04:00 |
|
Chad Pilkey
|
e24e356432
|
Merge pull request #4093 from capilkey/cleanup-old-1.1-apps
Remove pre-2.0 presentation message code
|
2017-07-14 16:18:59 -04:00 |
|
Chad Pilkey
|
816daf29ae
|
remove pre-2.0 poll message code
|
2017-07-14 16:10:17 -04:00 |
|
Anton Georgiev
|
07ca5f5794
|
Merge pull request #4086 from oswaldoacauan/guest-policy
[HTML5] Guest Policy
|
2017-07-14 15:32:18 -04:00 |
|
Oswaldo Acauan
|
8c99b7e4bb
|
Fix cb pattern
|
2017-07-14 16:25:04 -03:00 |
|
perroned
|
9315143a5e
|
Sets showButton to true
|
2017-07-14 15:14:00 -04:00 |
|
Chad Pilkey
|
5ebdd61d3b
|
remove pre-2.0 presentation message code
|
2017-07-14 14:19:20 -04:00 |
|
Anton Georgiev
|
ae5f556e64
|
Merge pull request #4092 from Klauswk/html5-2x-fixlogout
[HTML5 2.0] Fix User logout
|
2017-07-14 13:23:27 -04:00 |
|
Klaus
|
baf36d9d5f
|
Fix the html5 2.0 user logout
|
2017-07-14 13:59:02 -03:00 |
|
perroned
|
ef50f8733f
|
Enable stun/turn use
|
2017-07-14 11:15:58 -04:00 |
|
Fred Dixon
|
665e24c131
|
Merge pull request #4089 from ffdixon/bbb-2x-mconf
Update screenshareRtmpServer on bbb-conf --setip
|
2017-07-14 10:46:32 -04:00 |
|
Fred Dixon
|
b106302aa3
|
Updated screenshareRtmpServer in screenshareRtmpServer
|
2017-07-14 09:45:21 -05:00 |
|
Fred Dixon
|
11f6945905
|
Updated screenshareRtmpServer in screenshareRtmpServer
|
2017-07-14 09:43:34 -05:00 |
|
Anton Georgiev
|
a00410847c
|
Merge pull request #4083 from Klauswk/html5-breakout-messages
[HTML5 2.0] Move breakout messages to 2.0
|
2017-07-14 10:39:38 -04:00 |
|
Anton Georgiev
|
586c51fcac
|
Merge pull request #4080 from Klauswk/bbb-2x-emoji-messages
[HTML5 2.0] Move emoji messages to 2.0
|
2017-07-14 10:39:16 -04:00 |
|
Fred Dixon
|
9104d440f7
|
Update screenshareConfSuffix when doing bbb-conf --setip
|
2017-07-14 09:33:30 -05:00 |
|
Oswaldo Acauan
|
fe9ca6b0c8
|
Fix welcome message for guest users
|
2017-07-14 11:23:12 -03:00 |
|
Oswaldo Acauan
|
2e6ee550d2
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into guest-policy
|
2017-07-14 11:18:40 -03:00 |
|
Oswaldo Acauan
|
5353a3a80d
|
Add guest policy to html5
|
2017-07-14 11:18:07 -03:00 |
|
Fred Dixon
|
17212d93ff
|
Update bigbluebutton-release
|
2017-07-14 10:14:06 -04:00 |
|
Richard Alam
|
4b9968efe6
|
Merge branch 'capilkey-convert-global-audio-messages' into bbb-2x-mconf
|
2017-07-13 18:17:28 -07:00 |
|
Richard Alam
|
4d12ed57fd
|
- remove log noise
|
2017-07-13 18:16:18 -07:00 |
|
Richard Alam
|
5bccf11319
|
Merge branch 'convert-global-audio-messages' of https://github.com/capilkey/bigbluebutton into capilkey-convert-global-audio-messages
|
2017-07-13 17:33:22 -07:00 |
|
Richard Alam
|
9ad2e37494
|
Merge branch 'antobinary-implement-bbb-web-msgs' into bbb-2x-mconf
|
2017-07-13 17:27:37 -07:00 |
|
Richard Alam
|
6e3d9acb06
|
Merge branch 'implement-bbb-web-msgs' of https://github.com/antobinary/bigbluebutton into antobinary-implement-bbb-web-msgs
|
2017-07-13 17:17:53 -07:00 |
|
Chad Pilkey
|
86da035674
|
move the global audio messages to the 2.0 format
|
2017-07-13 18:09:15 -04:00 |
|
Klauswk
|
38087a1669
|
Merge branch 'bbb-2x-mconf' into html5-breakout-messages
|
2017-07-13 17:38:54 -03:00 |
|
Klaus
|
82f383f4ae
|
Fix typo in createBreakout
|
2017-07-13 17:35:40 -03:00 |
|
Klaus
|
6c602ba56f
|
Add missing import and add FIX ME
|
2017-07-13 17:28:35 -03:00 |
|
Klaus
|
12f1254624
|
Fix missing merge in redis2x
|
2017-07-13 17:23:20 -03:00 |
|
Klaus
|
858076924c
|
Fix import problems
|
2017-07-13 17:21:27 -03:00 |
|
Klaus
|
963248163d
|
Merge branch 'bbb-2x-mconf' into html5-breakout-messages
|
2017-07-13 17:14:02 -03:00 |
|
Anton Georgiev
|
94807f5d1c
|
Merge pull request #4078 from Klauswk/html5-2x-chat-messages
[HTML5 2.0] Move chat messages to 2.0
|
2017-07-13 13:30:35 -04:00 |
|
Klaus
|
c97ad780b5
|
Fix properties incorrect name
|
2017-07-13 13:55:05 -03:00 |
|
Anton Georgiev
|
1fba3f0009
|
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs
|
2017-07-13 12:30:51 -04:00 |
|
Anton Georgiev
|
701ada98a8
|
unsubscribe from screenshare bus channel
|
2017-07-13 12:27:30 -04:00 |
|
Fred Dixon
|
795381d2ce
|
Merge pull request #4081 from ritzalam/update-jws-screenshare
Update jws screenshare
|
2017-07-13 12:12:16 -04:00 |
|
Anton Georgiev
|
3d420cf459
|
force disconnect for all users on meeting end
|
2017-07-13 11:58:16 -04:00 |
|
Richard Alam
|
a7efe5364c
|
- webrtc map shouldn't handle jws events
|
2017-07-13 08:25:49 -07:00 |
|