Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ad4f8ff authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

fix patch

parent 77801289

Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" 
ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0"

ARG OIDC_LOGIN_VERSION="2.3.3"



RUN sed -i 's/23,0,9,1/23,0,9,25/' ${BASE_DIR}/version.php

RUN sed -i 's/23,0,9,1/23,0,9,26/' ${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
@@ -136,7 +136,7 @@ RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-o 
RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch

RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch

RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch

#RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/022-multiplenotification.patch

RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/022-multiplenotification.patch

RUN rm -rf ${TMP_PATCH_DIR}



# show reset pwd page with a query param

patches/022-multiplenotification.patch

+51 −712

File changed.

Preview size limit exceeded, changes collapsed.