Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #785 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-04-02 16:48:11 +03:00 committed by GitHub
parent cde835d113 0a301cb9f7
commit 192995c854
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/common/main/resources/less/combobox.less
View file

@ -13,10 +13,10 @@
font-size: @font-size-base; font-size: @font-size-base;
line-height: @line-height-base; line-height: @line-height-base;
-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; -o-transition: none;
-webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; -webkit-transition: none;
-moz-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; -moz-transition: none;
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; transition: none;
border-top-right-radius: 2px !important; border-top-right-radius: 2px !important;
border-bottom-right-radius: 2px !important; border-bottom-right-radius: 2px !important;
@ -59,6 +59,7 @@
} }
.btn-default.disabled { .btn-default.disabled {
padding-right: 5px;
border-top-color: transparent; border-top-color: transparent;
border-bottom-color: transparent; border-bottom-color: transparent;

9
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1619,10 +1619,14 @@ define([
config.msg = this.errorSetPassword; config.msg = this.errorSetPassword;
break; break;
case Asc.c_oAscError.ID.PivotGroup : case Asc.c_oAscError.ID.PivotGroup:
config.msg = this.errorPivotGroup; config.msg = this.errorPivotGroup;
break; break;
case Asc.c_oAscError.ID.PasteMultiSelectError:
config.msg = this.errorPasteMultiSelect;
break;
default: default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break; break;
@ -2837,7 +2841,8 @@ define([
txtMonths: 'Months', txtMonths: 'Months',
txtQuarters: 'Quarters', txtQuarters: 'Quarters',
txtYears: 'Years', txtYears: 'Years',
errorPivotGroup: 'Cannot group that selection.' errorPivotGroup: 'Cannot group that selection.',
errorPasteMultiSelect: 'This action cannot be done on a multiple range selection.<br>Select a single range and try again.'
} }
})(), SSE.Controllers.Main || {})) })(), SSE.Controllers.Main || {}))
}); });

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -921,6 +921,7 @@
"SSE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.<br>Contact %1 sales team for personal upgrade terms.", "SSE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.<br>Contact %1 sales team for personal upgrade terms.",
"SSE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", "SSE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"SSE.Controllers.Main.errorPasteMultiSelect": "This action cannot be done on a multiple range selection.<br>Select a single range and try again.",
"SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.strAllSheets": "All Sheets",
"SSE.Controllers.Print.textFirstCol": "First column", "SSE.Controllers.Print.textFirstCol": "First column",
"SSE.Controllers.Print.textFirstRow": "First row", "SSE.Controllers.Print.textFirstRow": "First row",