Commit Graph

25156 Commits

Author SHA1 Message Date
Anton Georgiev
f095f04fd3
Merge pull request #7702 from capilkey/fix-user-roles
Clean up user roles
2019-07-04 14:57:19 -04:00
Anton Georgiev
1622b4ad53
Merge pull request #7583 from jfsiebel/reconnection-improvement
Improve client reconnection
2019-07-04 14:53:35 -04:00
Anton Georgiev
c14e6074d9
Merge pull request #7708 from Tainan404/fix-user-leaving
Add ping-pong message to html5 client
2019-07-04 14:41:59 -04:00
Joao Siebel
18670fdaf2 Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-07-04 15:09:06 -03:00
Anton Georgiev
595d46f9e2
Merge pull request #7727 from KDSBrowne/issue-7725
Fix cannot read property 'focus' of null
2019-07-04 14:02:22 -04:00
KDSBrowne
7cc2f551b6 add parentheses to equation 2019-07-04 17:58:38 +00:00
KDSBrowne
2d3f43edf9 use calculation to find max z-index 2019-07-04 17:54:20 +00:00
KDSBrowne
2bf92f921b move comment 2019-07-04 17:48:13 +00:00
KDSBrowne
cd9e89ca88 fix Cannot read property 'focus' of null / lint issues 2019-07-04 17:35:32 +00:00
Paulo Lanzarin
918f23777b
Merge pull request #7726 from bigbluebutton/antobinary-userAgent
Avoid re-defining userAgent in kurento-utils.js
2019-07-04 13:13:35 -04:00
Anton Georgiev
02a09b9f1f
Avoid re-defining userAgent in kurento-utils.js
Addresses the error seen in
`"stackTrace":"TypeError: can't redefine non-configurable property \"userAgent\""`

Note, there are still definitions of `ua` in the code so ideally we need to extract this out.
2019-07-04 12:53:40 -04:00
Anton Georgiev
49add06af9
Merge pull request #7719 from Tainan404/issue-7714
Add lock verification for users actions
2019-07-04 10:27:15 -04:00
Tainan Felipe
00e4358a48 Pass lock verification to component 2019-07-03 15:40:07 -03:00
Tainan Felipe
dbd0efebc3 Add lock verification for users actions 2019-07-03 11:18:46 -03:00
Anton Georgiev
1d0807b5de
Merge pull request #7713 from antobinary/logging-structure
Prepend sessionToken to uniqueClientSession
2019-07-02 17:18:12 -04:00
Anton Georgiev
15a834f4b8 prepend sessionToken to uniqueClientSession 2019-07-02 21:15:32 +00:00
Anton Georgiev
ed264351d0
Merge pull request #7709 from antobinary/logging-structure
Logging structure - add extraInfo: {}
2019-07-02 17:08:48 -04:00
Anton Georgiev
612aca99e6 sipjs logCode-s preserve inconsistencies 2019-07-02 20:50:25 +00:00
Anton Georgiev
b71bd48490 remove redundant audio log 2019-07-02 20:11:48 +00:00
Anton Georgiev
25ac147924
Merge pull request #7710 from KDSBrowne/issue-7705
Add enabled poll property in settings.yml
2019-07-02 16:04:42 -04:00
Anton Georgiev
004547f681 prepend sip.js logCode-s 2019-07-02 19:56:25 +00:00
Anton Georgiev
86a178fbf6 video-provider logger with extraInfo 2019-07-02 19:51:35 +00:00
KDSBrowne
c580ef3199 fix visible take presenter option for current presenter 2019-07-02 18:03:33 +00:00
Tainan Felipe
1819911054 Merge branch 'fix-user-leaving' of https://github.com/Tainan404/bigbluebutton into fix-user-leaving 2019-07-02 14:34:18 -03:00
Tainan Felipe
a6cc0286d0 Fix comparasion code 2019-07-02 14:32:16 -03:00
Anton Georgiev
b74d3d9bb0 correct logger.warning to .warn 2019-07-02 16:54:10 +00:00
Anton Georgiev
fb1c294312 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into logging-structure 2019-07-02 15:41:57 +00:00
KDSBrowne
ba9c9c431a add enabled poll prop in settings.yml 2019-07-02 14:54:37 +00:00
Tainan Felipe
6ad950f159
Merge branch 'master' into fix-user-leaving 2019-07-02 11:23:02 -03:00
Anton Georgiev
c79ec06cf7
Merge pull request #7636 from diegobenetti/issue7325-autoswaplayout-screenshare
Fixes performance bug when youtube video is shared
2019-07-02 10:16:46 -04:00
Tainan Felipe
9df7ba1a1a
Merge branch 'master' into fix-user-leaving 2019-07-01 17:24:09 -03:00
Tainan Felipe
88cfb70255 Add ping-pong message to html5 client 2019-07-01 16:00:27 -03:00
Fred Dixon
bd04635309
Update bigbluebutton-release 2019-06-29 17:18:28 -04:00
Anton Georgiev
d35341d59f added Auth.uniqueClientSession to correlate logs with a reload unique string 2019-06-28 21:47:18 +00:00
Anton Georgiev
3fcb95ab44 log structure {logCode, extraInfo}, comment 2019-06-28 21:45:50 +00:00
Anton Georgiev
74fed3a3c9 restructure logs so extra params are inside extraInfo {} 2019-06-28 21:40:06 +00:00
Anton Georgiev
d50e1d870a
Merge pull request #7700 from capilkey/fix-vu-regression
Fix regression from #7606
2019-06-28 17:06:12 -04:00
Chad Pilkey
f0930e2d23 refactor user role management to follow proper format 2019-06-28 21:02:12 +00:00
Chad Pilkey
cef913294f stop silencing message exceptions in html5 server 2019-06-28 18:51:26 +00:00
Chad Pilkey
0de1d1d129 fix regression from #7606, handle roles correctly 2019-06-28 18:50:57 +00:00
Anton Georgiev
f19ba4dda0
Merge pull request #7695 from antobinary/issue-7615
Improve wording in chat placeholder #7615
2019-06-27 14:00:41 -04:00
Anton Georgiev
cc17d60a89 improve wording in chat placeholder #7615 2019-06-27 17:50:45 +00:00
Anton Georgiev
523901cbad
Merge pull request #7694 from jfsiebel/update-setting-log
Improve userChangedSettings method
2019-06-27 13:29:48 -04:00
Joao Siebel
cb22710917 update logging for settings changes 2019-06-27 14:01:14 -03:00
Joao Siebel
15f3623e61 disable poll action when meteor is disconnected 2019-06-27 13:46:14 -03:00
Fred Dixon
355cebebaa
Merge pull request #7689 from ffdixon/minor-fix-bbb-conf
Fixed typo
2019-06-26 17:44:36 -04:00
Fred Dixon
8b27e5c6a0 Fixed typo 2019-06-26 16:44:05 -05:00
Anton Georgiev
7a19aa72c7
Merge pull request #7686 from prlanzarin/2.2-fix-video-ex
Fix issue where webcam would randomly drop after starting properly
2019-06-26 15:43:45 -04:00
Anton Georgiev
6575ee3f48
Merge pull request #7626 from Tainan404/issue-7517
Fix DOM injection in number of rooms select
2019-06-26 15:36:57 -04:00
Tainan Felipe
720208daae Add less than minimum verification 2019-06-26 16:27:51 -03:00