Commit Graph

18821 Commits

Author SHA1 Message Date
Richard Alam
8939902143 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat 2017-10-24 13:24:38 -07:00
Richard Alam
af3273b427 Merge pull request #4561 from ritzalam/add-voice-users
Fix a couple of issue
2017-10-24 16:15:30 -04:00
Richard Alam
e02189b922 - fix https://github.com/bigbluebutton/bigbluebutton/issues/4541 2017-10-24 13:08:47 -07:00
Richard Alam
3e15405966 - show voice only users in get meeting api response 2017-10-24 12:59:09 -07:00
Richard Alam
fa6a1be518 - received redis pubsub messsages 2017-10-24 12:20:14 -07:00
Anton Georgiev
f7ba155f97 Merge pull request #4524 from oswaldoacauan/patch-3
[HTML5] Fix logClient method name
2017-10-24 17:04:38 -02:00
Anton Georgiev
967be17440 Merge pull request #4521 from Tainan404/fix-presenter-modal-bug
[HTML5] Fix presentation upload modal  bug
2017-10-24 17:02:47 -02:00
Anton Georgiev
9f2b364710 Merge pull request #4553 from OZhurbenko/fix-settings-cancel
[HTML5] - Fix for Settings not being closed
2017-10-24 16:58:40 -02:00
Oswaldo Acauan
e76459be65 Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3 2017-10-24 11:11:18 -02:00
Anton Georgiev
25da1672cd Merge pull request #4513 from oswaldoacauan/toast-notifications
[HTML5] Toast notifications
2017-10-24 11:05:48 -02:00
Oswaldo Acauan
fda223e81d Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3 2017-10-24 11:01:58 -02:00
Oswaldo Acauan
3bd0d349f8 Add handler to log all uncaught client exceptions 2017-10-24 10:59:23 -02:00
Oswaldo Acauan
45d604c63d Refactor logger from client to server 2017-10-24 10:58:46 -02:00
Tainan Felipe
8e2f29e667 changed assign of the function 2017-10-24 08:52:44 -02:00
Oswaldo Acauan
28c19ec82d Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-24 07:57:52 -02:00
Oleksandr Zhurbenko
a2c635d094 Fixed a bug with Settings not being closed when click Cancel 2017-10-23 16:19:02 -07:00
Oleksandr Zhurbenko
6049223e3a Fixed a typo 2017-10-23 16:16:54 -07:00
Richard Alam
6f10140eb3 - setup redis pubsub receiver for bbb-video 2017-10-23 14:37:47 -07:00
Richard Alam
1f99106ba1 - write chapter break done file to kick off processing 2017-10-23 13:31:07 -07:00
Richard Alam
066ceea0f4 - generate record chapter break event 2017-10-23 12:16:26 -07:00
Anton Georgiev
eb9dd49b75 Merge pull request #4551 from Tainan404/fix-errors-linter
[HTML5] Fix issue introduced on #4488
2017-10-23 15:53:32 -02:00
Fred Dixon
333f239b0b Merge pull request #4552 from riadvice/screen-share-improve
[Flash 2.0] - Center ScreenshareViewWindow and make windows behind visible
2017-10-23 13:49:11 -04:00
Ghazi Triki
ca18daa681 Update switch display button style. 2017-10-23 18:20:10 +01:00
Ghazi Triki
d1cadd1237 Center ScreenshareViewWindow and make windows behind visible. 2017-10-23 18:14:16 +01:00
Tainan Felipe
02c617da68 solve error in nav-bar component 2017-10-23 14:26:56 -02:00
Tainan Felipe
da608da325 fix merge issue 2017-10-23 14:15:55 -02:00
Tainan Felipe
1469791bc7 solve merge issues 2017-10-23 13:50:31 -02:00
Tainan Felipe
5ac96e6979 solve merge issues 2017-10-23 13:47:14 -02:00
Oswaldo Acauan
1dcfb9e3fa Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-23 13:31:33 -02:00
Richard Alam
6067b96db8 Merge branch 'master' into implement-multi-chat 2017-10-23 08:00:42 -07:00
Richard Alam
70654a5e63 Merge branch 'antobinary-pods_vol4' 2017-10-23 07:57:48 -07:00
Richard Alam
66349664bb Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4 2017-10-23 07:47:27 -07:00
Richard Alam
66f9b89206 Merge branch 'riadvice-no-locale-version' 2017-10-23 07:46:42 -07:00
Anton Georgiev
4566d82a2a Merge pull request #4488 from Tainan404/fix-errors-linter
[HTML5] Fix errors linter
2017-10-23 12:27:38 -02:00
Tainan Felipe
896883ecd9 remove comment in recording-indicator component 2017-10-23 12:01:00 -02:00
Oswaldo Acauan
f17faf6d75 Fix closeToast warning 2017-10-23 10:25:05 -02:00
Fred Dixon
ca285e13f6 Merge pull request #4550 from riadvice/screen-share-improve
[Flash 2.0] - Improve desktop sharing windows placement and resize window behaviour
2017-10-22 07:41:26 -04:00
Ghazi Triki
08eced8bbe Improve desktop sharing windows placement and resize window behaviour. 2017-10-22 11:56:27 +01:00
Oleksandr Zhurbenko
380c67f18f Merge pull request #4538 from MaximKhlobystov/khmer-locale-fix
[HTML5 Client] Khmer locale fix
2017-10-21 21:31:14 -04:00
Maxim Khlobystov
6dd484db4f Indentations cleanup. 2017-10-21 21:30:24 -04:00
Anton Georgiev
6f8abff77c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4 2017-10-21 08:50:25 -04:00
Anton Georgiev
6b19800836 update presenter group on add/remove 2017-10-21 08:19:52 -04:00
Anton Georgiev
325a6ef8f2 show presenter group in pod dropdown 2017-10-21 08:03:52 -04:00
Richard Alam
e918a2b1bf - start implementing segment recording 2017-10-20 14:47:36 -07:00
Richard Alam
fd8f38eacb - start implementing meeting manager and broadcast stream 2017-10-20 14:31:19 -07:00
Richard Alam
9d98a550c5 - formatting changes 2017-10-20 14:30:26 -07:00
Ghazi Triki
e1d534e856 Revert changes to build.xml 2017-10-20 22:05:30 +01:00
Ghazi Triki
d1772901f9 Remove locale version check feature. 2017-10-20 22:03:33 +01:00
Anton Georgiev
030567368a add/remove user from presenter groups 2017-10-20 17:01:57 -04:00
Oswaldo Acauan
8af4d227db Fix notification service exports 2017-10-20 17:27:00 -02:00