Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d5f7879 authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'dev/nc32' of https://gitlab.e.foundation/e/infra/ecloud/nextcloud into dev/nc32

parents 8a49743f 4c9904df

Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ ARG CALENDAR_URL="https://gitlab.e.foundation/api/v4/projects/1199/packages/gene 
ARG THEME_HELPER_URL="https://gitlab.e.foundation/api/v4/projects/952/packages/generic/ecloud-theme-helper/v11.0.0-beta/ecloud-theme-helper-v11.0.0-beta.tar.gz"

ARG LAUNCHER_URL="https://gitlab.e.foundation/api/v4/projects/927/packages/generic/murena_launcher/v10.0.0-beta/murena_launcher-v10.0.0-beta.tar.gz"

ARG DASHBOARD_URL="https://gitlab.e.foundation/api/v4/projects/1195/packages/generic/murena-dashboard/v10.0.0-beta/murena-dashboard-v10.0.0-beta.tar.gz"

ARG SNAPPY_URL="https://gitlab.e.foundation/api/v4/projects/1367/packages/generic/snappymail/v2.38.2+murena-20251117/snappymail-v2.38.2+murena-20251117.tar.gz"

ARG SNAPPY_URL="https://gitlab.e.foundation/api/v4/projects/1367/packages/generic/snappymail/v2.38.2+murena-20260322/snappymail-v2.38.2+murena-20260322.tar.gz"

ARG OIDC_LOGIN_URL="https://gitlab.e.foundation/api/v4/projects/1496/packages/generic/oidc_login/v3.2.2+murena-20260323/oidc_login-v3.2.2+murena-20260323.tar.gz"

ARG SNAPPY_THEME_VERSION="https://gitlab.e.foundation/api/v4/projects/1377/packages/generic/snappymail/v4.0.5/snappymail-v4.0.5.tar.gz"

ARG EA_URL="https://gitlab.e.foundation/api/v4/projects/648/packages/generic/ecloud-accounts/v14.0.0-beta/ecloud-accounts-v14.0.0-beta.tar.gz"
@@ -19,7 +19,7 @@ ARG MEMORIES_URL="https://github.com/pulsejet/memories/releases/download/v7.8.2/ 
ARG DROP_ACCOUNT_URL="https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.7.1.tar.gz"

ARG GOOGLE_INTEGRATION_URL="https://github.com/nextcloud-releases/integration_google/releases/download/v4.2.0/integration_google-v4.2.0.tar.gz"



RUN sed -i 's/32,0,6,1/32,0,6,3/' ${BASE_DIR}/version.php

RUN sed -i 's/32,0,6,1/32,0,6,6/' ${BASE_DIR}/version.php

COPY custom_entrypoint.sh /

RUN chmod +x /custom_entrypoint.sh

RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images

patches/003-contact-search-removal.patch

+3 −3
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ Subject: [PATCH] remove user search icon in header tab 
This patch removes the top right icon enabling the global user search function available to all in nextcloud.



diff --git layout.user.php layout.user.php-new

--- ./core/templates/layout.user.php	2023-03-28 14:54:05.873566570 +0530

+++ ./core/templates/layout.user-new.php	2023-03-28 14:54:35.044218831 +0530

--- ./core/templates/layout.user.php	2026-03-23 17:46:38.739003512 +0600

+++ ./core/templates/layout.user-new.php	2026-03-24 10:20:10.404364930 +0600

@@ -76,7 +76,6 @@

 			<div class="header-right">

 			<div class="header-end">

 				<div id="unified-search"></div>

 				<div id="notifications"></div>

-				<div id="contactsmenu"></div>

patches/015-email-mail-template.patch

+14 −13
Original line number Diff line number Diff line
@@ -5,17 +5,17 @@ Subject: [PATCH] In the invitation modifying a recurring event highlight whether 


This patch helps in indentifying that For a recurring event, the invitee knows without a doubt whether the modification pushed by the updated invitation is a one time thing or a modification of all future events.



--- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php	2024-03-18 11:18:20

+++ ./apps/dav/lib/CalDAV/Schedule/IMipPlugin-new.php	2024-03-11 11:18:22

@@ -149,7 +149,30 @@

 		/** @var VEvent $oldVevent */

--- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php	2026-03-23 17:46:37.629006189 +0600

+++ ./apps/dav/lib/CalDAV/Schedule/IMipPlugin-new.php	2026-03-24 09:30:02.299251689 +0600

@@ -148,6 +148,30 @@

 		$oldVevent = !empty($modified['old']) && is_array($modified['old']) ? array_pop($modified['old']) : null;

 		$isModified = isset($oldVevent);

 

+		$recurrenceId = $vEvent->{'RECURRENCE-ID'};

