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

Commit 81f5be68 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

fix patch

parent 7e1a21f0

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="870242" 
ARG MEMORIES_VERSION="6.2.2"

ARG DROP_ACCOUNT_VERSION="2.3.2"



RUN sed -i 's/27,1,7,2/27,1,7,8/' ${BASE_DIR}/version.php

RUN sed -i 's/27,1,7,2/27,1,7,9/' ${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/015-email-mail-template.patch

+3 −3
Original line number Diff line number Diff line
@@ -38,15 +38,15 @@ 
 		$this->imipService->addBulletList($template, $vEvent, $data);

 

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



@@ -295,7 +317,7 @@

@@ -295,7 +317,6 @@

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

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

 				$this->imipService->addResponseButtons($template, $token);

-				$this->imipService->addMoreOptionsButton($template, $token);

+				//$this->imipService->addMoreOptionsButton($template, $token);

 			}

 		}

 



--- ./apps/dav/lib/CalDAV/Schedule/IMipService.php	2024-03-18 11:40:39

+++ ./apps/dav/lib/CalDAV/Schedule/IMipService-new.php	2024-03-18 13:47:17

@@ -444,6 +444,51 @@