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

Commit d05895fa authored by AVINASH GUSAIN's avatar AVINASH GUSAIN Committed by Akhil
Browse files

Show email ID and local time of sharer to sharee when sharing a calendar

parent 06d2ef53

Dockerfile

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

ARG DROP_ACCOUNT_VERSION="2.3.2"



RUN sed -i 's/26,0,8,2/26,0,8,24/' ${BASE_DIR}/version.php

RUN sed -i 's/26,0,8,2/26,0,8,25/' ${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/004-contact-search-controller-removal.patch

+0 −13
Original line number Diff line number Diff line
@@ -15,16 +15,3 @@ diff --git ContactsMenuController.php ContactsMenuController-new.php 
+		return [];

 	}

 
 	/**

@@ -59,11 +59,6 @@

 	 * @throws Exception

 	 */

 	public function findOne(int $shareType, string $shareWith) {

-		$contact = $this->manager->findOne($this->userSession->getUser(), $shareType, $shareWith);

-

-		if ($contact) {

-			return $contact;

-		}

 		return new JSONResponse([], Http::STATUS_NOT_FOUND);

 	}

 }