Compare commits

..

10 Commits

Author SHA1 Message Date
d014eeae3f Added plugins->UIpluginsData for interface customizing using plugins. 2016-11-16 14:21:26 +03:00
529b76013d Merge tag 'win-install' into develop
win-install

Conflicts:
	web/documentserver-example/nodejs/config/production-windows.json
2016-11-14 19:39:11 +03:00
e8af9379f4 Merge branch 'hotfix/win-install' 2016-11-14 19:33:21 +03:00
8eaa1af0a3 Added Makefile to build nodejs example 2016-11-14 17:39:40 +03:00
0609932a51 add some plugins to develop config 2016-11-10 16:44:14 +03:00
68b279759a add num to word plugin 2016-11-10 16:28:04 +03:00
741076c36a Fixed SyntaxError 2016-10-27 14:04:24 +03:00
f42dc78f6e fixed plugins on windows 2016-10-27 12:47:22 +03:00
b223ce6e6b Merge pull request #18 from ONLYOFFICE/hotfix/windows-build
Added config for the windows version
2016-10-07 17:16:07 +03:00
bce32192af Added config for the windows version 2016-10-07 17:15:00 +03:00
5 changed files with 49 additions and 3 deletions

4
Makefile Normal file
View File

@ -0,0 +1,4 @@
.PHONY: all
all:
cd web/documentserver-example/nodejs && npm install

View File

@ -74,6 +74,13 @@ app.use(function (req, res, next) {
});
app.use(express.static(path.join(__dirname, "public")));
if (config.has('server.static')) {
var staticContent = config.get('server.static');
for (var i = 0; i < staticContent.length; ++i) {
var staticContentElem = staticContent[i];
app.use(staticContentElem['name'], express.static(staticContentElem['path'], staticContentElem['options']));
}
}
app.use(favicon(__dirname + "/public/images/favicon.ico"));

View File

@ -23,7 +23,13 @@
"editedDocs": [".docx", ".doc", ".odt", ".xlsx", ".xls", ".ods", ".csv", ".pptx", ".ppsx", ".rtf", ".txt", ".mht", ".html", ".htm"],
"convertedDocs": [".doc", ".odt", ".xls", ".ods", ".ppt", ".pps", ".odp", ".rtf", ".mht", ".html", ".htm", ".epub"],
"storageFolder": "files",
"maxFileSize": 1073741824
"maxFileSize": 1073741824,
"static":[
{
"name": "/public",
"path": "public"
}
]
},
"plugins": {
"url": "../../../../sdkjs-plugins/",

View File

@ -1,6 +1,23 @@
{
{
"server": {
"port": 80,
"siteUrl": "http://127.0.0.1:8001/"
},
"plugins": {
"pluginsData": [
"helloworld/config.json",
"chess/config.json",
"glavred/config.json",
"speech/config.json",
"youtube/config.json",
"cbr/config.json",
"num2word/config.json",
"ocr/config.json",
"yandextranslaterus/config.json",
"clipart/config.json",
"translate/config.json",
"templates/config.json"
],
"UIpluginsData": []
}
}

View File

@ -1,7 +1,19 @@
{
"server": {
"siteUrl": "/",
"maxFileSize": 104857600
"maxFileSize": 104857600,
"static":[
{
"name": "/public",
"path": "public",
"options": {"maxAge": "7d"}
},
{
"name": "/sdkjs-plugins",
"path": "sdkjs-plugins",
"options": {"maxAge": "7d"}
}
]
},
"plugins": {
"url": "/sdkjs-plugins/"