Merge branch 'dev/nc32' of https://gitlab.e.foundation/e/infra/ecloud/nextcloud into dev/nc32 (055e633e) · Commits · e / infra / ecloud / nextcloud

patches/009-help-links.patch

+25 −22

Original line number	Diff line number	Diff line
		@@ -5,9 +5,9 @@ Subject: [PATCH] Changes help links to point to the correct links
		This patch updated/adds changes to the "Settings" app's help template, controller and stylesheet to make sure the correct
		help links are shown

		--- ./apps/settings/lib/Controller/HelpController.php 2025-03-07 11:04:18
		+++ ./apps/settings/lib/Controller/HelpController-new.php 2025-03-07 11:04:21
		@@ -103,6 +103,7 @@
		--- ./apps/settings/lib/Controller/HelpController.php 2026-03-13 18:50:33.011416152 +0600
		+++ ./apps/settings/lib/Controller/HelpController-new.php 2026-03-23 22:22:02.188613774 +0600
		@@ -79,6 +79,7 @@
		'urlAdminDocs' => $urlAdminDocs,
		'mode' => $mode,
		'pageTitle' => $pageTitle,
		@@ -16,9 +16,9 @@ help links are shown
		'legalNoticeUrl' => $legalNoticeUrl,
		'privacyUrl' => $privacyUrl,

		--- ./apps/settings/templates/help.php 2025-03-13 21:19:20
		+++ ./apps/settings/templates/help-new.php 2025-03-26 13:04:36
		@@ -9,84 +9,47 @@
		--- ./apps/settings/templates/help.php 2026-03-23 17:46:38.175004877 +0600
		+++ ./apps/settings/templates/help-new.php 2026-03-23 22:37:53.260944930 +0600
		@@ -9,84 +9,50 @@
		<div id="app-navigation" role="navigation" tabindex="0">
		<ul>
		<li>
		@@ -37,7 +37,7 @@ help links are shown
		</a>
		</li>
		- <?php if ($_['admin']) { ?>
		<li>
		- <li>
		- <a class="help-list__link icon-user-admin <?php if ($_['mode'] === 'admin') {
		- p('active');
		- } ?>" <?php if ($_['mode'] === 'admin') {
		@@ -52,18 +52,18 @@ help links are shown
		</a>
		</li>
		- <?php } ?>
		-

		<li>
		- <a href="https://docs.nextcloud.com" class="help-list__link icon-category-office" target="_blank" rel="noreferrer noopener">
		+ <a href="https://community.e.foundation" class="icon-comment" target="_blank" rel="noreferrer noopener">
		<span class="help-list__text">
		- <span class="help-list__text">
		- <?php p($l->t('Documentation')); ?> ↗
		- </span>
		- </a>
		- </li>
		- <li>
		- <a href="https://help.nextcloud.com" class="help-list__link icon-comment" target="_blank" rel="noreferrer noopener">
		- <span class="help-list__text">
		+ <a href="https://community.e.foundation" class="icon-comment" target="_blank" rel="noreferrer noopener">
		<span class="help-list__text">
		<?php p($l->t('Forum')); ?> ↗
		</span>
		</a>
		@@ -96,10 +96,10 @@ help links are shown
		+ <?php p('/e/' . ' ' . $l->t('Documentation')); ?> ↗
		</a>
		- <a href="https://docs.nextcloud.com" class="button" target="_blank" rel="noreferrer noopener">
		- <?php p($l->t('General documentation')); ?> ↗
		- </a>
		- <a href="https://help.nextcloud.com" class="button" target="_blank" rel="noreferrer noopener">
		+ <a href="https://community.e.foundation" class="button" target="_blank" rel="noreferrer noopener">
		<?php p($l->t('General documentation')); ?> ↗
		</a>
		<a href="https://help.nextcloud.com" class="button" target="_blank" rel="noreferrer noopener">
		<?php p($l->t('Forum')); ?> ↗
		</a>
		- <?php if ($_['legalNoticeUrl']) { ?>
		@@ -116,11 +116,13 @@ help links are shown
		</div>
		</div>

		--- ./apps/settings/css/help.css 2021-08-20 14:16:57.951439620 +0530
		+++ ./apps/settings/css/help-new.css 2021-08-20 17:02:43.549016337 +0530
		--- ./apps/settings/css/help.css 2026-03-13 18:50:32.974975631 +0600
		+++ ./apps/settings/css/help-new.css 2026-03-23 22:51:18.824345235 +0600
		@@ -56,3 +56,13 @@
		.help-content__body > .button {
		margin: 20px;
		+}
		}
		+
		+#content #app-navigation {
		+ transform: none;
		+ width: max-content;
		@@ -128,4 +130,5 @@ help links are shown
		+
		+#app-navigation:not(.vue) > ul > li > a {
		+ padding: 0 12px 0 44px;
		}
		No newline at end of file
		+}
		+

patches/011-privacy-settings.patch

+2 −4

Original line number	Diff line number	Diff line
		@@ -41,13 +41,11 @@ This patch removes certain unnecessary sections from the "privacy" section in pe

		--- ./apps/privacy/lib/Controller/PersonalController.php 2024-08-01 12:57:29 +0530
		+++ ./apps/privacy/lib/Controller/PersonalController-new.php 2024-08-01 12:57:03 +0530
		@@ -87,7 +87,7 @@
		'internal' => false,
		@@ -88,6 +88,7 @@
		];
		}
		-

		+ $uids = [];
		return new JSONResponse($uids, Http::STATUS_OK);
		}
		}
		\ No newline at end of file