mirror of
https://github.com/YunoHost-Apps/nextcloud_ynh.git
synced 2024-09-03 19:55:57 +02:00
commit
9acbbe212b
8 changed files with 19 additions and 11 deletions
|
@ -29,7 +29,7 @@ In addition to Nextcloud core features, the following are made available with th
|
||||||
* Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal
|
* Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal
|
||||||
|
|
||||||
|
|
||||||
**Shipped version:** 27.1.4~ynh1
|
**Shipped version:** 28.0.1~ynh1
|
||||||
|
|
||||||
**Demo:** https://demo.nextcloud.com/
|
**Demo:** https://demo.nextcloud.com/
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv
|
||||||
* Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal
|
* Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal
|
||||||
|
|
||||||
|
|
||||||
**Version incluse :** 27.1.4~ynh1
|
**Version incluse :** 28.0.1~ynh1
|
||||||
|
|
||||||
**Démo :** https://demo.nextcloud.com/
|
**Démo :** https://demo.nextcloud.com/
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ name = "Nextcloud"
|
||||||
description.en = "Online storage, file sharing platform and various other applications"
|
description.en = "Online storage, file sharing platform and various other applications"
|
||||||
description.fr = "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications"
|
description.fr = "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications"
|
||||||
|
|
||||||
version = "27.1.4~ynh1"
|
version = "28.0.1~ynh1"
|
||||||
|
|
||||||
maintainers = ["kay0u"]
|
maintainers = ["kay0u"]
|
||||||
|
|
||||||
|
|
7
scripts/upgrade.d/upgrade.27.sh
Normal file
7
scripts/upgrade.d/upgrade.27.sh
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Last available Nextcloud version
|
||||||
|
next_version="28.0.0"
|
||||||
|
|
||||||
|
# Nextcloud tarball checksum sha256
|
||||||
|
nextcloud_source_sha256="4e8b0b74b40221e85f92ab869d0873c69a52d7e43889d9259c6259428a6a36f2"
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Last available Nextcloud version
|
# Last available Nextcloud version
|
||||||
next_version="27.1.4"
|
next_version="28.0.1"
|
||||||
|
|
||||||
# Nextcloud tarball checksum sha256
|
# Nextcloud tarball checksum sha256
|
||||||
nextcloud_source_sha256="bec65f2166b82c9303baf476c1e424f71aa196dad010ffe4c0c39d03990d594c"
|
nextcloud_source_sha256="2f80735b443082272fe6a3b5e32137957f1fc448c75342b94b5200b29725f3a4"
|
||||||
|
|
|
@ -2,17 +2,17 @@ diff --git a/core/Controller/LoginController.php b/core/Controller/LoginControll
|
||||||
index 13aef8f67a..55d8dbf9d1 100644
|
index 13aef8f67a..55d8dbf9d1 100644
|
||||||
--- a/core/Controller/LoginController.php
|
--- a/core/Controller/LoginController.php
|
||||||
+++ b/core/Controller/LoginController.php
|
+++ b/core/Controller/LoginController.php
|
||||||
@@ -119,11 +119,12 @@ class LoginController extends Controller {
|
@@ -97,11 +97,12 @@ class LoginController extends Controller {
|
||||||
}
|
}
|
||||||
$this->userSession->logout();
|
$this->userSession->logout();
|
||||||
|
|
||||||
- $response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
|
- $response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
|
||||||
- 'core.login.showLoginForm',
|
- 'core.login.showLoginForm',
|
||||||
- ['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers
|
- ['clear' => true] // this param the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers
|
||||||
+ $redirectUrl = $this->config->getSystemValue('logout_url',
|
+ $redirectUrl = $this->config->getSystemValue('logout_url',
|
||||||
+ $this->urlGenerator->linkToRouteAbsolute(
|
+ $this->urlGenerator->linkToRouteAbsolute(
|
||||||
+ 'core.login.showLoginForm',
|
+ 'core.login.showLoginForm',
|
||||||
+ ['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers)
|
+ ['clear' => true] // this param the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers)
|
||||||
));
|
));
|
||||||
-
|
-
|
||||||
+ $response = new RedirectResponse($redirectUrl);
|
+ $response = new RedirectResponse($redirectUrl);
|
||||||
|
|
|
@ -5,13 +5,13 @@ diff --git a/lib/public/AppFramework/Http/ContentSecurityPolicy.php b/lib/public
|
||||||
index e9ecf00036..8e69c8d2dc 100644
|
index e9ecf00036..8e69c8d2dc 100644
|
||||||
--- a/lib/public/AppFramework/Http/ContentSecurityPolicy.php
|
--- a/lib/public/AppFramework/Http/ContentSecurityPolicy.php
|
||||||
+++ b/lib/public/AppFramework/Http/ContentSecurityPolicy.php
|
+++ b/lib/public/AppFramework/Http/ContentSecurityPolicy.php
|
||||||
@@ -44,7 +44,8 @@ class ContentSecurityPolicy extends EmptyContentSecurityPolicy {
|
@@ -42,7 +42,8 @@ class ContentSecurityPolicy extends EmptyContentSecurityPolicy {
|
||||||
/** @var bool Whether inline JS snippets are allowed */
|
/** @var bool Whether inline JS snippets are allowed */
|
||||||
protected $inlineScriptAllowed = false;
|
protected $inlineScriptAllowed = false;
|
||||||
/** @var bool Whether eval in JS scripts is allowed */
|
/** @var bool Whether eval in JS scripts is allowed */
|
||||||
- protected $evalScriptAllowed = false;
|
- protected $evalScriptAllowed = false;
|
||||||
+ // YunoHost patch: allow for eval in JS scripts for YunoHost tile
|
+ // YunoHost patch: allow for eval in JS scripts for YunoHost tile
|
||||||
+ protected $evalScriptAllowed = true;
|
+ protected $evalScriptAllowed = true;
|
||||||
|
/** @var bool Whether WebAssembly compilation is allowed */
|
||||||
|
protected ?bool $evalWasmAllowed = false;
|
||||||
/** @var bool Whether strict-dynamic should be set */
|
/** @var bool Whether strict-dynamic should be set */
|
||||||
protected $strictDynamicAllowed = null;
|
|
||||||
/** @var array Domains from which scripts can get loaded */
|
|
||||||
|
|
|
@ -8,4 +8,5 @@ test_format = 1.0
|
||||||
|
|
||||||
test_upgrade_from.c5cf91ad.name = "Upgrade from 25.0.2"
|
test_upgrade_from.c5cf91ad.name = "Upgrade from 25.0.2"
|
||||||
test_upgrade_from.caf917f3.name = "Upgrade from 26.0.2"
|
test_upgrade_from.caf917f3.name = "Upgrade from 26.0.2"
|
||||||
|
test_upgrade_from.9c6d1eea.name = "Upgrade from 27.1.4"
|
||||||
|
|
Loading…
Add table
Reference in a new issue