Klaus
|
2343ef3f1f
|
Add missing merge file
|
2017-07-17 13:38:18 -03:00 |
|
Klaus
|
3af281d648
|
Merge remote-tracking branch 'upstream/master' into merge-master-mconf
|
2017-07-17 13:33:45 -03:00 |
|
Richard Alam
|
6f2e3936b1
|
Merge pull request #4106 from ritzalam/restructure-handlers
- restructure handlers to make it easier to test
|
2017-07-16 21:37:04 -04:00 |
|
Richard Alam
|
eb9a96348a
|
- restructure handlers to make it easier to test
|
2017-07-16 18:34:44 -07:00 |
|
Richard Alam
|
da9ca0c0ca
|
Merge pull request #4105 from ritzalam/fix-users-chat-list
- display users list for private chat
|
2017-07-16 19:49:07 -04:00 |
|
Richard Alam
|
7ff3b9f516
|
- display users list for provate chat
|
2017-07-16 16:47:48 -07:00 |
|
Richard Alam
|
103d8a1438
|
Merge pull request #4104 from ritzalam/get-users-msg-2x
convert get users query to 2x
|
2017-07-16 17:07:52 -04:00 |
|
Richard Alam
|
43edb0ea4c
|
- convert get users query to 2x
|
2017-07-16 14:06:05 -07:00 |
|
Richard Alam
|
ea035de2ed
|
Merge pull request #4103 from ritzalam/implement-meeting-expiry
Implement meeting expiry
|
2017-07-16 11:28:27 -04:00 |
|
Richard Alam
|
bf1031374a
|
- pass timeout expire when last user leaves from bbb-web to akka-apps
|
2017-07-16 08:11:48 -07:00 |
|
Richard Alam
|
8994c7f644
|
Merge branch 'bbb-2x-mconf' into implement-meeting-expiry
|
2017-07-16 07:49:45 -07:00 |
|
Richard Alam
|
9772de2d59
|
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf
|
2017-07-16 07:25:28 -07:00 |
|
Richard Alam
|
d80a6d42a9
|
Merge branch 'capilkey-cleanup-old-1.1-apps' into bbb-2x-mconf
|
2017-07-16 07:24:48 -07:00 |
|
Richard Alam
|
7dd2191b63
|
Merge branch 'cleanup-old-1.1-apps' of https://github.com/capilkey/bigbluebutton into capilkey-cleanup-old-1.1-apps
|
2017-07-16 07:16:50 -07:00 |
|
Richard Alam
|
0f39d99ce5
|
- implement meeting expiry
|
2017-07-15 19:10:04 -07:00 |
|
Chad Pilkey
|
f4a5286005
|
remove pre-2.0 breakout room code
|
2017-07-15 19:00:18 -04:00 |
|
Chad Pilkey
|
e41b991716
|
Merge pull request #4100 from capilkey/cleanup-old-1.1-apps
Clean up pre-2.0 voice message code
|
2017-07-15 18:57:40 -04:00 |
|
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
|
1bb72e6391
|
clean up pre-2.0 voice message code
|
2017-07-15 17:33:25 -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
|
a0467f319c
|
Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle
|
2017-07-15 09:30:02 -07: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 |
|
Richard Alam
|
80213da06e
|
- try writing test
- start implementing meeting inactivity
- updated scalariform to format scala code
|
2017-07-14 14:50:34 -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 |
|
Anton Georgiev
|
d2d6e1d029
|
Merge pull request #4056 from KDSBrowne/x03-client-audit-semantics
[HTML5] - Accessibility Contrast & Semantic Fixes
|
2017-07-14 15:17:49 -04: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 |
|
KDSBrowne
|
fc8cb5688b
|
change #fff to -white and fix lint issue
|
2017-07-14 10:39:33 -07:00 |
|
Anton Georgiev
|
a251305cab
|
Merge pull request #4036 from KDSBrowne/x0-userlist-jaws-fix
[HTML5] - ARIA fixes to work with JAWS
|
2017-07-14 13:26:07 -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 |
|