BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,623 Commits 13 Branches 260 Tags 1.1 GiB
c9194d087e
Commit Graph

24623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghazi Triki
c9194d087e Correctly process captions. 2019-05-13 21:38:51 +01:00
Ghazi Triki
7c5727750f Merge remote-tracking branch 'bigbluebutton/master' into text-tracks 2019-05-13 14:46:20 +01:00
Fred Dixon
513ec3c720
Merge pull request #7428 from ffdixon/bbb-conf-multiple 
Added check for multiple bbb-common-message libs
 2019-05-11 14:15:15 -04:00
Fred Dixon
ad33cc6c80 Added check for multiple bbb-common-message libs 2019-05-11 13:13:59 -05:00
Anton Georgiev
a360826810
Merge pull request #7375 from KDSBrowne/_summit-notify-published-poll 
Add toast notification for published polls
 2019-05-10 13:44:39 -04:00
Anton Georgiev
b6d36c5174
Merge pull request #7374 from KDSBrowne/_summit-display-font-size-as-percentage 
Display font size as percentage in application settings modal
 2019-05-10 13:42:44 -04:00
Ghazi Triki
b578aeb243 Move captions.rb to utils directory. 2019-05-10 16:56:29 +01:00
Anton Georgiev
cf6f669170
Merge pull request #7411 from KDSBrowne/_summit-add-filename-to-buttons-for-SR 
Add filename to aria-labels in presentation upload modal
 2019-05-10 11:08:43 -04:00
Anton Georgiev
c4f249af1e
Merge pull request #7415 from KDSBrowne/_summit-SR-toasts-ff 
Remove duplicate "role=alert" prop from toast notification
 2019-05-10 11:03:44 -04:00
Ghazi Triki
dbd86eb096 Code improve. 2019-05-10 15:51:05 +01:00
Fred Dixon
d41c4ff1e1
Merge pull request #7416 from ffdixon/ignore-missing-redis-password 
Ignore empty redisPassword fields
 2019-05-10 10:44:05 -04:00
Fred Dixon
68a236c19a Ignore empty redisPassword fields 2019-05-10 09:43:22 -05:00
Anton Georgiev
e904b1fd11
Merge pull request #7410 from KDSBrowne/_summit-edit-cust-poll-option-label 
Edit aria-label for custom poll inputs
 2019-05-10 10:18:59 -04:00
KDSBrowne
dbbc85cce7 remove duplicate role=alert prop 2019-05-10 14:18:25 +00:00
Anton Georgiev
528c43cff5
Merge pull request #7407 from KDSBrowne/_summit-fix-starting-poll-with-space-option 
Add disabled prop to start custom poll button
 2019-05-10 10:12:43 -04:00
Fred Dixon
9defe01d82
Merge pull request #7414 from ffdixon/fix-bigbluebutton-properties 
Add back FreeSWITCH config for bigbluebutton.properties (bbb-apps)
 2019-05-10 09:02:37 -04:00
Fred Dixon
5bc33eb224 Add back FreeSWITCH config for bigbluebutton.properties (bbb-apps) 2019-05-10 08:01:56 -05:00
Fred Dixon
799354b42c
Merge pull request #7404 from capilkey/better-transfer-detect 
Improved audio connect and transfer
 2019-05-09 17:36:11 -04:00
Chad Pilkey
2bee179eff improved audio connect and transfer 2019-05-09 21:01:34 +00:00
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
Anton Georgiev
a278594602 do not publish undefined poll 2019-05-09 18:47:38 +00:00
KDSBrowne
035510caad add disabled prop to start custom poll btn 2019-05-09 18:40:49 +00: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
KDSBrowne
4faab1aeea edit aria-label for custom poll inputs 2019-05-09 13:32:47 +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
KDSBrowne
4f0ca9b67b add filename to buttons in presentation uploader 2019-05-08 21:47:00 +00: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