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

Commit 1bb985a8 authored by Akhil's avatar Akhil 🙂
Browse files

fix: fix patches and seds

parent acd1a1fe
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR
#RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i ${TMP_PATCH_DIR}/023-ldap-check-pwd-optimization.patch - already added in nc31
RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/025-optimize-get-by-email.patch
RUN patch -u ${BASE_DIR}/apps/dav/lib/Connector/Sabre/Principal.php -i ${TMP_PATCH_DIR}/027-displayname-user-leak-dav.patch
RUN patch -u ${BASE_DIR}/apps/dav/lib/HookManager.php -i ${TMP_PATCH_DIR}/028-default-task-calendar.patch
RUN patch -u ${BASE_DIR}/apps/dav/lib/Listener/UserEventsListener.php -i ${TMP_PATCH_DIR}/028-default-task-calendar.patch
RUN patch -u ${BASE_DIR}/apps/provisioning_api/lib/Controller/UsersController.php -i ${TMP_PATCH_DIR}/029-restrict-user-to-change-primary-email.patch
RUN patch -u ${BASE_DIR}/lib/private/Security/VerificationToken/VerificationToken.php -i ${TMP_PATCH_DIR}/033-verification-token-private.patch
RUN patch -u ${BASE_DIR}/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php -i ${TMP_PATCH_DIR}/034-oidc-bearer-token-auth.patch
@@ -192,7 +192,7 @@ RUN sed -i 's/$this->getAvatarImage($user)/null/' ${BASE_DIR}/apps/dav/lib/CardD
# RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js

# add attr about how many notifications to notif icon
RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==u.notifications.length,/' ${BASE_DIR}/apps/notifications/js/NotificationsApp-CL5l4zBd.chunk.mjs
RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==u.notifications.length,/' ${BASE_DIR}/apps/notifications/js/NotificationsApp-hrGoV45R.chunk.mjs

# Rename Memories to Gallery
RUN sed -i 's/<name>Memories<\/name>/<name>Gallery<\/name>/g' ${BASE_DIR}/custom_apps/memories/appinfo/info.xml
+18 −19
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ Subject: [PATCH] Create a task calendar on first login

This patch creates a default task VTODO calender on first login

--- apps/dav/lib/HookManager.php	2023-09-27 15:22:49
+++ apps/dav/lib/HookManager-new.php	2023-09-27 15:24:15
@@ -152,9 +152,15 @@
--- ./apps/dav/lib/Listener/UserEventsListener.php	2026-03-23 16:13:45.776354220 +0530
+++ ./apps/dav/lib/Listener/UserEventsListener-new.php	2026-03-23 16:15:01.651455385 +0530
@@ -151,9 +151,14 @@
 			try {
 					$this->calDav->createCalendar($principal, CalDavBackend::PERSONAL_CALENDAR_URI, [
 				$calendarId = $this->calDav->createCalendar($principal, CalDavBackend::PERSONAL_CALENDAR_URI, [
 					'{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME,
-					'{http://apple.com/ns/ical/}calendar-color' => $this->themingDefaults->getColorPrimary(),
+					'{http://apple.com/ns/ical/}calendar-color' => '#007FFF',
@@ -19,7 +19,6 @@ This patch creates a default task VTODO calender on first login
+					'{http://apple.com/ns/ical/}calendar-color' => '#007FFF',
+					'components' => 'VTODO'
+				]);
+
 			} catch (\Exception $e) {
 					\OC::$server->get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
 				$this->logger->error($e->getMessage(), ['exception' => $e]);
 			}