From a6abeecc404fbb5c9f459ead6def2bead6e30373 Mon Sep 17 00:00:00 2001 From: Akhil Date: Fri, 1 Sep 2023 15:31:16 +0530 Subject: [PATCH 1/6] add sed to rename --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 13d238e6..84d93b4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -238,6 +238,9 @@ RUN sed -i 's/"data-id":e.notificationId,/"data-id":e.notificationId,"data-objec #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 +# Rename Memories to Gallery +RUN sed -i 's/Memories<\/name>/Gallery<\/name>/g' ${BASE_DIR}/custom_apps/memories/appinfo/info.xml + # 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 e9776bc4e391a1aa05a3c2682f992e2c1cc1ca71 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 14 Sep 2023 01:08:03 +0530 Subject: [PATCH 2/6] Memories 5.4.1 --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 84d93b4b..fe2f63bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG DASHBOARD_JOB_ID="651040" ARG SNAPPY_VERSION="2.28.1" ARG SNAPPY_THEME_VERSION="2.0.8" ARG USER_MIGRATION_JOB_ID="608716" -ARG MEMORIES_VERSION="5.1.0" +ARG MEMORIES_VERSION="5.4.1" RUN sed -i 's/25,0,8,2/25,0,8,22/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / @@ -238,8 +238,11 @@ RUN sed -i 's/"data-id":e.notificationId,/"data-id":e.notificationId,"data-objec #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 + # Rename Memories to Gallery RUN sed -i 's/Memories<\/name>/Gallery<\/name>/g' ${BASE_DIR}/custom_apps/memories/appinfo/info.xml +RUN cd ${BASE_DIR}/custom_apps/memories/js && sed -i 's/Memories has been/Gallery has been/g' memories-main.js && sed -i 's/Memories has been/Gallery has been/g' memories-main-bk.js && sed -i 's/Memories has been/Gallery has been/g' memories-admin.js +RUN cd ${BASE_DIR}/custom_apps/memories/js && sed -i 's/Memories Settings/Gallery Settings/g' memories-main.js && sed -i 's/Memories Settings/Gallery Settings/g' memories-main-bk.js # autocomplete leak tweak apps frontend with sed, disable group suggestion -- GitLab From 55fb34f2bfe5a1083dee8738979f10e43b7be54c Mon Sep 17 00:00:00 2001 From: Akhil Date: Fri, 15 Sep 2023 17:02:59 +0530 Subject: [PATCH 3/6] Remove memories-main-bk --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fe2f63bd..2ee4e8a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -241,8 +241,8 @@ RUN sed -i 's/{name:"archive",icon:la,title:(0,be.Iu)("memories","Archive")},//g # Rename Memories to Gallery RUN sed -i 's/Memories<\/name>/Gallery<\/name>/g' ${BASE_DIR}/custom_apps/memories/appinfo/info.xml -RUN cd ${BASE_DIR}/custom_apps/memories/js && sed -i 's/Memories has been/Gallery has been/g' memories-main.js && sed -i 's/Memories has been/Gallery has been/g' memories-main-bk.js && sed -i 's/Memories has been/Gallery has been/g' memories-admin.js -RUN cd ${BASE_DIR}/custom_apps/memories/js && sed -i 's/Memories Settings/Gallery Settings/g' memories-main.js && sed -i 's/Memories Settings/Gallery Settings/g' memories-main-bk.js +RUN cd ${BASE_DIR}/custom_apps/memories/js && sed -i 's/Memories has been/Gallery has been/g' memories-main.js && sed -i 's/Memories has been/Gallery has been/g' memories-admin.js +RUN cd ${BASE_DIR}/custom_apps/memories/js && sed -i 's/Memories Settings/Gallery Settings/g' memories-main.js # autocomplete leak tweak apps frontend with sed, disable group suggestion -- GitLab From cf1c25caeeb3a79af4f98ba9c75cd020720d0bf7 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 19 Sep 2023 10:35:47 -0700 Subject: [PATCH 4/6] change in sed --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ee4e8a4..cbe7d878 100644 --- a/Dockerfile +++ b/Dockerfile @@ -236,8 +236,8 @@ 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,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 +RUN sed -i 's/{name:(0,O.Iu)("memories","Archive"),icon:Yo,callback:this.archiveSelection.bind(this),if:()=>!this.routeIsArchiveFolder()&&!this.routeIsAlbums},{name:(0,O.Iu)("memories","Unarchive"),icon:Ko,callback:this.archiveSelection.bind(this),if:()=>this.routeIsArchiveFolder(),//g' ${BASE_DIR}/custom_apps/memories/js/memories-main.js +RUN sed -i 's/{name:"archive",icon:Yo,title:(0,O.Iu)("memories","Archive")},//g' ${BASE_DIR}/custom_apps/memories/js/memories-main.js # Rename Memories to Gallery RUN sed -i 's/Memories<\/name>/Gallery<\/name>/g' ${BASE_DIR}/custom_apps/memories/appinfo/info.xml -- GitLab From 06eb913a62a42d2c1f06576f578521a995d45b94 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 19 Sep 2023 10:36:55 -0700 Subject: [PATCH 5/6] change in sed #2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cbe7d878..04987977 100644 --- a/Dockerfile +++ b/Dockerfile @@ -236,7 +236,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,O.Iu)("memories","Archive"),icon:Yo,callback:this.archiveSelection.bind(this),if:()=>!this.routeIsArchiveFolder()&&!this.routeIsAlbums},{name:(0,O.Iu)("memories","Unarchive"),icon:Ko,callback:this.archiveSelection.bind(this),if:()=>this.routeIsArchiveFolder(),//g' ${BASE_DIR}/custom_apps/memories/js/memories-main.js +RUN sed -i 's/{name:(0,O.Iu)("memories","Archive"),icon:Yo,callback:this.archiveSelection.bind(this),if:()=>!this.routeIsArchiveFolder()&&!this.routeIsAlbums},{name:(0,O.Iu)("memories","Unarchive"),icon:Ko,callback:this.archiveSelection.bind(this),if:()=>this.routeIsArchiveFolder()},//g' ${BASE_DIR}/custom_apps/memories/js/memories-main.js RUN sed -i 's/{name:"archive",icon:Yo,title:(0,O.Iu)("memories","Archive")},//g' ${BASE_DIR}/custom_apps/memories/js/memories-main.js # Rename Memories to Gallery -- GitLab From fcd1cfd92fa332de386e2b4e99135f6f757ea106 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 21 Sep 2023 15:34:32 +0530 Subject: [PATCH 6/6] Bump version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 04987977..d6ad3bc2 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,22/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,2/25,0,8,23/' ${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 -- GitLab