From 979b5a367992d192ab706e3bb74e6761371cdcd3 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 18 Jan 2024 10:35:10 +0530 Subject: [PATCH 1/2] Update memories to 6.1.5; remove archive and share seds --- Dockerfile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index d987bde8..a1625b43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG DASHBOARD_JOB_ID="748055" ARG SNAPPY_VERSION="2.29.1" ARG SNAPPY_THEME_VERSION="3.0.0" ARG USER_MIGRATION_JOB_ID="608716" -ARG MEMORIES_VERSION="5.4.1" +ARG MEMORIES_VERSION="6.1.5" ARG DROP_ACCOUNT_VERSION="2.3.2" RUN sed -i 's/26,0,8,2/26,0,8,16/' ${BASE_DIR}/version.php @@ -128,7 +128,7 @@ CMD ["php-fpm"] From nextcloud as selfhost ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="26.0.0" +ARG THEME_VERSION="26.0.2" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG SELFHOST_THEME_VERSION="1.0.0" ARG IS_SELFHOST=true @@ -201,7 +201,7 @@ RUN sed -i "s/ajax\/getstoragestats/api\/v1\/stats/g" ${BASE_DIR}/apps/files/js/ From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="26.0.0" +ARG THEME_VERSION="26.0.2" ARG LDAP_WRITE_SUPPORT_VERSION="1.8.0" ARG OIDC_LOGIN_VERSION="2.6.0" ARG IS_SELFHOST=false @@ -247,9 +247,7 @@ RUN sed -i 's/$context->registerAlternativeLogin(OIDCLoginOption::class);/\/\/$c RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==t.notifications.length,/' ${BASE_DIR}/apps/notifications/js/notifications-node_modules_moment_locale_sync_recursive_-src_NotificationsApp_vue.js # Add data-object-type to notification RUN sed -i 's/"data-id":t.notificationId,/"data-id":t.notificationId,"data-object-type":t.objectType,/' ${BASE_DIR}/apps/notifications/js/notifications-node_modules_moment_locale_sync_recursive_-src_NotificationsApp_vue.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:"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 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 @@ -263,12 +261,6 @@ RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[a,"displayname"\]}, RUN cd ${BASE_DIR}/custom_apps/notes && sed -i 's/OCA\\Notes\\Migration\\EditorHint<\/step>//g' appinfo/info.xml RUN cd ${BASE_DIR}/apps/theming && sed -i 's/OCA\\Theming\\Migration\\MigrateUserConfig<\/step>//g' appinfo/info.xml -#enable email search in memories app - -RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/shareTypes:\[bc\.D\.SHARE_TYPE_USER,bc\.D\.SHARE_TYPE_GROUP\]}});/shareTypes:[bc.D.SHARE_TYPE_USER,bc.D.SHARE_TYPE_EMAIL]}}),n=e.data.ocs.data.filter((e=>"emails"!==e.source)),r={data:{ocs:{meta:e.data.ocs.meta,data:n}}};/g' js/memories-main.js -RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/this\.currentSearchResults=e\.data\./this\.currentSearchResults=r\.data\./g' js/memories-main.js - - # Remove colored background from email template logo RUN sed -i 's/$this->header, \[$this->themingDefaults->getDefaultColorPrimary()/$this->header, \["none"/' ${BASE_DIR}/lib/private/Mail/EMailTemplate.php -- GitLab From dd1f2309587996d42c3596025a8042ba1a10d1ab Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 18 Jan 2024 16:51:33 +0530 Subject: [PATCH 2/2] Remove email search sed again --- Dockerfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index cbe941d6..629651cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -264,12 +264,6 @@ RUN cd ${BASE_DIR}/apps/theming && sed -i 's/OCA\\Theming\\Migration\\Migr # sharing search by email RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/$S.principalPropertySearchByDisplayname(t);/$S.principalPropertySearch(\[{name:\["http:\/\/sabredav.org\/ns","email-address"\]\}],t,"anyof");/g' js/contacts-main.js -#enable email search in memories app - -RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/shareTypes:\[bc\.D\.SHARE_TYPE_USER,bc\.D\.SHARE_TYPE_GROUP\]}});/shareTypes:[bc.D.SHARE_TYPE_USER,bc.D.SHARE_TYPE_EMAIL]}}),n=e.data.ocs.data.filter((e=>"emails"!==e.source)),r={data:{ocs:{meta:e.data.ocs.meta,data:n}}};/g' js/memories-main.js -RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/this\.currentSearchResults=e\.data\./this\.currentSearchResults=r\.data\./g' js/memories-main.js - - # Remove colored background from email template logo RUN sed -i 's/$this->header, \[$this->themingDefaults->getDefaultColorPrimary()/$this->header, \["none"/' ${BASE_DIR}/lib/private/Mail/EMailTemplate.php -- GitLab