Commit Graph

16875 Commits

Author SHA1 Message Date
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
Ghazi Triki
08cb77c604 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into flex4-mx
# Conflicts:
#	bigbluebutton-client/build.xml
2017-06-07 10:16:35 +01:00
KDSBrowne
cf9d2d16e1 remove null values being announced by NVDA 2017-06-06 17:56:50 -07:00
Chad Pilkey
c46f5f8a17 Add instructions for stopping akka apps 2017-06-06 18:18:33 -04:00
Richard Alam
2989e1a694 - create classes for messages in flash client 2017-06-06 15:14:34 -07:00
Oleksandr Zhurbenko
4dbf02a344 Fixed a bug with the switches ref 2017-06-06 14:55:46 -07:00
Richard Alam
5ef4dd9e88 - change how we deserialize message so we can log errors
- add helper methods to add routing info for messages
 - add a way to deserialize message from client
2017-06-06 14:25:40 -07:00
JaeeunCho
5b658dcd97 HTML5 - fixed long string at cc box 2017-06-06 10:32:56 -07:00
JaeeunCho
36c306c36d Merge remote-tracking branch 'upstream/master' into long_string_cc 2017-06-06 10:31:14 -07:00
KDSBrowne
3cae15da59 fix conflicting keypress events 2017-06-06 10:19:25 -07:00
Anton Georgiev
18d9fb947e Merge pull request #3986 from OZhurbenko/fix-chat-links
HTML5 - Chat links fix
2017-06-06 09:49:32 -04:00
Klaus Klein
e7e1243fef Add const to defaultLang 2017-06-06 09:43:57 -03:00
Klaus Klein
0d9525164f Add support to default system/browser language 2017-06-06 09:33:53 -03:00
Oleksandr Zhurbenko
1ba4018629 Cleanup 2017-06-05 20:15:37 -07:00
Oleksandr Zhurbenko
52fae1b8c8 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into refs-to-callbacks 2017-06-05 19:51:20 -07:00
Oleksandr Zhurbenko
9f497d8991 Fixed scrollArea usage 2017-06-05 19:10:06 -07:00
Maxim Khlobystov
8ac038e6a1 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into webdriverio-setup 2017-06-06 00:14:10 +00:00