From 00e301b4dbac801d1a378a5d2bc30e58d6220ee0 Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Mon, 9 Jun 2025 17:51:33 +0600 Subject: [PATCH 1/3] feat: hide files_external apps personal settings section related to: https://gitlab.e.foundation/e/infra/backlog/-/work_items/4290#note_690205 --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8a5ab1c7..5df98e89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -309,4 +309,8 @@ RUN sed -i ':a;N;$!ba;s/t("NcActionButton",{on:{click:e.onToggleSharing},scopedS RUN sed -i 's/"NcSettingsSection",{attrs:{/"NcSettingsSection",{attrs:{id:"delete-account-settings-section",style:"visibility:hidden;",/' ${BASE_DIR}/custom_apps/drop_account/js/drop_account-personal-settings.mjs # Fix of https://github.com/nextcloud/server/commit/e727a3b00bd9b574279d25c006a0bc6b8fa4eec3 for availability setting -RUN sed -i 's/n.data/await n.text()/' ${BASE_DIR}/dist/dav-settings-personal-availability.js \ No newline at end of file +RUN sed -i 's/n.data/await n.text()/' ${BASE_DIR}/dist/dav-settings-personal-availability.js + +# Hide personal settings of files_external +RUN sed -i "s/'externalstorages'/null/" ${BASE_DIR}/apps/files_external/lib/Settings/Personal.php + -- GitLab From 778c981728d9191d309cd3d183784ffdc3e6da08 Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Mon, 9 Jun 2025 17:54:43 +0600 Subject: [PATCH 2/3] chore: bump version to 29.0.16.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5df98e89..96ca055e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="1168093" ARG MEMORIES_VERSION="7.5.2" ARG DROP_ACCOUNT_VERSION="2.7.1" -RUN sed -i 's/29,0,16,1/29,0,16,1/' ${BASE_DIR}/version.php +RUN sed -i 's/29,0,16,1/29,0,16,2/' ${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 From ac4d0b98c8b2cfd2549297c6ee66b5c0715b6333 Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Wed, 11 Jun 2025 14:25:12 +0600 Subject: [PATCH 3/3] fix: viewer cannot edit patch We have a patch which is blocking editing of the file. But the patch was not escaping especial char `&`, which was causing issue on the mjs file. related: https://gitlab.e.foundation/e/infra/backlog/-/work_items/4290#note_689729 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 96ca055e..ced422cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -123,7 +123,7 @@ RUN apt-get -y remove unzip RUN sed -i "s/\$systemConfig->setValue('theme', '');/\$systemConfig->setValue('theme', 'eCloud');/g" ${BASE_DIR}/lib/base.php # Disable editor feature of media viewer -RUN sed -i 's/canEdit(){return!this.isMobile&&L()/canEdit(){return!this.isMobile&&false&&L()/' ${BASE_DIR}/apps/viewer/js/viewer-main.mjs +RUN sed -i 's/canEdit(){return!this.isMobile\&\&L()/canEdit(){return!this.isMobile\&\&false\&\&L()/' ${BASE_DIR}/apps/viewer/js/viewer-main.mjs ENTRYPOINT ["/custom_entrypoint.sh"] -- GitLab