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 |
|
Klaus
|
b015c98f82
|
Mapped annotations
|
2017-07-27 10:45:40 -03:00 |
|
prlanzarin
|
c3ba4eaac4
|
Fixed kurento-screenshare session ending
|
2017-07-27 13:17:55 +00:00 |
|
Klaus
|
c13155aa6a
|
Move shapes to annotations
|
2017-07-27 09:35:55 -03: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 |
|
Klaus
|
a1e57c84c3
|
Mapped meeting
|
2017-07-26 14:36:57 -03: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 |
|
Klaus
|
06b5538054
|
Mapped polls
|
2017-07-26 14:08:00 -03:00 |
|
Klaus
|
d05e3c6b14
|
Presentation mapped
|
2017-07-26 13:59:21 -03:00 |
|
prlanzarin
|
ade78eaff0
|
Changed kurento-screenshare session index to voiceBridge
|
2017-07-26 16:59:05 +00:00 |
|
Klaus
|
ff42dbc58b
|
Refactored slides
|
2017-07-26 13:39:53 -03: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 |
|
Klaus
|
355f777d0d
|
User mapped
|
2017-07-26 11:50:02 -03: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 |
|
Klaus
|
9ab4430f68
|
Fix merge stuff
|
2017-07-26 11:31:35 -03:00 |
|
Klaus
|
745b9070f6
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
|
2017-07-26 11:11:40 -03:00 |
|
Klaus
|
eea2c0ee8b
|
Refactor user
|
2017-07-26 11:09:07 -03:00 |
|