From 1e4090ce7b2613881d872e5ebad81b9e1831c9b8 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 27 Sep 2023 15:32:09 +0530 Subject: [PATCH 1/2] color fix --- patches/028-default-task-calendar.patch | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/patches/028-default-task-calendar.patch b/patches/028-default-task-calendar.patch index e182ef6d..58ff13f0 100644 --- a/patches/028-default-task-calendar.patch +++ b/patches/028-default-task-calendar.patch @@ -4,17 +4,20 @@ 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-06-16 19:01:35.894535512 +0530 -+++ ./apps/dav/lib/HookManager-new.php 2023-06-16 19:07:09.374531373 +0530 -@@ -179,6 +179,11 @@ - '{http://apple.com/ns/ical/}calendar-color' => $this->themingDefaults->getColorPrimary(), +--- apps/dav/lib/HookManager.php 2023-09-27 15:22:49 ++++ apps/dav/lib/HookManager-new.php 2023-09-27 15:24:15 +@@ -176,8 +176,13 @@ + try { + $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', 'components' => 'VEVENT' - ]); ++ ]); + $this->calDav->createCalendar($principal, 'tasks', [ + '{DAV:}displayname' => 'Tasks', -+ '{http://apple.com/ns/ical/}calendar-color' => $this->themingDefaults->getColorPrimary(), ++ '{http://apple.com/ns/ical/}calendar-color' => '#007FFF', + 'components' => 'VTODO' -+ ]); + ]); } catch (\Exception $e) { \OC::$server->get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]); - } -- GitLab From 37a27bcce3dfae1714bc016432c16abf9418d239 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 27 Sep 2023 15:37:37 +0530 Subject: [PATCH 2/2] version bump and updated theme version for other deployemnt --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a382b24f..526252f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.8" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.4.1" -RUN sed -i 's/25,0,8,2/25,0,8,23/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,2/25,0,8,24/' ${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 @@ -121,7 +121,7 @@ CMD ["php-fpm"] From nextcloud as selfhost ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="25.0.12" +ARG THEME_VERSION="25.0.15" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG SELFHOST_THEME_VERSION="1.0.0" ARG IS_SELFHOST=true -- GitLab