Commit Graph

24968 Commits

Author SHA1 Message Date
Fred Dixon
71645172c1
Merge pull request #7550 from ffdixon/update-bbb-conf-3
Don't print warning if tomcat7 is not installed
2019-06-02 22:20:44 -04:00
Fred Dixon
09c43d8818 Don't print warning if tomcat7 is not installed 2019-06-02 21:20:07 -05:00
Fred Dixon
63c36cb5d3
Set bigbluebutton.web.serverURL to http by default 2019-06-02 21:30:29 -04:00
Tainan Felipe
8fc8d02c5e Fix server exception 2019-05-31 17:42:20 -03:00
Anton Georgiev
06cd9e65d0
Merge pull request #7531 from KDSBrowne/0A-access-32
Improve the upload presentation modal experience
2019-05-31 16:26:05 -04:00
Pedro Beschorner Marin
c4ac5ef7c9 Shared notes unread indicator 2019-05-31 20:02:33 +00:00
KDSBrowne
1a9c03b707 add descriptions to intlMessages 2019-05-31 18:48:41 +00:00
KDSBrowne
47468ef5d7 use mapUser in app container 2019-05-31 18:36:52 +00:00
Anton Georgiev
ab0d39da2b
Merge pull request #7542 from antobinary/login-three-dots
Revert #7440 due to causing #7502 join stuck
2019-05-31 13:54:14 -04:00
Anton Georgiev
2cb20a1bf1 revert #7440 due to causing #7502 join stuck 2019-05-31 17:31:23 +00:00
KDSBrowne
5144b4d75e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 0A-access-39 2019-05-31 17:28:41 +00:00
Tainan Felipe
483133e84b Add check for all annotations 2019-05-31 14:27:06 -03:00
Diego Benetti
e520797ddd Merge remote-tracking branch 'upstream/master' into issue7390-datasaving-screenshare 2019-05-31 10:23:50 -03:00
Anton Georgiev
2dff307649
Merge pull request #7511 from Tainan404/issue-7402
Add breakout  room indicator in user list.
2019-05-31 08:27:00 -04:00
Anton Georgiev
473b9c1885
Merge pull request #7512 from diegobenetti/issue7401-notify-lock-disabled
Implemented notification when a lock is disabled
2019-05-31 08:22:31 -04:00
Tainan Felipe
576bdf8b07 Add meteor check to text annotation 2019-05-30 16:59:35 -03:00
Richard Alam
9d416ee473 Merge branch 'text-tracks' of https://github.com/riadvice/bigbluebutton into riadvice-text-tracks 2019-05-30 12:30:07 -07:00
Anton Georgiev
302c1380b0
Merge pull request #7539 from ritzalam/track-fs-conf-user
- track FS caller using UUID so we can find when the channel was cre…
2019-05-30 15:21:37 -04:00
Richard Alam
8cb00f457a - track FS caller using UUID so we can find when the channel was created and destroyed.
This will help us hunt an issue where a channel gets stuck in a voice conference.
2019-05-30 12:07:32 -07:00
Anton Georgiev
72486014cd
Merge pull request #7524 from KDSBrowne/0A-access-10
Make whiteboard toolbar accessible via keyboard
2019-05-30 14:50:04 -04:00
Vitor Mateus
4876f5d7a5 Avoid webcam overflow the screen 2019-05-30 15:19:18 -03:00
Anton Georgiev
2ee8851f0d
Merge pull request #7088 from KDSBrowne/2.2-fix-dropzone-style
Fix presentation upload drop zone showing red
2019-05-30 13:58:38 -04:00
KDSBrowne
a0fa2d44a2 use file extension instead of mime type for accepted files 2019-05-30 17:46:05 +00:00
Tainan Felipe
aa83f253f5 Add text box size validation in send annotation method 2019-05-30 14:31:10 -03:00
KDSBrowne
bac5d0f529 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 0A-access-39 2019-05-30 15:02:51 +00:00
KDSBrowne
65012daa7a add toasts for meeting mute / unmute and emoji changes 2019-05-30 14:42:38 +00:00
Anton Georgiev
3a0e85f00e
Merge pull request #7532 from lfzawacki/external-video-logs
Add some logs to the external video sync
2019-05-30 10:14:15 -04:00
Lucas Zawacki
8198a14871 Add log codes 2019-05-29 17:25:16 -03:00
Richard Alam
1d0c786c7b
Merge pull request #7533 from ritzalam/sign-screenshare-jar-expire-2019-05-28
- resign screenshare jars with cert expiring on may 28, 2021
2019-05-29 16:15:13 -04:00
KDSBrowne
b74e0600b5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-fix-dropzone-style 2019-05-29 19:34:28 +00:00
KDSBrowne
7f703a5893 switch present label to confirm 2019-05-29 19:21:18 +00:00
KDSBrowne
fb38e2a2fd on open move focus in submenu to currently selected item 2019-05-29 19:11:25 +00:00
Lucas Zawacki
195395334b Add some logs to the external video sync 2019-05-29 16:06:41 -03:00
Richard Alam
755fe66a3b - resign screenshare jars with cert expiring on may 28, 2021 2019-05-29 12:04:51 -07:00
Anton Georgiev
5c6ef24088
Merge pull request #7525 from antobinary/deny-incorrect-presentationId
Handle incorrect presentationId passed from client
2019-05-29 13:35:44 -04:00
Anton Georgiev
0b71172e12
Merge pull request #7453 from pedrobmarin/closed-captions-prototype
Closed captions prototype
2019-05-29 11:57:45 -04:00
Anton Georgiev
ac36732849
Merge branch 'master' into closed-captions-prototype 2019-05-29 11:51:45 -04:00
Pedro Beschorner Marin
d5569142c3
Merge pull request #3 from antobinary/test-cc-3
Linting and other minor changes to closed captions pr
2019-05-29 12:48:49 -03:00
Anton Georgiev
bc79d54679 remove unused css 2019-05-29 15:44:34 +00:00
Anton Georgiev
6adc608fd0 closed captions linting part3 2019-05-29 14:31:27 +00:00
Anton Georgiev
91e3298c84
Merge pull request #7488 from KDSBrowne/02-poll-published-toast
Stop obsolete toasts for published polls
2019-05-29 08:54:57 -04:00
Anton Georgiev
bfdad1fa2b
Merge pull request #7527 from Tainan404/issue-7510
Fix breakout showing wrong message in breakout start
2019-05-29 07:53:23 -04:00
KDSBrowne
5cc67ec62d add text to upload modal message / improve confirm btn 2019-05-28 21:18:49 +00:00
Diego Benetti
b9eb5cca1f Locks screenshare option when datasaving screenshare setting is disabled 2019-05-28 17:46:29 -03:00
Tainan Felipe
83fba75652 Fix brakout showing wrong message in breakout start 2019-05-28 17:29:04 -03:00
Pedro Beschorner Marin
3cda9dce46
Merge pull request #2 from antobinary/test-cc-3
Improve mobile view for reader-menu
2019-05-28 16:34:42 -03:00
Anton Georgiev
28f3329a16 improve mobile view for reader-menu 2019-05-28 19:24:06 +00:00
Anton Georgiev
726cd7b643
Merge pull request #7522 from lfzawacki/youtube-regex-fix
Fix external video youtube regular expression
2019-05-28 15:00:56 -04:00
Anton Georgiev
0287e00b2e
Handle incorrect presentationId passed from client
Closes https://github.com/bigbluebutton/bigbluebutton/issues/7516
2019-05-28 14:11:38 -04:00
Lucas Zawacki
d154a610d0 Fix external video youtube regex 2019-05-28 14:34:22 -03:00