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 |
|
Ghazi Triki
|
39fdeabf4c
|
Improved audio settings windows.
|
2017-07-31 14:53:04 +01:00 |
|
Klaus
|
0a1091f871
|
Merge branch 'slides-refactor-2x' of https://github.com/klauswk/bigbluebutton into slides-refactor-2x
|
2017-07-31 09:04:07 -03:00 |
|
Klaus
|
03f0061e2c
|
Fix lint
|
2017-07-31 09:03:46 -03:00 |
|
Oleksandr Zhurbenko
|
4e31181690
|
Resolve Alex cherry-pick
|
2017-07-31 08:30:08 -03:00 |
|
Klaus
|
9bc9116e5c
|
handling a few messages
|
2017-07-31 08:10:52 -03: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 |
|
Klaus
|
e43a44e828
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
|
2017-07-28 08:47:56 -03: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 |
|
Klaus
|
e2c0971e57
|
Add new icons
|
2017-07-27 17:45:40 -03: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 |
|
Klaus
|
eac898e81d
|
Merge branch 'bbb-2x-mconf' into html5-2x-chat-options
|
2017-07-27 17:36:01 -03:00 |
|
Klauswk
|
e751bcdadf
|
Merge branch 'bbb-2x-mconf' into slides-refactor-2x
|
2017-07-27 17:27:35 -03:00 |
|
Klaus
|
e23d75c16b
|
Captions mapped
|
2017-07-27 17:18:44 -03: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 |
|
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 |
|