Commit Graph

24581 Commits

Author SHA1 Message Date
Fred Dixon
056ef6ee8c
Merge pull request #7327 from ritzalam/add-redis-password-on-master
Add redis password on master
2019-05-09 16:35:42 -04:00
Anton Georgiev
f244bc0e7e
Merge pull request #7403 from Tainan404/issue-7324
Fix error screen at meeting ends
2019-05-09 15:41:25 -04:00
Anton Georgiev
e219eba258
Merge pull request #7392 from KDSBrowne/2.2-issue-7386
Fix custom poll button deactivating start button
2019-05-09 15:38:45 -04:00
Anton Georgiev
1285a49ed2
Merge pull request #7389 from diegobenetti/issue7314-improve-disconnection-detection
Fixes the duplicated messages when meeting is ended
2019-05-09 15:01:15 -04:00
Tainan Felipe
ef0ba0afcf Remove the leftovers that show the error screen at the end of the meeting 2019-05-09 15:27:27 -03:00
Calvin Walton
8087ed1adf Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2019-05-09 13:45:37 -04:00
Calvin Walton
2ed0412f5c Revert "Revert "Rename notes playback nginx file""
This reverts commit 9ad783fab0.

We ended up not being able to rename the etherpad nginx file, so this
recording format has to go back to using a different name.
2019-05-09 13:44:48 -04:00
Calvin Walton
5c09ea5605 Merge branch 'archive-note' of https://github.com/fcecagno/bigbluebutton 2019-05-09 13:43:48 -04:00
Anton Georgiev
0522b2ce87
Merge pull request #7400 from riadvice/fix-filename-download-encoding
Fix downloaded file encoding.
2019-05-09 13:41:35 -04:00
Ghazi Triki
1974f903ea Fix downloaded file encoding. 2019-05-09 17:35:10 +01:00
Anton Georgiev
eee5e56490
Merge pull request #7399 from antobinary/locales-pt
Adjust lock chat strings to be used as keys
2019-05-09 12:03:10 -04:00
Anton Georgiev
2ff9a12d2c adjust lock chat strings to be used as keys 2019-05-09 15:58:08 +00:00
Anton Georgiev
e5368733ea
Merge pull request #7397 from antobinary/locales-pt
Pulled html5 locales May 9, 2019
2019-05-09 10:48:30 -04:00
Anton Georgiev
63ac70b798 add sv locale 2019-05-09 14:47:47 +00:00
Anton Georgiev
c1d89d5729 pulled html5 locales May 9, 2019 2019-05-09 14:44:51 +00:00
Anton Georgiev
e39d1db371
Merge pull request #7396 from antobinary/locales-pt
Add Portuguese (Europe) locale
2019-05-09 10:12:45 -04:00
Anton Georgiev
58df06ef09 add Portuguese (Europe) locale 2019-05-09 14:11:34 +00:00
Fred Dixon
b2dc8bd4c6
Merge pull request #7384 from riadvice/mandatory-api-passwords
Create API returns an error when no password parameter is provided
2019-05-09 06:28:35 -04:00
Ghazi Triki
b469f8c642 Update error format for Create API returns if none of the passwords parameters are provided. 2019-05-09 07:26:20 +01:00
Anton Georgiev
1ae6b69770
Update en.json 2019-05-08 18:33:55 -04:00
Anton Georgiev
0d6656b3a4
Merge pull request #7138 from pedrobmarin/shared-notes-lock
Lockable shared notes
2019-05-08 18:19:07 -04:00
Pedro Beschorner Marin
6ac365a422 Code improvements 2019-05-08 20:36:36 +00:00
Pedro Beschorner Marin
c27f409def Locking shared notes from akka-apps up to the Flash client 2019-05-08 20:36:36 +00:00
Pedro Beschorner Marin
9867aa6b78 Shared notes lock settings first commit 2019-05-08 20:36:36 +00:00
KDSBrowne
c5f80f8f4c fix for issue 7386 2019-05-08 20:31:24 +00:00
Diego Benetti
4d7292f6c5 Added parameter to differ meeting from breakout error logs 2019-05-08 16:15:17 -03:00
Diego Benetti
77bc6aa9dc Fixes the duplicated messages when meeting is ended 2019-05-08 14:15:25 -03:00
Ghazi Triki
8892389234 Create API returns an error when no password parameter is provided. 2019-05-08 17:35:00 +01:00
Anton Georgiev
153dd78b59
Merge pull request #7381 from KDSBrowne/_summit-switch-btn-label-inverted
Fix inverted labels for + and - buttons
2019-05-08 11:43:14 -04:00
KDSBrowne
c7566d4b57 fix inverted labels 2019-05-08 15:31:30 +00:00
Anton Georgiev
f4f7096770
Merge pull request #7371 from KDSBrowne/_summit-upload-presentation-delete-btn
Make delete presentation btn announce presentation name
2019-05-08 10:21:21 -04:00
Anton Georgiev
49b571dcc0
Merge pull request #7372 from KDSBrowne/_summit-improve-modal-title-announced
Improve labels announced for modal titles
2019-05-08 10:18:26 -04:00
Fred Dixon
0d9220051f
Merge pull request #7357 from kepstin/archive-text-cleanup
Recording: Strip control characters in whiteboard text events
2019-05-08 10:10:25 -04:00
KDSBrowne
4524780e50 fix typo / edit label string 2019-05-08 14:08:47 +00:00
Anton Georgiev
dcc5881d99
Merge pull request #7373 from KDSBrowne/_summit-add-time-to-labels
Breakouts (moderator) Add current time to aria labels for + and - btns
2019-05-08 10:07:07 -04:00
Anton Georgiev
34b3c09436
Merge pull request #7370 from KDSBrowne/_summit-add-aria-described-youtube-input
Add aria-describedby to youtube input
2019-05-08 09:54:09 -04:00
KDSBrowne
8566b66132 add time to + and - room time buttons 2019-05-08 13:19:43 +00:00
KDSBrowne
12669c323e add formatted labels 2019-05-08 13:16:00 +00:00
KDSBrowne
fb13d5ae7e add title to lock viewers modal 2019-05-08 12:47:55 +00:00
KDSBrowne
11ed08d95d make screen reader announce recording modal title 2019-05-08 12:47:37 +00:00
KDSBrowne
f69e44b2a8 make delete presentation btn announce presentation to be removed 2019-05-08 12:42:05 +00:00
KDSBrowne
79434aad61 add aria-describedby to youtube input 2019-05-08 12:36:49 +00:00
Anton Georgiev
a987a38af3
Merge pull request #7366 from KDSBrowne/_summit-move-focus-to-poll-panel
Move focus to poll panel when opened
2019-05-07 16:14:42 -04:00
KDSBrowne
5a4938259c add check for findDOMNode element 2019-05-07 20:09:52 +00:00
KDSBrowne
adea7b90e6 move focus to poll panel when open 2019-05-07 20:04:55 +00:00
Anton Georgiev
c39515b416
Merge pull request #7365 from KDSBrowne/_summit-change-hotkeys-to-shortcuts
Change hotkey labels to keyboard shortcuts
2019-05-07 15:41:58 -04:00
Anton Georgiev
344138162d
Merge pull request #7361 from KDSBrowne/_sumit-fix-aria-expanded-on-userlist-toggle
Fix aria-expanded on userlist toggle btn
2019-05-07 15:38:56 -04:00
Anton Georgiev
97bfc96aca
Merge pull request #7364 from KDSBrowne/_summit-fix-contrast-issues
Further color contrast in polling, breakouts modal, user-list
2019-05-07 15:26:15 -04:00
Anton Georgiev
ce749228b8
Merge pull request #7363 from Tainan404/issue-7291
Unshare webcam when join in a breakout room
2019-05-07 15:24:11 -04:00
KDSBrowne
ffae91ba97 change hotkey labels to keyboard shortcuts 2019-05-07 19:16:10 +00:00