Commit Graph

25180 Commits

Author SHA1 Message Date
Anton Georgiev
c033b638f3
Merge pull request #7420 from KDSBrowne/_summit-fix-whiteboard-toolbar-icon-not-updating
Fix thickness icon not updating (whiteboard toolbar)
2019-05-13 16:29:16 -04:00
Anton Georgiev
9880ca85b8
Merge pull request #7382 from KDSBrowne/_summit-move-modal-warnings-to-top
Move warnings to top of modals
2019-05-13 16:24:18 -04:00
Anton Georgiev
d526805758
Merge pull request #7362 from KDSBrowne/_summit-make-presentation-upload-checkbox-accessible
Make presentation upload checkbox accessible to keyboard
2019-05-13 16:15:36 -04:00
Anton Georgiev
56c5846d35
Merge pull request #7432 from antobinary/loc-1
Pulled html5 locales May 13, 2019
2019-05-13 16:11:13 -04:00
Anton Georgiev
7a7128f774 pulled html5 locales May 13, 2019 2019-05-13 20:10:16 +00:00
KDSBrowne
88724820f7 add popout_window icon 2019-05-13 18:27:05 +00: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
Joao Siebel
acc7c91b9f set default value to false 2019-05-10 18:13:48 -03: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
KDSBrowne
94288cbaf0 fix thickness icon not updating without refresh 2019-05-10 17:40:13 +00:00
KDSBrowne
bf1cc0c07e fix avatar icon width in message list item 2019-05-10 17:38:30 +00: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
Joao Siebel
5a22f91572 Merge remote-tracking branch 'upstream/master' into network-indicator 2019-05-10 11:09:42 -03: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
Joao Siebel
fea22d5eef add flag to enable monitoring, correct who can see network problems and update logic 2019-05-09 18:25:29 -03: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
KDSBrowne
cf01beb875 add th elements to table in presentation uploader 2019-05-09 18:30:16 +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
KDSBrowne
f2e2948df3 add formatted message to notification 2019-05-09 17:57:06 +00:00
Calvin Walton
8087ed1adf Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2019-05-09 13:45:37 -04:00
KDSBrowne
2b9d0cccee add notification when presentation changes 2019-05-09 17:44:54 +00: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
KDSBrowne
c98c1ad5a7 add formatted message 2019-05-09 15:35:52 +00:00
KDSBrowne
a5ce2b7d12 remove space from ids / add legend 2019-05-09 15:00:17 +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