From 138d2ea0a67538deabfb98c30e7bdcce38a3526c Mon Sep 17 00:00:00 2001 From: Ronak Date: Fri, 9 Jun 2023 03:12:14 -0700 Subject: [PATCH 01/10] hide archive option in memories app --- Dockerfile | 1 + ...028-hide-archive-option-memories-app.patch | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 patches/028-hide-archive-option-memories-app.patch diff --git a/Dockerfile b/Dockerfile index d8472d4f..cf86271f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -126,6 +126,7 @@ RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch RUN patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Reminder/ReminderService.php -i ${TMP_PATCH_DIR}/024-reminder-service-handle-exception.patch RUN patch -u ${BASE_DIR}/apps/theming/lib/Themes/CommonThemeTrait.php -i ${TMP_PATCH_DIR}/026-primary-color-fix.patch +RUN patch -u ${BASE_DIR}/custom_apps/memories/src/components/SelectionManager.vue -i ${TMP_PATCH_DIR}/028-hide-archive-option-memories-app.patch RUN rm -rf ${TMP_PATCH_DIR} diff --git a/patches/028-hide-archive-option-memories-app.patch b/patches/028-hide-archive-option-memories-app.patch new file mode 100644 index 00000000..4bb06e42 --- /dev/null +++ b/patches/028-hide-archive-option-memories-app.patch @@ -0,0 +1,25 @@ +From: Ronak +Date: Fri, 09 June 2023 14:00 +0530 +Subject: [PATCH] To hide archive option in memories app + +--- ./custom_apps/memories/src/components/SelectionManager.vue 2023-06-09 02:55:22 ++++ ./custom_apps/memories/src/components/SelectionManager-new.vue 2023-06-09 03:04:52 +@@ -161,18 +161,6 @@ + name: t('memories', 'Favorite'), + icon: StarIcon, + callback: this.favoriteSelection.bind(this), +- }, +- { +- name: t('memories', 'Archive'), +- icon: ArchiveIcon, +- callback: this.archiveSelection.bind(this), +- if: () => !this.routeIsArchiveFolder() && !this.routeIsAlbums || false, +- }, +- { +- name: t('memories', 'Unarchive'), +- icon: UnarchiveIcon, +- callback: this.archiveSelection.bind(this), +- if: () => this.routeIsArchiveFolder() || false, + }, + { + name: t('memories', 'Edit metadata'), -- GitLab From f1b6048e48eaf86cb14a9c529b84ce3c768b1d93 Mon Sep 17 00:00:00 2001 From: Ronak Date: Fri, 9 Jun 2023 04:18:52 -0700 Subject: [PATCH 02/10] added memories app --- Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Dockerfile b/Dockerfile index cf86271f..f287ce97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.9" ARG DASHBOARD_JOB_ID="582062" ARG SNAPPY_VERSION="2.27.2" ARG SNAPPY_THEME_VERSION="2.0.0" +ARG MEMORIES_VERSION="5.1.0" RUN sed -i 's/25,0,6,1/25,0,6,5/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / @@ -92,6 +93,12 @@ RUN curl -fsSL -o Murena-snappymail-theme.tar.gz \ chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \ rm -rf Murena-snappymail-theme.tar.gz +RUN curl -fsSL -o memories.tar.gz \ + "https://github.com/pulsejet/memories/releases/download/v${MEMORIES_VERSION}/memories.tar.gz" && \ + tar -xf memories.tar.gz -C ${BASE_DIR}/custom_apps/ && \ + rm memories.tar.gz; + + # Remove unzip when unzipping is done RUN apt-get -y remove unzip -- GitLab From fde6fa0a37597a54db005c7d9c28c3a1d08820e5 Mon Sep 17 00:00:00 2001 From: Ronak Date: Fri, 9 Jun 2023 05:30:42 -0700 Subject: [PATCH 03/10] dockerfile updated --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 4d56ea3d..8288e28d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ ARG DASHBOARD_JOB_ID="582062" ARG SNAPPY_VERSION="2.27.2" ARG SNAPPY_THEME_VERSION="2.0.0" ARG USER_MIGRATION_JOB_ID="608716" +ARG MEMORIES_VERSION="5.1.0" RUN sed -i 's/25,0,6,1/25,0,6,5/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / -- GitLab From b0cf94e96f974163b89dbc5b3e99823657bccfec Mon Sep 17 00:00:00 2001 From: Ronak Date: Tue, 13 Jun 2023 13:48:52 -0700 Subject: [PATCH 04/10] removed patch --- Dockerfile | 1 - ...028-hide-archive-option-memories-app.patch | 25 ------------------- 2 files changed, 26 deletions(-) delete mode 100644 patches/028-hide-archive-option-memories-app.patch diff --git a/Dockerfile b/Dockerfile index 8288e28d..4c7674a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -140,7 +140,6 @@ RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch RUN patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Reminder/ReminderService.php -i ${TMP_PATCH_DIR}/024-reminder-service-handle-exception.patch RUN patch -u ${BASE_DIR}/apps/theming/lib/Themes/CommonThemeTrait.php -i ${TMP_PATCH_DIR}/026-primary-color-fix.patch -RUN patch -u ${BASE_DIR}/custom_apps/memories/src/components/SelectionManager.vue -i ${TMP_PATCH_DIR}/028-hide-archive-option-memories-app.patch RUN rm -rf ${TMP_PATCH_DIR} diff --git a/patches/028-hide-archive-option-memories-app.patch b/patches/028-hide-archive-option-memories-app.patch deleted file mode 100644 index 4bb06e42..00000000 --- a/patches/028-hide-archive-option-memories-app.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Ronak -Date: Fri, 09 June 2023 14:00 +0530 -Subject: [PATCH] To hide archive option in memories app - ---- ./custom_apps/memories/src/components/SelectionManager.vue 2023-06-09 02:55:22 -+++ ./custom_apps/memories/src/components/SelectionManager-new.vue 2023-06-09 03:04:52 -@@ -161,18 +161,6 @@ - name: t('memories', 'Favorite'), - icon: StarIcon, - callback: this.favoriteSelection.bind(this), -- }, -- { -- name: t('memories', 'Archive'), -- icon: ArchiveIcon, -- callback: this.archiveSelection.bind(this), -- if: () => !this.routeIsArchiveFolder() && !this.routeIsAlbums || false, -- }, -- { -- name: t('memories', 'Unarchive'), -- icon: UnarchiveIcon, -- callback: this.archiveSelection.bind(this), -- if: () => this.routeIsArchiveFolder() || false, - }, - { - name: t('memories', 'Edit metadata'), -- GitLab From 1538675dde0225ab701530e8862a0767e07cf44a Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 13 Jun 2023 08:24:02 +0000 Subject: [PATCH 05/10] Update Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 4c7674a2..66f5d9b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -211,6 +211,8 @@ RUN sed -i 's/$context->registerAlternativeLogin(OIDCLoginOption::class);/\/\/$c RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==e.notifications.length,/' ${BASE_DIR}/apps/notifications/js/notifications-main.js # Add data-object-type to notification RUN sed -i 's/"data-id":e.notificationId,/"data-id":e.notificationId,"data-object-type":e.objectType,/' ${BASE_DIR}/apps/notifications/js/notifications-main.js +#Hide Archive/Unarchive feature in memories app +RUN sed -i 's/{ name: (0, z.Iu)("memories", "Archive"), icon: Oa, callback: this.archiveSelection.bind(this), if: () => !this.routeIsArchiveFolder() && !this.routeIsAlbums }, { name: (0, z.Iu)("memories", "Unarchive"), icon: za, callback: this.archiveSelection.bind(this), if: () => this.routeIsArchiveFolder() },/' ${BASE_DIR}/custom_apps/memories/js/memories-main.js # autocomplete leak tweak apps frontend with sed, disable group suggestion -- GitLab From 770c9a689ef9b6c638fbec9e13afcd4fbd2300a1 Mon Sep 17 00:00:00 2001 From: Ronak Date: Tue, 13 Jun 2023 14:13:29 -0700 Subject: [PATCH 06/10] docker file changes --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 66f5d9b5..a5d71ec6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -212,7 +212,7 @@ RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-not # Add data-object-type to notification RUN sed -i 's/"data-id":e.notificationId,/"data-id":e.notificationId,"data-object-type":e.objectType,/' ${BASE_DIR}/apps/notifications/js/notifications-main.js #Hide Archive/Unarchive feature in memories app -RUN sed -i 's/{ name: (0, z.Iu)("memories", "Archive"), icon: Oa, callback: this.archiveSelection.bind(this), if: () => !this.routeIsArchiveFolder() && !this.routeIsAlbums }, { name: (0, z.Iu)("memories", "Unarchive"), icon: za, callback: this.archiveSelection.bind(this), if: () => this.routeIsArchiveFolder() },/' ${BASE_DIR}/custom_apps/memories/js/memories-main.js +RUN sed -i 's/{name:(0,z.Iu)("memories","Archive"),icon:ja,callback:this.archiveSelection.bind(this),if:()=>!this.routeIsArchiveFolder()&&!this.routeIsAlbums},{name:(0,z.Iu)("memories","Unarchive"),icon:Oa,callback:this.archiveSelection.bind(this),if:()=>this.routeIsArchiveFolder()},/' ${BASE_DIR}/custom_apps/memories/js/memories-main.js # autocomplete leak tweak apps frontend with sed, disable group suggestion -- GitLab From 30ddf5105959cdfad893f3273fcc102414ecb731 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 13 Jun 2023 10:28:27 +0000 Subject: [PATCH 07/10] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a5d71ec6..a67d641b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -212,7 +212,7 @@ RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-not # Add data-object-type to notification RUN sed -i 's/"data-id":e.notificationId,/"data-id":e.notificationId,"data-object-type":e.objectType,/' ${BASE_DIR}/apps/notifications/js/notifications-main.js #Hide Archive/Unarchive feature in memories app -RUN sed -i 's/{name:(0,z.Iu)("memories","Archive"),icon:ja,callback:this.archiveSelection.bind(this),if:()=>!this.routeIsArchiveFolder()&&!this.routeIsAlbums},{name:(0,z.Iu)("memories","Unarchive"),icon:Oa,callback:this.archiveSelection.bind(this),if:()=>this.routeIsArchiveFolder()},/' ${BASE_DIR}/custom_apps/memories/js/memories-main.js +RUN sed -i 's/{name:(0,z.Iu)("memories","Archive"),icon:ja,callback:this.archiveSelection.bind(this),if:()=>!this.routeIsArchiveFolder()&&!this.routeIsAlbums},{name:(0,z.Iu)("memories","Unarchive"),icon:Oa,callback:this.archiveSelection.bind(this),if:()=>this.routeIsArchiveFolder()},//g' ${BASE_DIR}/custom_apps/memories/js/memories-main.js # autocomplete leak tweak apps frontend with sed, disable group suggestion -- GitLab From 6313f77a85f3fc21fd3e844d147f77132d636cc1 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 13 Jun 2023 11:44:54 +0000 Subject: [PATCH 08/10] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a67d641b..29b97a7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -212,7 +212,7 @@ RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-not # Add data-object-type to notification RUN sed -i 's/"data-id":e.notificationId,/"data-id":e.notificationId,"data-object-type":e.objectType,/' ${BASE_DIR}/apps/notifications/js/notifications-main.js #Hide Archive/Unarchive feature in memories app -RUN sed -i 's/{name:(0,z.Iu)("memories","Archive"),icon:ja,callback:this.archiveSelection.bind(this),if:()=>!this.routeIsArchiveFolder()&&!this.routeIsAlbums},{name:(0,z.Iu)("memories","Unarchive"),icon:Oa,callback:this.archiveSelection.bind(this),if:()=>this.routeIsArchiveFolder()},//g' ${BASE_DIR}/custom_apps/memories/js/memories-main.js +RUN sed -i 's/{name:(0,be.Iu)("memories","Archive"),icon:la,callback:this.archiveSelection.bind(this),if:()=>!this.routeIsArchive()&&!this.routeIsAlbum()},{name:(0,be.Iu)("memories","Unarchive"),icon:ua,callback:this.archiveSelection.bind(this),if:()=>this.routeIsArchive()},//g' ${BASE_DIR}/custom_apps/memories/js/memories-main.js # autocomplete leak tweak apps frontend with sed, disable group suggestion -- GitLab From 5f62133d757f2ce13bfaa86381c9599742c8bfe1 Mon Sep 17 00:00:00 2001 From: Ronak Date: Tue, 13 Jun 2023 17:38:10 -0700 Subject: [PATCH 09/10] added sed to hide for sidebar --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 29b97a7a..4ef42cfd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -213,7 +213,7 @@ RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-not RUN sed -i 's/"data-id":e.notificationId,/"data-id":e.notificationId,"data-object-type":e.objectType,/' ${BASE_DIR}/apps/notifications/js/notifications-main.js #Hide Archive/Unarchive feature in memories app RUN sed -i 's/{name:(0,be.Iu)("memories","Archive"),icon:la,callback:this.archiveSelection.bind(this),if:()=>!this.routeIsArchive()&&!this.routeIsAlbum()},{name:(0,be.Iu)("memories","Unarchive"),icon:ua,callback:this.archiveSelection.bind(this),if:()=>this.routeIsArchive()},//g' ${BASE_DIR}/custom_apps/memories/js/memories-main.js - +RUN sed -i 's/{name:"archive",icon:la,title:(0,be.Iu)("memories","Archive")},//g' ${BASE_DIR}/custom_apps/memories/js/memories-main.js # autocomplete leak tweak apps frontend with sed, disable group suggestion RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js -- GitLab From 81c8ae8ff50dd033c0dd2d90d772c8a1e7da92e8 Mon Sep 17 00:00:00 2001 From: Ronak Date: Mon, 19 Jun 2023 22:43:54 -0700 Subject: [PATCH 10/10] change in custom entrypoint --- custom_entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index c4dbbcc2..7c7d3f46 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -33,6 +33,7 @@ if version_greater "$image_version" "$installed_version"; then rsync $rsync_options --include "/snappymail/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ rsync $rsync_options --include "/Murena/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ + rsync $rsync_options --include "/memories/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ else echo "Skipping rsync step as version not updated!" fi -- GitLab