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

Commit e9c7ce41 authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'dev/patch-remove-groupware' into 'main' 

removed groupware patch

See merge request !173
parents 9874e0a1 13904d86

Dockerfile

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider 
RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/014-add-mail-usage.patch

RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php -i ${TMP_PATCH_DIR}/015-email-mail-template.patch

RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch

RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.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 -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

patches/019-groupware.patch

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
--- ./apps/settings/lib/Sections/Personal/Groupware.php	2022-09-08 11:20:19.355809900 +0530

+++ ./apps/settings/lib/Sections/Personal/Groupware-new.php	2022-09-08 11:18:46.905809900 +0530

@@ -45,7 +45,7 @@

 	}

 

 	public function getID(): string {

-		return 'groupware';

+		return '';

 	}

 

 	public function getName(): string {