Compare commits

..

8 Commits

Author SHA1 Message Date
dd346a380e Merge tag 'v4.3.2' into develop
v4.3.2 v4.3.2
2017-04-17 14:59:31 +03:00
61497a8da7 Merge branch 'hotfix/v4.3.2' 2017-04-17 14:59:29 +03:00
34d568bdbc Fix goback button 2017-04-06 18:42:18 +03:00
905084dc52 Fix goback button 2017-04-06 17:22:13 +03:00
e00b662660 Merge tag 'v4.3.0' into develop
v4.3.0
2017-04-03 12:58:54 +03:00
5ded3f6135 Merge branch 'release/v4.3.0' 2017-04-03 12:58:44 +03:00
a096e96b29 Fix Bug 34518 - "Uncaught SyntaxError: Unexpected token }" 2017-03-27 14:31:58 +03:00
b452a171d1 nodejs: append dependencies 2017-03-21 10:40:03 +03:00
3 changed files with 3 additions and 2 deletions

View File

@ -595,7 +595,7 @@ app.get("/editor", function (req, res) {
isEdit: canEdit && mode != "review",
mode: canEdit && mode != "view" ? "edit" : "view",
canBackToFolder: type != "embedded",
getServerUrl: type == "embedded" ? null : "\"" + docManager.getServerUrl() + "\"",
getServerUrl: docManager.getServerUrl(),
curUserHostAddress: docManager.curUserHostAddress(),
lang: lang,
userid: userid,

View File

@ -23,6 +23,7 @@
"jsonwebtoken": "^7.1.9",
"jwa": "^1.1.4",
"log4js": "^0.6.38",
"mime": "^1.3.4",
"serve-favicon": "~2.3.0",
"sync-request": "^4.0.1",
"urllib": "^2.20.0",

View File

@ -39,7 +39,7 @@
"feedback": true,
"forcesave": false,
"goback": {
"url": <%- editor.getServerUrl %>
"url": "<%= editor.getServerUrl %>"
}
},
"fileChoiceUrl": "<%= editor.fileChoiceUrl %>",