Commit Graph

17370 Commits

Author SHA1 Message Date
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
JaeeunCho
315dae97d7 Merge branch 'new_icon' of https://github.com/JaeeunCho/bigbluebutton into new_icon 2017-07-26 10:17:37 -07:00
JaeeunCho
09fb57d7a2 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into new_icon 2017-07-26 10:14:50 -07:00
prlanzarin
ade78eaff0 Changed kurento-screenshare session index to voiceBridge 2017-07-26 16:59:05 +00:00
Richard Alam
bc584f79e8 Merge pull request #4145 from ritzalam/display-time-remaining
Display time remaining
2017-07-26 11:53:37 -04:00
Richard Alam
67808fcb66 - display time remaining when meeting duration is not zero 2017-07-26 08:49:28 -07:00
Anton Georgiev
305b47e535 improve getSessionToken function and use it on verto_extension 2017-07-26 11:43:47 -04:00
Richard Alam
f9d49b65e1 - handle meeting muted and inactive messages 2017-07-26 08:37:19 -07:00
Anton Georgiev
f3d8a17748 Merge pull request #4141 from antobinary/fix-html5-demo-jsp
Use mod and attendee passwords in createMeeting call in demoHTML5.jsp
2017-07-26 11:07:56 -04:00
Richard Alam
5406a9d4cc Merge pull request #4143 from ritzalam/fix-breakout-room-messaging
breakout room and other bugs
2017-07-26 11:06:00 -04:00
Richard Alam
fe7bd03297 Merge branch 'bbb-2x-mconf' into fix-breakout-room-messaging 2017-07-26 07:58:02 -07:00
Richard Alam
1254b37265 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-07-26 07:57:27 -07:00
Richard Alam
0274656058 - display timer only when there is meeting duration 2017-07-26 07:51:10 -07:00
JaeeunCho
a12bd8c224 changed @font-face and class 2017-07-26 07:46:12 -07:00
Ghazi Triki
63b48d9db8 Restrict using emoji from version 1.1 only 2017-07-26 15:41:41 +01:00
Anton Georgiev
108716e878 use mod and attendee passwords in createMeeting call 2017-07-26 09:36:14 -04:00
Anton Georgiev
dbcf6dbd2c screenshare displays except at refresh 2017-07-26 09:18:15 -04:00
Richard Alam
0f04b69897 Merge branch 'fix-breakout-room-messaging' of github.com:ritzalam/bigbluebutton into fix-breakout-room-messaging 2017-07-25 17:44:17 -07:00
Richard Alam
4a3a746949 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging 2017-07-25 17:07:48 -07:00
Richard Alam
db8487dc0c Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-07-25 17:06:20 -07:00
Richard Alam
a1ff444760 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-07-25 16:57:26 -07:00
Ghazi Triki
a31452c17f Update glow effect colour. 2017-07-25 23:11:12 +01:00
Richard Alam
36e8f02667 - fix meeting expiry 2017-07-25 15:02:07 -07:00
Anton Georgiev
4e34a7f551 screenshare displays except at refresh 2017-07-25 16:56:40 -04:00