pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-04-07 14:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

[all] Rename

Browse Source 
Rename web-apps -> web-apps-pro
This commit is contained in:
Alexander.Trofimov
2019-10-18 15:38:41 +03:00
parent 3769187466
commit aabda3a3ef
6 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Common/config/development-mac.json
View File

@ -18,9 +18,6 @@
"/sdkjs": {
"path": "../../../sdkjs"
},
"/web-apps": {
"path": "../../../web-apps"
},
"/web-apps-pro": {
"path": "../../../web-apps-pro"
},

5
Common/config/development-windows.json
View File

@ -18,9 +18,6 @@
"/sdkjs": {
"path": "../../../sdkjs"
},
"/web-apps": {
"path": "../../../web-apps"
},
"/web-apps-pro": {
"path": "../../../web-apps-pro"
},
@ -42,7 +39,7 @@
"spellcheckerUrl": "http://127.0.0.1:8080"
},
"sockjs": {
"sockjs_url": "/web-apps/vendor/sockjs/sockjs.min.js"
"sockjs_url": "/web-apps-pro/vendor/sockjs/sockjs.min.js"
}
}
},

6
Common/config/production-linux.json
View File

@ -19,8 +19,8 @@
"path": "/var/www/onlyoffice/documentserver/sdkjs",
"options": {"maxAge": "7d"}
},
"/web-apps": {
"path": "/var/www/onlyoffice/documentserver/web-apps",
"/web-apps-pro": {
"path": "/var/www/onlyoffice/documentserver/web-apps-pro",
"options": {"maxAge": "7d"}
},
"/welcome": {
@ -41,7 +41,7 @@
"utils_common_fontdir": "/usr/share/fonts"
},
"sockjs": {
"sockjs_url": "/web-apps/vendor/sockjs/sockjs.min.js"
"sockjs_url": "/web-apps-pro/vendor/sockjs/sockjs.min.js"
}
}
},

6
Common/config/production-windows.json
View File

@ -19,8 +19,8 @@
"path": "../../../sdkjs",
"options": {"maxAge": "7d"}
},
"/web-apps": {
"path": "../../../web-apps",
"/web-apps-pro": {
"path": "../../../web-apps-pro",
"options": {"maxAge": "7d"}
},
"/sdkjs-plugins": {
@ -41,7 +41,7 @@
"utils_common_fontdir": "C:\\Windows\\Fonts"
},
"sockjs": {
"sockjs_url": "/web-apps/vendor/sockjs/sockjs.min.js"
"sockjs_url": "/web-apps-pro/vendor/sockjs/sockjs.min.js"
}
}
},

4
DocService/sources/DocsCoServer.js
View File

@ -1815,7 +1815,7 @@ exports.install = function(server, callbackFunction) {
function fillUsername(data) {
let user = data.user;
if (user.firstname && user.lastname) {
//as in web-apps/apps/common/main/lib/util/utils.js
//as in web-apps--pro/apps/common/main/lib/util/utils.js
let isRu = (data.lang && /^ru/.test(data.lang));
return isRu ? user.lastname + ' ' + user.firstname : user.firstname + ' ' + user.lastname;
} else {
@ -1824,7 +1824,7 @@ exports.install = function(server, callbackFunction) {
}
function isEditMode(permissions, mode, def) {
if (permissions && mode) {
//as in web-apps/apps/documenteditor/main/app/controller/Main.js
//as in web-apps-pro/apps/documenteditor/main/app/controller/Main.js
return mode !== 'view' && (permissions.edit !== false || permissions.review === true ||
permissions.comment === true || permissions.fillForms === true);
} else {

4
FileConverter/bin/DoctRenderer.config
View File

@ -1,9 +1,9 @@
<Settings>
<file>../../../sdkjs/common/Native/native.js</file>
<file>../../../sdkjs/common/Native/jquery_native.js</file>
<file>../../../web-apps/vendor/xregexp/xregexp-all-min.js</file>
<file>../../../web-apps-pro/vendor/xregexp/xregexp-all-min.js</file>
<file>./AllFonts.js</file>
<htmlfile>../../../web-apps/vendor/jquery/jquery.min.js</htmlfile>
<htmlfile>../../../web-apps-pro/vendor/jquery/jquery.min.js</htmlfile>
<DoctSdk>
<file>../../../sdkjs/word/sdk-all-min.js</file>
<file>../../../sdkjs/common/libfont/js/fonts.js</file>