diff options
author | Sergey Linnik <sergey.linnik@onlyoffice.com> | 2017-06-27 15:05:23 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-27 15:05:23 +0300 |
commit | 06143c50c072ec9db8761b2cdb969a33e0b67ea1 (patch) | |
tree | d6a970b204565f8bc6cbfb3321f28b8deb082347 | |
parent | bccf921bb1feed32e2f3ccaefd96a75595e8d575 (diff) | |
parent | 94d3015c2febf12cccf02e09acc84367057fce11 (diff) |
Merge pull request #86 from ONLYOFFICE/developv1.1.3
Release/1.1.3
-rw-r--r-- | CHANGELOG.md | 4 | ||||
-rw-r--r-- | appinfo/info.xml | 4 | ||||
-rw-r--r-- | controller/editorcontroller.php | 4 | ||||
-rw-r--r-- | screenshots/main.png | bin | 68411 -> 45243 bytes | |||
-rw-r--r-- | screenshots/main_small.png | bin | 18805 -> 11763 bytes | |||
-rw-r--r-- | screenshots/new.png | bin | 17772 -> 0 bytes | |||
-rw-r--r-- | screenshots/open.png | bin | 20035 -> 0 bytes | |||
-rw-r--r-- | screenshots/settings.png | bin | 14761 -> 17165 bytes |
8 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 40487e7..23fb4c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 1.1.3 +## Added +- fixing bug + ## 1.1.2 ## Added - translation diff --git a/appinfo/info.xml b/appinfo/info.xml index 55cfcda..fb4c0a1 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -7,7 +7,7 @@ <description>ONLYOFFICE integration app enables users to edit Office documents within ONLYOFFICE from OwnCloud. This will create a new Open in ONLYOFFICE action within the document library for Office documents. This allows multiple users to collaborate in real time and to save back those changes to OwnCloud.</description> <licence>AGPL</licence> <author>Ascensio System SIA</author> - <version>1.1.2</version> + <version>1.1.3</version> <namespace>Onlyoffice</namespace> <types> <filesystem/> @@ -24,8 +24,6 @@ <bugs>https://github.com/ONLYOFFICE/onlyoffice-owncloud/issues</bugs> <repository type="git">https://github.com/ONLYOFFICE/onlyoffice-owncloud.git</repository> <screenshot small-thumbnail="https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-owncloud/master/screenshots/main_small.png">https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-owncloud/master/screenshots/main.png</screenshot> - <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-owncloud/master/screenshots/new.png</screenshot> - <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-owncloud/master/screenshots/open.png</screenshot> <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-owncloud/master/screenshots/settings.png</screenshot> <dependencies> <owncloud min-version="9.0" max-version="10.0" /> diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php index b53c68c..72f3862 100644 --- a/controller/editorcontroller.php +++ b/controller/editorcontroller.php @@ -366,7 +366,7 @@ class EditorController extends Controller { $key = $this->getKey($file); $canEdit = isset($format["edit"]) && $format["edit"]; - $callback = ($file->isUpdateable() && $canEdit ? $this->urlGenerator->linkToRouteAbsolute($this->appName . ".callback.track", ["doc" => $hashCallback]) : NULL); + $callback = ($file->isUpdateable() && $canEdit ? $this->urlGenerator->linkToRouteAbsolute($this->appName . ".callback.track", ["doc" => $hashCallback]) : ""); if (!empty($this->config->GetStorageUrl())) { $callback = str_replace($this->urlGenerator->getAbsoluteURL("/"), $this->config->GetStorageUrl(), $callback); @@ -383,7 +383,7 @@ class EditorController extends Controller { "editorConfig" => [ "callbackUrl" => $callback, "lang" => \OC::$server->getL10NFactory("")->get("")->getLanguageCode(), - "mode" => ($callback === NULL ? "view" : "edit"), + "mode" => (empty($callback) ? "view" : "edit"), "user" => [ "id" => $userId, "name" => $this->userSession->getUser()->getDisplayName() diff --git a/screenshots/main.png b/screenshots/main.png Binary files differindex 43e5017..d7f7c18 100644 --- a/screenshots/main.png +++ b/screenshots/main.png diff --git a/screenshots/main_small.png b/screenshots/main_small.png Binary files differindex 1a9659e..c80dfe2 100644 --- a/screenshots/main_small.png +++ b/screenshots/main_small.png diff --git a/screenshots/new.png b/screenshots/new.png Binary files differdeleted file mode 100644 index e25c939..0000000 --- a/screenshots/new.png +++ /dev/null diff --git a/screenshots/open.png b/screenshots/open.png Binary files differdeleted file mode 100644 index 3ab459f..0000000 --- a/screenshots/open.png +++ /dev/null diff --git a/screenshots/settings.png b/screenshots/settings.png Binary files differindex dd760dd..2dc9f49 100644 --- a/screenshots/settings.png +++ b/screenshots/settings.png |