Commit Graph

16691 Commits

Author SHA1 Message Date
KDSBrowne
b80fb29fb2 switch to callback ref 2017-06-10 12:21:13 -07:00
KDSBrowne
c32f614bc8 add new line to end of file 2017-06-10 12:04:52 -07:00
KDSBrowne
cb96a26717 remove string concatenation 2017-06-10 11:56:14 -07:00
Richard Alam
a9528b3172 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into refactor-akka-fsesl-for-new-messages 2017-06-10 11:28:12 -07:00
Richard Alam
bf8840448b Merge pull request #4010 from capilkey/multiuser-whiteboard-fixes
Rework setting the whiteboardId to display
2017-06-10 14:26:48 -04:00
KDSBrowne
01a250e5b7 fix console error with FindDOMNode() on unmounted component 2017-06-10 11:22:54 -07:00
Richard Alam
35b449b199 - create new status models 2017-06-10 11:11:22 -07:00
Richard Alam
e69b451a7b - cleanup 2017-06-09 13:30:52 -07:00
Chad Pilkey
28101e5623 moved setting the whiteboard id to display out of preswindow 2017-06-09 15:30:20 -04:00
KDSBrowne
ae883f1065 remove console log 2017-06-09 12:08:52 -07:00
KDSBrowne
0fc81cf63d clean up key events 2017-06-09 12:04:21 -07:00
Richard Alam
4727eb8e8e - send messages from fs to akka apps 2017-06-09 11:04:17 -07:00
KDSBrowne
65bf70b293 add overflow: visible to show userlist item dropdown menu chevron 2017-06-09 09:27:18 -07:00
Richard Alam
1ce425b647 Merge pull request #4004 from ritzalam/implement-recording-of-new-messages
Use redis scala for recording events into redis
2017-06-09 10:16:35 -04:00
Fred Dixon
b963f4a5ee Create README.md 2017-06-09 06:03:24 -04:00
Richard Alam
ea909f7a25 Merge pull request #4007 from capilkey/multiuser-whiteboard-fixes
Multi-user whiteboard fixes
2017-06-08 20:56:25 -04:00
Richard Alam
1ccf71cad7 - add new voice conf messages 2017-06-08 17:55:27 -07:00
Chad Pilkey
b4429fbf2d remove mconf branding that shouldn't be there 2017-06-08 18:39:45 -04:00
Chad Pilkey
894b5bcab6 remove unneeded redraw of the annotation history 2017-06-08 18:39:22 -04:00
Chad Pilkey
e1a50bed32 stop sending redundant slide pos updates 2017-06-08 18:38:43 -04:00
Chad Pilkey
e7a2e3d70b send page changes to the whiteboard canvas again 2017-06-08 18:37:36 -04:00
Chad Pilkey
f559a54a95 fix presentation startup race condition 2017-06-08 18:34:38 -04:00
Richard Alam
9b9b93c779 - record new messages 2017-06-08 13:11:46 -07:00
Richard Alam
b3e5bd1c37 - remove jedis dependecy 2017-06-08 11:29:44 -07:00
Richard Alam
aa99cb45eb - use redis scala to record events to redis instead of jedis 2017-06-08 11:16:18 -07:00
KDSBrowne
13ab2134a9 remove console log 2017-06-08 11:06:04 -07:00
KDSBrowne
000575f38a fix menu not closing on click 2017-06-08 11:05:11 -07:00
KDSBrowne
c189faceff fix merge conflicts 2017-06-08 11:00:06 -07:00
KDSBrowne
dd4e1ba488 fix keycode events 2017-06-08 10:40:14 -07:00
Klaus Klein
68f52aa107 Remove error from http response 2017-06-08 14:29:35 -03:00
KDSBrowne
3906448d71 fix keydown event bugs 2017-06-08 08:33:25 -07:00
Anton Georgiev
76beca5593 Merge pull request #3980 from JaeeunCho/long_string_cc
HTML5 - fixed long string at cc box
2017-06-07 18:03:52 -04:00
JaeeunCho
d902724309 HTML5 - removed useless line 2017-06-07 14:57:27 -07:00
JaeeunCho
c7e654511c Merge remote-tracking branch 'upstream/master' into long_string_cc 2017-06-07 14:53:39 -07:00
Richard Alam
b6f1b6447d - start refactoring recording service 2017-06-07 14:48:33 -07:00
Anton Georgiev
329a0c0882 Merge pull request #3972 from MaximKhlobystov/webdriverio-setup
[HTML5 Client] Initial Acceptance Tests Setup
2017-06-07 17:12:50 -04:00
Richard Alam
9d88c8252b Merge pull request #4002 from ritzalam/migrate-messages
handle start/stop broadcast cam on the client
2017-06-07 15:15:04 -04:00
Richard Alam
7db33c594b - handle start/stop brocast cam on the client 2017-06-07 12:12:30 -07:00
Anton Georgiev
7f909058aa Merge pull request #3987 from OZhurbenko/refs-to-callbacks
[HTML5] String refs to callback refs
2017-06-07 15:11:09 -04:00
KDSBrowne
0c05597f3d Merge remote-tracking branch 'origin/x0-userlist-accessibility-bug-fixes' into x0-userlist-accessibility-suggestions 2017-06-07 11:37:07 -07:00
KDSBrowne
c2579c7838 fix console error related to messageForm 2017-06-07 11:36:25 -07:00
Richard Alam
51bd8f5f07 Merge pull request #4001 from ritzalam/migrate-messages
user start/stop broadcast cam message
2017-06-07 14:15:32 -04:00
Richard Alam
7e14c133b3 - send start/stop broadcasting webcam from client to server
- send webcam broadcast started/stopped event from server to client
2017-06-07 11:08:46 -07:00
Richard Alam
d48d06c69f - send validate token using new message 2017-06-07 08:04:33 -07:00
Richard Alam
8fa960e46d Merge pull request #3989 from riadvice/add-show-webrtc-mos-feature
Add showWebRTCMOS option to PhoneModule
2017-06-07 10:44:38 -04:00
Richard Alam
8998737a5f Merge pull request #4000 from ritzalam/migrate-messages
- change how we deserialize message so we can log errors
2017-06-07 10:35:58 -04:00
Richard Alam
15f4a61e52 Merge pull request #3969 from riadvice/flex4-mx
Move the application to Flex 4 MX
2017-06-07 10:33:12 -04:00
Richard Alam
ca7a8d7bad Merge pull request #3995 from capilkey/whiteboard-cursor-fixes
Whiteboard cursor fixes
2017-06-07 10:03:24 -04:00
KDSBrowne
f17dfd04cf fix focus bug 2017-06-07 06:44:18 -07:00
Klaus Klein
f135dbd129 Add check to undefined role 2017-06-07 10:02:31 -03:00