Commit Graph

19774 Commits

Author SHA1 Message Date
Tainan Felipe
d9f90943ee Skip direct messages of flash client 2018-04-12 13:25:54 -03:00
Tainan Felipe
d259a875f6 remove duplicated code in whiteboard-multi-user api 2018-04-11 16:37:46 -03:00
Anton Georgiev
b980dbd822
Merge pull request #5272 from Tainan404/issue-5256
Add tooltip when video menu is disabled in data saving setting
2018-04-10 16:01:49 -04:00
Tainan Felipe
7121a4c897 Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-5256 2018-04-10 16:48:13 -03:00
Anton Georgiev
f0a1464ded
Merge pull request #5293 from Tainan404/issue-5194
Add rule for don't show tooltip when dropdown is open.
2018-04-10 14:56:27 -04:00
Fred Dixon
be0b3cdb5a
Merge pull request #5331 from ritzalam/update-locales-apr-10-2018
- update locales
2018-04-10 11:14:13 -04:00
Richard Alam
483f057b8e - update locales 2018-04-10 07:32:44 -07:00
Fred Dixon
4a7408a612
Merge pull request #5330 from ffdixon/update-log-path
Update log path
2018-04-10 07:20:24 -04:00
Fred Dixon
61ad7072c6 Updated log path 2018-04-10 06:19:15 -05:00
Fred Dixon
6609acc5ed
Merge pull request #5328 from ffdixon/fix-bbb-conf-10
Detect if any processes are not running
2018-04-09 16:58:45 -04:00
Fred Dixon
4d8659aec0 Detect if any processes are not running 2018-04-09 15:57:25 -05:00
Anton Georgiev
aedb2633d5
Merge pull request #5312 from gutobenn/minor-bugs-fix
Fix small bugs on video-provider
2018-04-09 14:07:50 -04:00
Augusto Bennemann
89784d5d9f Remove box-shadow from close button 2018-04-09 14:26:29 -03:00
Fred Dixon
8508bf120c
Merge pull request #5324 from ffdixon/fix-bbb-conf-2
Update restart of kurento-media-server
2018-04-07 09:10:25 -04:00
Fred Dixon
862f45e3a0 Update restart of kurento 2018-04-07 09:00:40 -04:00
Tainan Felipe
d9bbd48753 fix username clipped in chat and userList 2018-04-06 16:45:59 -03:00
Augusto Bennemann
0085b4122b Fix call to isError() on SFU's media-server.js 2018-04-06 12:37:09 -03:00
Anton Georgiev
21b6dab852
Merge pull request #5267 from Tainan404/issue-5237
Add custom logo area
2018-04-05 15:08:05 -04:00
Tainan Felipe
539d9b7b15 Add branding setting on setting-production.json 2018-04-05 15:48:56 -03:00
Tainan Felipe
a5ccd54cc3 Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-5256 2018-04-05 15:31:24 -03:00
Oswaldo Acauan
2cb81d3428
Merge pull request #5307 from Tainan404/webcam-only-moderator
Comply lock setting "see other viewer's webcams"
2018-04-04 16:36:16 -03:00
Augusto Bennemann
79a49e596a Wait for user permission before starting timeout 2018-04-04 13:15:20 -03:00
Anton Georgiev
ff3f9758fa
Merge pull request #5285 from KDSBrowne/z-02-accessibility-zeeshan-3
Screen reader accessibility update
2018-04-04 10:07:01 -04:00
Tainan Felipe
cc6c3318cf rename variable of SHOULD_SHOW_CUSTOM to SHOW_BRANDING 2018-04-04 11:05:58 -03:00
Tainan Felipe
d206ffde93 Comply lock setting 'see other viewer's webcams' 2018-04-04 10:10:46 -03:00
KDSBrowne
d7ac0ef18d edit locale strings 2018-04-03 18:51:07 -07:00
KDSBrowne
782bd1c65b resolve lint issue 2018-04-03 18:04:25 -07:00
Augusto Bennemann
47d3ddc017 Reenable video button after SFU or permission error 2018-04-03 18:22:15 -03:00
Augusto Bennemann
7470e370f2 Add box-shadow on video button 2018-04-03 17:20:20 -03:00
Anton Georgiev
2f0a33b738
Merge pull request #5296 from oswaldoacauan/fix-5183
Sends a ejectUserFromVoice after removing a user
2018-04-03 13:26:30 -04:00
Anton Georgiev
0b03fb5a58
Merge pull request #5250 from oswaldoacauan/fix-4690
Remove getUserMedia in the first join as listen only
2018-04-03 13:26:09 -04:00
Oswaldo Acauan
9802dc73af Improve ice connection event handlers 2018-04-03 13:49:45 -03:00
KDSBrowne
fef9592a42 edit definedMessage object names 2018-04-03 09:48:02 -07:00
KDSBrowne
9340c19621
update strings 2018-04-03 10:58:01 -04:00
Oswaldo Acauan
3d74ad4847 Add event handlers for iceConnection errors 2018-04-03 10:50:18 -03:00
Oswaldo Acauan
df0a53d67c Merge branch 'fix-4690' of https://github.com/oswaldoacauan/bigbluebutton into fix-4690 2018-04-03 10:20:19 -03:00
Oswaldo Acauan
21550c1d3c Fix wrong connecting state when joining mic or echo test 2018-04-03 10:19:50 -03:00
Anton Georgiev
f83c4b617f
Merge pull request #5301 from antobinary/print-queue-size
Print length of queue of redis messages to be processed (debugging purposes)
2018-04-02 16:48:16 -04:00
Anton Georgiev
bbab765f82 print length of queue of redis messages to be processed 2018-04-02 20:16:46 +00:00
Tainan Felipe
8e1bca98f3 Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-5256 2018-04-02 16:29:11 -03:00
Anton Georgiev
51a014a6d2
Merge pull request #5292 from jfsiebel/pass-auth-token-to-rejoin-users
Enforce authToken to re-joining users
2018-04-02 14:59:51 -04:00
Anton Georgiev
5bf7f908b5
Merge pull request #5295 from Tainan404/issue-5015
Update clear status label for be consistent with userlist clear status
2018-04-02 14:51:12 -04:00
Anton Georgiev
7ed90880c3
Merge pull request #5273 from Tainan404/issue-5195
Fix see through edges of close button - issue #5195
2018-04-02 14:44:29 -04:00
Anton Georgiev
ccc4585cc7
Merge pull request #5281 from jfsiebel/change-data-saving-labels
Reverse data saving logic
2018-04-02 13:32:45 -04:00
João Francisco Siebel
2ff45a9d7f Rename function name to match his functionality 2018-04-02 14:08:25 -03:00
Oswaldo Acauan
1465c83fb6
Merge branch 'v2.0.x-release' into fix-4690 2018-04-02 12:50:45 -03:00
Anton Georgiev
abe379053e
Merge pull request #5294 from Tainan404/issue-5042
Add disabled label for whiteboard-toolbar.
2018-04-02 11:23:14 -04:00
Oswaldo Acauan
04b98036e7 Sends a ejectUserFromVoice after removing a user
Fix wrong linter change
2018-04-02 11:42:13 -03:00
Tainan Felipe Pauli de Almeida
7328d33b6c add disabled label for whiteboard-toolbar. closes #5042 2018-03-29 13:43:41 -03:00
Tainan Felipe Pauli de Almeida
bef61eeeda Add rule for don't show tooltip when dropdown is open. Closes #5194 2018-03-29 13:36:41 -03:00