Commit Graph

25276 Commits

Author SHA1 Message Date
Anton Georgiev
fd7a5918c1
Merge pull request #7808 from KDSBrowne/issue-7783
Fix webcams of other viewers lock toggle
2019-07-19 11:08:29 -04:00
KDSBrowne
ff71b15280 remove isRequired from resolve prop in audio modal 2019-07-19 14:45:04 +00:00
Anton Georgiev
5509508cf4
Merge pull request #7813 from antobinary/logs
Do not log clientInfo with each log, just the joinhandler one
2019-07-19 10:25:15 -04:00
Anton Georgiev
ad0a520ca2
Update index.js 2019-07-19 10:24:53 -04:00
Anton Georgiev
43482bae08 do not log clientInfo with each log, just the joinhandler one 2019-07-18 21:39:59 +00:00
Anton Georgiev
33f2cc398b
Merge pull request #7804 from KDSBrowne/issue-7768
Add enabled parameter to chat in settings.yml
2019-07-18 16:53:09 -04:00
Anton Georgiev
9510ff0477
Merge pull request #7764 from Tainan404/issue-7519
Fix same name files failing in upload.
2019-07-18 16:43:27 -04:00
Tainan Felipe
cedfe5960b Merge branch 'issue-7519' of https://github.com/Tainan404/bigbluebutton into issue-7519 2019-07-18 15:48:23 -03:00
Tainan Felipe
3b71f7fd86 fix typo 2019-07-18 15:45:11 -03:00
Tainan Felipe
4281b696a4 Add token to log and ids to select 2019-07-18 15:42:35 -03:00
Anton Georgiev
2068452528
Merge pull request #7807 from antobinary/vuln
Update lodash.mergewith, lodash
2019-07-18 12:37:00 -04:00
Tainan Felipe
9c2e6c8db6
Update bigbluebutton-html5/imports/api/presentation-upload-token/server/methods/setUsedToken.js
Co-Authored-By: Anton Georgiev <antobinary@users.noreply.github.com>
2019-07-18 13:27:23 -03:00
Anton Georgiev
f44764675b update lodash.mergewith, lodash 2019-07-18 16:09:23 +00:00
KDSBrowne
1bccb5b660 fix webcams of other viewers lock toggle 2019-07-18 15:48:18 +00:00
Fred Dixon
0cb1c7986f
Merge pull request #7803 from ffdixon/fix-cron
Fixes #7802
2019-07-18 05:45:18 -04:00
Fred Dixon
93dea5a719 Fixes #7802 2019-07-18 04:44:32 -05:00
KDSBrowne
bd9ed853a7 add enabled config to chat in settings.yml 2019-07-17 21:00:33 +00:00
Anton Georgiev
d385466398
Merge pull request #7784 from diegobenetti/issue7769-change-enableExternalVideo-parameter
Changes the position of the parameter enableExternalVideo in the settings.yml
2019-07-17 16:53:42 -04:00
Anton Georgiev
b20d3c7739
Merge pull request #7789 from diegobenetti/issue7787-add-parameter-omit-logout
Creates parameter to enable or disable the Logout option
2019-07-17 16:53:26 -04:00
Anton Georgiev
c3d03154ac
Merge pull request #7788 from prlanzarin/2.2-ref-logs-ssovp
Refactor screenshare/listen only client-side logs
2019-07-17 16:42:17 -04:00
Richard Alam
bd3ac15ee3
Merge pull request #7800 from pedrobmarin/caption-file-content-type
Fix on getting caption file content type
2019-07-17 15:18:33 -04:00
Pedro Beschorner Marin
517e252901 Fix on getting caption file content type 2019-07-17 18:47:31 +00:00
Fred Dixon
d5b1d6abf0
Merge pull request #7728 from riadvice/start-stop-transcode
Fix bbb-transcode-akka not being properly started and stopped.
2019-07-16 21:15:43 -04:00
Fred Dixon
75551f1a74
Merge pull request #7792 from riadvice/lti-upgrade
Make LTI URLs work
2019-07-16 21:14:19 -04:00
Ghazi Triki
50c59c1708 Make LTI URLs work. 2019-07-16 23:35:56 +03:00
prlanzarin
d185762e97 Missing break 2019-07-16 20:10:37 +00:00
prlanzarin
08044feb0d Fixed SFU error response handling to actually display something useful 2019-07-16 20:08:43 +00:00
Diego Benetti
ca2a6bb438 Removes a duplicated line 2019-07-16 14:31:18 -03:00
Diego Benetti
455973f988
Improve ternary condition
Co-Authored-By: Anton Georgiev <antobinary@users.noreply.github.com>
2019-07-16 14:13:34 -03:00
Anton Georgiev
6751a25bda
Merge pull request #7786 from KDSBrowne/issue-7782
Fix panel resizing for RTL locales
2019-07-16 11:09:10 -04:00
Anton Georgiev
899ed275ae
Merge pull request #7790 from Tainan404/remove-state-functions
Remove ChangeState functions.
2019-07-16 11:08:14 -04:00
Tainan Felipe
0ae1dacd59 Remove functions that just change state in join and aunthenticate handler 2019-07-16 11:31:29 -03:00
Diego Benetti
e9e177d84f Creates parameter to enable or disable the Logout option 2019-07-16 10:55:56 -03:00
Anton Georgiev
901987282a
Merge pull request #7756 from vitormateusalmeida/webcams-draggable-refactor
Webcam draggable refactoring
2019-07-16 09:53:39 -04:00
prlanzarin
a3a5d2f6a4 Refactor screenshare/listen only client-side logs 2019-07-15 20:59:00 +00:00
Diego Benetti
aa0c777cee Parameter enableExternalVideo changed to externalVideoPlayer 2019-07-15 16:31:28 -03:00
KDSBrowne
2fa59190fb fix panel resizing for RTL locales 2019-07-15 19:15:58 +00:00
Diego Benetti
f7a58c3279 Changes the position of the parameter enableExternalVideo in the settings.yml file 2019-07-15 13:26:57 -03:00
Anton Georgiev
15c4e09bd6
Merge pull request #7770 from antobinary/clean-settings-yml
Remove unused `httpsConnection` flag in settings.yml
2019-07-15 08:46:39 -04:00
Anton Georgiev
4e022a27f6
Merge pull request #7781 from KDSBrowne/issue-update-lodash
Update lodash package
2019-07-15 08:46:17 -04:00
Fred Dixon
bbf3160cc6
Merge pull request #7780 from KDSBrowne/issue-7776
Change overrideLocale default from undefined to null
2019-07-15 08:26:54 -04:00
KDSBrowne
741728e09e update lodash / npm audit fix 2019-07-15 03:45:13 +00:00
KDSBrowne
22a94260dc change undefined to null 2019-07-15 02:59:55 +00:00
Fred Dixon
0a4c66484d
Merge pull request #7779 from riadvice/lti-upgrade
Fix LTI logs filename & check bbb-lti service status and delete lti jar check
2019-07-14 21:21:50 -04:00
Ghazi Triki
eb8398b6fa Fix bbb-lti logging file name. 2019-07-14 16:45:58 +03:00
Ghazi Triki
3eb30641e8 Check bbb-lti service status and delete lti jar check. 2019-07-14 16:36:14 +03:00
Fred Dixon
d8334d359d
Merge pull request #7777 from riadvice/lti-upgrade
Fix LTI logs
2019-07-14 08:49:56 -04:00
Ghazi Triki
66a649aefa Fix LTI logs. 2019-07-14 14:32:28 +03:00
Anton Georgiev
496f98077f
Bump up version to 2.2 beta 17 2019-07-12 18:33:16 -04:00
Anton Georgiev
aef7dbe288
Merge pull request #7775 from antobinary/makecall-retry
Hide scrollbar for media (webcams)
2019-07-12 18:20:22 -04:00