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

Merge pull request #76 from ONLYOFFICE/hotfix/v5.1.1

Browse source 
Hotfix/v5.1.1
This commit is contained in:
Alexander Vnuchkov 2018-03-30 12:57:43 +03:00 committed by GitHub
parent 43772fc172 d968746171
commit cc1821136a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 51 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CHANGELOG.md Normal file
View file

@ -0,0 +1,13 @@
# Change log
## 5.1.1
### All Editors
*
### Document Editor
*
### Spreadsheet Editor
*
### Presentation Editor
*

4
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1413,7 +1413,7 @@ define([
documentHolder.pmiFilterCells.setVisible(iscellmenu && !iscelledit && !internaleditor);
documentHolder.pmiReapply.setVisible((iscellmenu||isallmenu) && !iscelledit && !internaleditor);
documentHolder.ssMenu.items[12].setVisible((iscellmenu||isallmenu||isinsparkline) && !iscelledit);
documentHolder.pmiInsFunction.setVisible(iscellmenu);
documentHolder.pmiInsFunction.setVisible(iscellmenu && !iscelledit);
documentHolder.pmiAddNamedRange.setVisible(iscellmenu && !iscelledit && !internaleditor);
if (isintable) {
@ -1443,7 +1443,7 @@ define([
documentHolder.ssMenu.items[17].setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments);
documentHolder.pmiAddComment.setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments);
/** coauthoring end **/
documentHolder.pmiCellMenuSeparator.setVisible(iscellmenu || isrowmenu || iscolmenu || isallmenu);
documentHolder.pmiCellMenuSeparator.setVisible(iscellmenu && !iscelledit || isrowmenu || iscolmenu || isallmenu);
documentHolder.pmiEntireHide.isrowmenu = isrowmenu;
documentHolder.pmiEntireShow.isrowmenu = isrowmenu;

2
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -3006,7 +3006,7 @@ define([
},
applyFormulaSettings: function() {
if (this.toolbar.rendered) {
if (this.toolbar.btnInsertFormula.rendered) {
var formulas = this.toolbar.btnInsertFormula.menu.items;
for (var i=0; i<Math.min(4,formulas.length); i++) {
formulas[i].setCaption(this.api.asc_getFormulaLocaleName(formulas[i].value));

3
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -602,6 +602,7 @@ define([
data : [
{ value: 'en', displayValue: this.txtEn, exampleValue: this.txtExampleEn },
{ value: 'de', displayValue: this.txtDe, exampleValue: this.txtExampleDe },
{ value: 'es', displayValue: this.txtEs, exampleValue: this.txtExampleEs },
{ value: 'ru', displayValue: this.txtRu, exampleValue: this.txtExampleRu },
{ value: 'pl', displayValue: this.txtPl, exampleValue: this.txtExamplePl }
]
@ -807,10 +808,12 @@ define([
txtDe: 'Deutsch',
txtRu: 'Russian',
txtPl: 'Polish',
txtEs: 'Spanish',
txtExampleEn: ' SUM; MIN; MAX; COUNT',
txtExampleDe: ' SUMME; MIN; MAX; ANZAHL',
txtExampleRu: ' СУММ; МИН; МАКС; СЧЁТ',
txtExamplePl: ' SUMA; MIN; MAX; ILE.LICZB',
txtExampleEs: ' SUMA; MIN; MAX; CALCULAR',
strFuncLocale: 'Formula Language',
strFuncLocaleEx: 'Example: SUM; MIN; MAX; COUNT',
strRegSettings: 'Regional Settings',

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

@ -1216,6 +1216,7 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCm": "Centimeter",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtDe": "Deutsch",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEn": "English",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEs": "Spanish",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtInch": "Inch",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtLiveComment": "Commenting Display",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtMac": "as OS X",

4
build/Gruntfile.js
View file

@ -322,7 +322,9 @@ module.exports = function(grunt) {
files: packageFile['mobile']['copy']['index-page']
},
'images-app': {
files: packageFile['mobile']['copy']['images-app']
files:[]
.concat(packageFile['mobile']['copy']['images-app'])
.concat(packageFile['mobile']['copy']['images-common'])
}
},

2
build/common.json
View file

@ -1,7 +1,7 @@
{
"name": "common",
"version": "4.3.0",
"build": 32,
"build": 35,
"homepage": "http://www.onlyoffice.com",
"private": true,
"sdk": {

10
build/documenteditor.json
View file

@ -1,7 +1,7 @@
{
"name": "documenteditor",
"version": "4.3.0",
"build": 1143,
"build": 1146,
"homepage": "http://www.onlyoffice.com",
"private": true,
"main": {
@ -337,6 +337,14 @@
"src": "**",
"dest": "../deploy/web-apps/apps/documenteditor/mobile/resources/img/"
}
],
"images-common": [
{
"expand": true,
"cwd": "../apps/common/mobile/resources/img/",
"src": "**",
"dest": "../deploy/web-apps/apps/documenteditor/mobile/resources/img/"
}
]
}
},

10
build/presentationeditor.json
View file

@ -1,7 +1,7 @@
{
"name": "presentationeditor",
"version": "4.3.0",
"build": 778,
"build": 780,
"homepage": "http://www.onlyoffice.com",
"private": true,
"main": {
@ -346,6 +346,14 @@
"src": "**",
"dest": "../deploy/web-apps/apps/presentationeditor/mobile/resources/img/"
}
],
"images-common": [
{
"expand": true,
"cwd": "../apps/common/mobile/resources/img/",
"src": "**",
"dest": "../deploy/web-apps/apps/presentationeditor/mobile/resources/img/"
}
]
}
},

10
build/spreadsheeteditor.json
View file

@ -1,7 +1,7 @@
{
"name": "spreadsheeteditor",
"version": "4.3.0",
"build": 881,
"build": 884,
"homepage": "http://www.onlyoffice.com",
"private": true,
"main": {
@ -354,6 +354,14 @@
"src": "**",
"dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/resources/img/"
}
],
"images-common": [
{
"expand": true,
"cwd": "../apps/common/mobile/resources/img/about",
"src": "**",
"dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/resources/img/about"
}
]
}
},