Carnet is now in an iframe to avoid style conflictsold_main

5 files changed, 5 insertions, 5 deletions

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 7c50f9d..188dc50 100755
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -19,7 +19,7 @@ Mac, with sync capabilities
 - Statistics : words/sentences/characters
 - Sync with ownCloud/NextCloud
 - Online editor as a ownCloud/NextCloud App]]></description>
-    <version>0.24.2</version>
+    <version>0.24.3</version>
     <licence>agpl</licence>
     <author mail="phie@phie.ovh" >Phie</author>
     <namespace>Carnet</namespace>
@@ -33,7 +33,7 @@ Mac, with sync capabilities
             <filesystem/>
     </types>
     <dependencies>
-        <nextcloud min-version="13" max-version="22"/>
+        <nextcloud min-version="13" max-version="23"/>
          <owncloud min-version="10" max-version="10"/>
 
     </dependencies>
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index e3f758a..e8ee548 100755
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -101,8 +101,7 @@ class PageController extends Controller {
 			'app_version' => App::getAppInfo($this->appName)['version'],
 		];
 		$response =  new TemplateResponse($this->appName,"settings", $parameters);
-		if($this->config->getAppValue('carnet', 'carnetDisplayFullscreen', 'no') === "yes")
-			$response->renderAs("blank");
+		$response->renderAs("blank");
 		$policy = new ContentSecurityPolicy();
         $policy->addAllowedFrameDomain('\'self\'');
 		$response->setContentSecurityPolicy($policy); // allow iframe
diff --git a/templates/CarnetElectron b/templates/CarnetElectron
-Subproject 78007590a7fca55fd381f91af94f52a4dc619a5
diff --git a/templates/index.php b/templates/index.php
index c3ae8cc..c3ae8cc 100755..100644
--- a/templates/index.php
+++ b/templates/index.php
diff --git a/templates/settings.php b/templates/settings.php
index 1d4396e..c7d2a73 100755
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -1,7 +1,7 @@
 <?php
 global $fullscreen;
 global $appVersion;
-$fullscreen = $_['carnet_display_fullscreen'];
+$fullscreen = True;
 $currentpath = __DIR__."/CarnetElectron/";
 $appVersion = $_['app_version'];