+		if (isset($recurrenceId) && $modified['sentOld'] === 1 && !empty($oldVevent)) {

+			$dateTime = $recurrenceId->getValue();

+			$recurrenceArray = explode('T', $dateTime);

 

+

+			$oldVEventStart = $oldVevent->DTSTART;

+			$oldStartDateTime = $oldVEventStart->getValue();

+			$startDateTimeArray = explode('T', $oldStartDateTime);
@@ -38,7 +38,7 @@ This patch helps in indentifying that For a recurring event, the invitee knows w 
 		// No changed events after all - this shouldn't happen if there is significant change yet here we are

 		// The scheduling status is debatable

 		if (empty($vEvent)) {

@@ -217,12 +240,35 @@

@@ -215,12 +239,36 @@

 		$data['invitee_name'] = ($senderName ?: $sender);

 

 		$fromEMail = Util::getDefaultEmailAddress('invitations-noreply');
@@ -68,6 +68,7 @@ This patch helps in indentifying that For a recurring event, the invitee knows w 
+		if ($method !== self::METHOD_CANCEL && $method !== self::METHOD_REPLY && count($vEvent) > 1) {

+			$template->addHeadingBanner('#EFFFDB', '#293618', $l10n->t('This recurring event has been updated, please review the information below:'));

+		}

+

+		$sequence = $vEvent->SEQUENCE ? $vEvent->SEQUENCE->getValue() : NULL;

+		if (($sequence && $method !== self::METHOD_CANCEL && $method !== self::METHOD_REPLY && ($sequence > 2)) || isset($vEvent->{'RECURRENCE-ID'})) {

+			$template->addHeadingBanner('#EFFFDB', '#293618', $l10n->t('This event has been updated, please review the information below:'));
@@ -75,7 +76,7 @@ This patch helps in indentifying that For a recurring event, the invitee knows w 
 		$this->imipService->addBulletList($template, $vEvent, $data);

 

 		// Only add response buttons to invitation requests: Fix Issue #11230

@@ -255,7 +301,6 @@

@@ -253,7 +301,6 @@

 				|| in_array(strtolower($recipientDomain), $invitationLinkRecipients)) {

 				$token = $this->imipService->createInvitationToken($iTipMessage, $vEvent, $lastOccurrence);

 				$this->imipService->addResponseButtons($template, $token);
@@ -220,8 +221,8 @@ This patch helps in indentifying that For a recurring event, the invitee knows w 
 

 	public function getReplyingAttendee(Message $iTipMessage): ?Property {



--- ./apps/dav/lib/CalDAV/EventComparisonService.php	2024-05-06 12:46:29

+++ ./apps/dav/lib/CalDAV/EventComparisonService-new.php	2024-05-06 12:47:11

--- ./apps/dav/lib/CalDAV/EventComparisonService.php	2026-03-13 18:50:32.749819154 +0600

+++ ./apps/dav/lib/CalDAV/EventComparisonService-new.php	2026-03-24 09:38:05.198934270 +0600

@@ -78,8 +78,9 @@

 			}

 		}

patches/018-occ-user-setting.patch

+3 −3
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ Subject: [PATCH] Triggers user changed event when quota is updated via occ comma 


This patch triggers a user changed event when quota is updated via the occ command



--- ./core/Command/User/Setting.php	2022-07-05 14:53:54.093230637 +0530

+++ ./core/Command/User/Setting-new.php	2022-07-05 21:24:11.654134876 +0530

--- ./core/Command/User/Setting.php	2026-03-13 18:50:33.263437372 +0600

+++ ./core/Command/User/Setting-new.php	2026-03-24 09:45:49.964746450 +0600

@@ -16,6 +16,8 @@

 use Symfony\Component\Console\Input\InputInterface;

 use Symfony\Component\Console\Input\InputOption;
@@ -15,7 +15,7 @@ This patch triggers a user changed event when quota is updated via the occ comma 
 

 class Setting extends Base {

 	public function __construct(

@@ -174,6 +176,11 @@

@@ -175,6 +177,11 @@

 				}

 

 				$this->config->setUserValue($uid, $app, $key, $input->getArgument('value'));

patches/020-fairuse-notification-fix.patch

+3 −3
Original line number Diff line number Diff line 
--- lib/private/Notification/Manager.php	2023-03-28 15:06:21.073329171 +0530

+++ lib/private/Notification/Manager-new.php	2023-03-28 15:07:06.854351797 +0530

@@ -272,18 +272,7 @@

--- ./lib/private/Notification/Manager.php	2026-03-23 17:46:39.556001518 +0600

+++ ./lib/private/Notification/Manager-new.php	2026-03-24 11:03:02.989706120 +0600

@@ -284,18 +284,7 @@

 	 * {@inheritDoc}

 	 */

 	public function isFairUseOfFreePushService(): bool {