Commit Graph

22360 Commits

Author SHA1 Message Date
João Francisco Siebel
ebe4b83a10 remove unnecessary comments 2018-09-14 15:01:24 -03:00
João Francisco Siebel
ebad6cf6a4 remove debug 2018-09-14 14:53:29 -03:00
João Francisco Siebel
4c35608c2b Add users-settings collection and handle dynamic configuration 2018-09-13 15:09:30 -03:00
Richard Alam
45cd830f96
Merge pull request #6056 from riadvice/big-image-conversion
Down-scale image sized over 2MB
2018-09-11 11:24:49 -04:00
Ghazi Triki
b6055c70d8 More logging for document conversion error. 2018-09-11 15:55:46 +01:00
Ghazi Triki
dbf85bb597 Remove dev debug. 2018-09-11 12:54:37 +01:00
Ghazi Triki
b6a5e75459 Down-scale image sized over 2MB. 2018-09-11 12:51:03 +01:00
Anton Georgiev
35c0a12373
Merge pull request #6055 from bigbluebutton/v2.0.x-release
Pull V2.0.x release into 2.2 (master) to propagate 2.0 fixes
2018-09-10 15:09:55 -04:00
Anton Georgiev
cae1cc2190
Merge pull request #6052 from BobakOftadeh/publish-fix
Only propagate necessary information to client
2018-09-10 15:00:54 -04:00
Anton Georgiev
358fdd57bf
Merge pull request #6054 from antobinary/locales-2018-09-10
HTML5 client -- pulled latest language files 2018-09-10
2018-09-10 14:52:36 -04:00
Anton Georgiev
7e4f4d9eaa html5-locales-2018-09-10 2018-09-10 18:49:54 +00:00
Bobak Oftadeh
053e0f93fc Fixed issue where unnecessary information was being published to the client. 2018-09-10 08:34:25 -07:00
Anton Georgiev
7508f1d4f8
Merge pull request #6034 from KDSBrowne/02-iphone-polling-fix
Fix poll answers not being displayed on mobile safari
2018-09-10 10:08:51 -04:00
KDSBrowne
5f31deee11 use mq() instead of @media 2018-09-09 05:23:33 +00:00
Anton Georgiev
95b8b4e389
Merge pull request #6051 from antobinary/audio-state
Update npm packages in bbb-html5
2018-09-07 16:20:47 -04:00
Anton Georgiev
2330ead2e6 update npm packages to resolve sec vulnerabilities 2018-09-07 19:32:53 +00:00
Anton Georgiev
181b275193
Merge pull request #6049 from antobinary/audio-state
Make some devDependency npm packages full depencencies (needed in production)
2018-09-07 14:28:44 -04:00
Anton Georgiev
7a23aa40a1 make devDependency npm packages full depencencies (needed in production) 2018-09-07 18:03:18 +00:00
Anton Georgiev
d89885f3df
Merge pull request #6047 from antobinary/merge-2.0
Merge 2.0 into 2.2(master)
2018-09-06 18:36:07 -04:00
Anton Georgiev
68e02efe80 add missing Meeting const in addUser.js 2018-09-06 22:33:32 +00:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Richard Alam
b5430aa30d
Merge pull request #6046 from capilkey/reset-rollover-on-recycle
Reset rolledOver when user itemrenderers are used for a different user
2018-09-06 17:38:11 -04:00
Chad Pilkey
e3d9864f75 reset rolledOver when user itemrenderers are used for a different user 2018-09-06 13:43:37 -07:00
Anton Georgiev
d538a0ef54
Merge pull request #6045 from antobinary/audio-state
Fix listenOnly being interpreted as muted audio (client side)
2018-09-06 16:34:00 -04:00
Anton Georgiev
64e64b2b0d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 19:51:22 +00:00
Anton Georgiev
681422dc61 fix listenOnly being interpreted as muted audio (client side) 2018-09-06 18:44:59 +00:00
Anton Georgiev
ffe95aa826
Merge pull request #6039 from capilkey/fix-html5-auth-info
Fetch fullInfo from Auth every time instead of caching
2018-09-05 11:48:38 -04:00
Chad Pilkey
625e351af8 fetch fullInfo from Auth every time instead of caching 2018-09-04 13:28:04 -07:00
Chad Pilkey
c58d71533f
Merge pull request #6007 from fcecagno/multi-container-docker
Multi container docker
2018-09-04 15:30:30 -04:00
Anton Georgiev
73fd896fb0
Merge pull request #6032 from Tainan404/fix-safary-animaiton
Split animation to own span to run in safari.
2018-09-04 13:14:29 -04:00
Anton Georgiev
49c0e7b9b1
Merge pull request #5998 from MaximKhlobystov/ice-connection-state-errors-2
Better handling of screensharing ice connection state errors.
2018-09-04 13:14:08 -04:00
Anton Georgiev
8e553ab0c6
Merge pull request #5855 from musickiper/discard-cur-annotation-via-right-click
Add fuctionality for discard current annotation via right-click
2018-09-04 11:13:00 -04:00
Anton Georgiev
ecd49d33f7
Merge pull request #6023 from prlanzarin/listen-only-detect-kms-off
Improvements to SFU listen only error handling
2018-09-04 11:12:34 -04:00
Fred Dixon
9524ea4165
Merge pull request #6033 from ffdixon/fix-bbb-conf-file-check
Check that HTML5_CONFIG file exists before scanning it
2018-09-03 09:53:14 -04:00
Fred Dixon
2483d4ffc1 Check that HTML5_CONFIG file exists before scanning it 2018-09-03 08:51:52 -05:00
Fred Dixon
4a643cfa11
Merge pull request #6028 from capilkey/ffmac-webrtcSS-warning
Add warning to Flash for WebRTC screenshare in FF on Mac
2018-08-31 22:06:38 -04:00
Chad Pilkey
44ec61c9ce add warning to Flash for WebRTC SS in FF on Mac 2018-08-31 13:44:18 -07:00
KDSBrowne
bf38c36b71 fix polling answer position in safari on mobile 2018-08-31 17:14:00 +00:00
Tainan Felipe
1f6b959efc Split animation and connection to own span to run in safari 2018-08-31 13:58:47 -03:00
Felipe Cecagno
a64272d6c6 pull latest updates on the docs made by @mmarangoni 2018-08-31 10:18:43 -03:00
Maxim Khlobystov
5825b635ba Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-connection-state-errors-2 2018-08-30 16:07:52 -04:00
Anton Georgiev
6f4e00aed1
Merge pull request #6024 from riadvice/fix-chrome-extension-link-update
Fix chromeExtensionLink restore in bbb-conf
2018-08-30 11:48:11 -04:00
Ghazi Triki
b3be2d7410 Fix chromeExtensionLink restore in bbb-conf. 2018-08-30 16:18:41 +01:00
prlanzarin
dc767d9bdb Fixed server-side error handling for listen only via SFU, correctly handling KMS abrupt shutdown 2018-08-30 02:41:02 +00:00
Anton Georgiev
065d932b64
Merge pull request #6020 from prlanzarin/autoplay-listen-only
Resolving listen only stream correctly
2018-08-29 16:10:52 -04:00
prlanzarin
b4052f7052 Resolving listen only stream correctly 2018-08-29 19:59:33 +00:00
Anton Georgiev
afd97601c5
Merge pull request #6019 from prlanzarin/autoplay-listen-only
Improvements to Safari/Chrome autoplay policy
2018-08-29 15:44:05 -04:00
prlanzarin
be6313106b Add retry limiter to playVideo in kurento-utils 2018-08-29 19:39:15 +00:00
prlanzarin
a7bfb985d3 Improvements to Safari/Chrome autoplay policies with placeholder buffer on audiocontext and bogus audio + upstarting audio tag as muted 2018-08-29 19:12:34 +00:00
Anton Georgiev
157ce58f04
Merge pull request #6018 from antobinary/lock-public-chat
[HTML5] Comply with lock settings for chat
2018-08-29 13:22:49 -04:00