Commit Graph

17342 Commits

Author SHA1 Message Date
Anton Georgiev
7b40122c89 Merge pull request #4121 from mmarangoni/call-manager
[HTML5] Implemented AudioManager
2017-07-31 14:29:42 -04:00
Richard Alam
510d7717ab Merge pull request #4167 from ritzalam/fix-user-leaving
tracking user disconnects
2017-07-31 13:58:18 -04:00
Richard Alam
747c197239 - add analytics actor for logging messages we are interested in. Better to do this in another app
but don't want to create another app for now. Might extract this sometime in the future.
2017-07-31 10:54:05 -07:00
Chad Pilkey
56b362e3c7 Merge pull request #4165 from capilkey/2.0-message-recording
Replace old Java event recording with Scala equivalent
2017-07-31 13:24:18 -04:00
Anton Georgiev
f6699b10f7 Merge pull request #4166 from antobinary/request-wb-access-on-meteor-start
Inform meteor app about current multi-user property in each meeting
2017-07-31 13:21:51 -04:00
Anton Georgiev
39565e5a72 switch to a new sync message on html5 only redis channel 2017-07-31 12:12:16 -04:00
Chad Pilkey
f69a70bb3b remove old java record classes in akka-apps 2017-07-31 12:07:06 -04:00
Chad Pilkey
1f8aa4618f new akka-apps record structure 2017-07-31 12:02:13 -04:00
Richard Alam
3a6225da2a - reset timestamp of when last user left when a user joins the meeting 2017-07-31 08:55:58 -07:00
Richard Alam
90a98267ed - change message when user logs out and ends the meeting 2017-07-31 08:54:33 -07:00
Richard Alam
b887a65fe9 Merge branch 'pedrobmarin-sharednotes-limit' into bbb-2x-mconf 2017-07-31 08:51:31 -07:00
Richard Alam
4c92969a45 Merge branch 'sharednotes-limit' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-sharednotes-limit 2017-07-31 08:44:14 -07:00
Richard Alam
7577e5c8ee Merge branch 'antobinary-handle-presenter-gone' into bbb-2x-mconf 2017-07-31 08:42:26 -07:00
Richard Alam
2d2261f36a Merge branch 'handle-presenter-gone' of https://github.com/antobinary/bigbluebutton into antobinary-handle-presenter-gone 2017-07-31 08:32:42 -07:00
Pedro Beschorner Marin
c919a203e7 Removed extra line included by mistake 2017-07-30 22:37:55 +00:00
Pedro Beschorner Marin
77603a62c8 Limiting the number of shared notes 2017-07-30 22:11:13 +00:00
Anton Georgiev
88055c5ca9 add sync of whiteboard access on meteor start 2017-07-28 17:57:41 -04:00
Anton Georgiev
173ba4531a stop screenshare and poll on presenter leave 2017-07-28 17:16:03 -04:00
Richard Alam
ccb5b8b5cc Merge branch 'ritzalam-do-not-send-extra-msg-on-val-token' into bbb-2x-mconf 2017-07-27 14:00:40 -07:00
Richard Alam
87e035c7a5 Merge branch 'do-not-send-extra-msg-on-val-token' of https://github.com/ritzalam/bigbluebutton into ritzalam-do-not-send-extra-msg-on-val-token 2017-07-27 13:52:33 -07:00
Richard Alam
ddef378e6a Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-07-27 13:51:40 -07:00
Richard Alam
c2cf511956 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-07-27 13:47:13 -07:00
Richard Alam
eb994c09a3 - do not send extra messages on validate token response
- make flash client explicitly send user join message to server
2017-07-27 13:42:36 -07:00
Ghazi Triki
b6f11c5604 Updated list text states colours and bottom bar items height. 2017-07-27 21:36:23 +01:00
Anton Georgiev
b78f40b543 Merge pull request #4119 from JaeeunCho/new_icon
[HTML5 2.0] added new icons
2017-07-27 15:49:33 -04:00
Richard Alam
7da4d1cba9 Merge pull request #4153 from ritzalam/log-meeting-expiry-reasone
- reset last user left timestamp when user joins meeting
2017-07-27 15:15:46 -04:00
Richard Alam
156436d34a - reset last user left timestamp when user joins meeting 2017-07-27 12:13:05 -07:00
Richard Alam
30502fadf9 Merge pull request #4152 from ritzalam/log-meeting-expiry-reasone
Log meeting expiry
2017-07-27 14:37:07 -04:00
Richard Alam
3fd747a9b3 - log when meeting ends 2017-07-27 11:35:26 -07:00
Richard Alam
0541fd2935 - fix message name for requesting url of breakout room 2017-07-27 11:34:52 -07:00
Ghazi Triki
997fa45d2d Replace connection lost animation by a static asset. 2017-07-27 18:28:12 +01:00
Richard Alam
1704ba0e81 Merge pull request #4151 from ritzalam/log-meeting-expiry-reasone
- log reason when meeting expires
2017-07-27 13:19:05 -04:00
Richard Alam
6df8305dac - log reason when meeting expires 2017-07-27 10:18:03 -07:00
Anton Georgiev
2cc319043c Merge pull request #4147 from antobinary/html5-2x-fix-audio
[HTML5] Recovered Screenshare in the HTML5 client 2.0
2017-07-27 12:13:28 -04:00
Richard Alam
273ebb15ce Merge branch 'prlanzarin-akka-transcode-new-messages' into bbb-2x-mconf 2017-07-27 08:49:40 -07:00
Ghazi Triki
60fceb8726 Remove tooltip from MDIWindow title bar. 2017-07-27 16:48:42 +01:00
Ghazi Triki
8ef1969cb0 Minor update for chat and presentation toolbar icons. 2017-07-27 16:48:18 +01:00
Anton Georgiev
13b406313e drop handling of fsesl->akka-apps events 2017-07-27 11:27:06 -04:00
Richard Alam
d39e823a85 Merge branch 'akka-transcode-new-messages' of https://github.com/prlanzarin/bigbluebutton-1 into prlanzarin-akka-transcode-new-messages 2017-07-27 07:53:27 -07:00
prlanzarin
c3ba4eaac4 Fixed kurento-screenshare session ending 2017-07-27 13:17:55 +00:00
Richard Alam
ea00a8b019 Merge branch 'perroned-ss-loading' into bbb-2x-mconf 2017-07-26 15:03:01 -07:00
Richard Alam
d57193ba1a Merge branch 'ss-loading' of https://github.com/perroned/bigbluebutton into perroned-ss-loading 2017-07-26 14:46:20 -07:00
perroned
d12d90b650 Screenshare loading screen 2017-07-26 20:43:08 +00:00
Richard Alam
f0a8f03f36 Merge pull request #4148 from ritzalam/convert-over-lock-settings
- convert over lock setting into 2x messages
2017-07-26 16:37:18 -04:00
Richard Alam
6fb08c1396 - convert over lock setting into 2x messages 2017-07-26 13:19:19 -07:00
JaeeunCho
7fc1fa376f changed 'romm' to 'room' 2017-07-26 11:04:55 -07:00
Anton Georgiev
4c19d0589b reorganize object destruction 2017-07-26 14:01:38 -04:00
Matthew Marangoni
0ab3bcc599 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager 2017-07-26 10:59:05 -07:00
Matthew Marangoni
7c0d802f27 fixed undefined extension 2017-07-26 10:58:39 -07:00
Anton Georgiev
5ca6f63d7e Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into html5-2x-fix-audio 2017-07-26 13:49:57 -04:00