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

Commit 4561de5d authored by Ronak Patel's avatar Ronak Patel
Browse files

change in dockerfile

parent 2576ce16

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable 
RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch

RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch

RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/014-add-mail-usage.patch

RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.patch

# RUN cd ${BASE_DIR} && patch -p0 < ${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/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

patches/015-email-mail-template.patch

+4 −4
Original line number Diff line number Diff line 
--- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php	2024-03-15 18:56:05

+++ ./apps/dav/lib/CalDAV/Schedule/IMipPlugin-new.php	2024-03-15 19:03:58

--- /Users/ronak/Desktop/murena/git-nextcloud/ecloud_dev_example/volumes/nextcloud/html/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php	2024-03-15 18:56:05

+++ /Users/ronak/Desktop/murena/git-nextcloud/ecloud_dev_example/volumes/nextcloud/html/apps/dav/lib/CalDAV/Schedule/IMipPlugin-new.php	2024-03-15 19:03:58

@@ -242,6 +242,13 @@

 		$data['invitee_name'] = ($senderName ?: $sender);
@@ -42,8 +42,8 @@ 
\ No newline at end of file





--- ./apps/dav/lib/CalDAV/Schedule/IMipService.php	2024-03-15 18:58:59

+++ ./apps/dav/lib/CalDAV/Schedule/IMipService-new.php	2024-03-15 19:02:34

--- /Users/ronak/Desktop/murena/git-nextcloud/ecloud_dev_example/volumes/nextcloud/html/apps/dav/lib/CalDAV/Schedule/IMipService.php	2024-03-15 18:58:59

+++ /Users/ronak/Desktop/murena/git-nextcloud/ecloud_dev_example/volumes/nextcloud/html/apps/dav/lib/CalDAV/Schedule/IMipService-new.php	2024-03-15 19:02:34

@@ -541,8 +541,13 @@

 				$this->getAbsoluteImagePath('caldav/time.png'), $data['meeting_when'], '', IMipPlugin::IMIP_INDENT);

 		}

patches/031-theme-custom-app-translations.patch

+9 −9
Original line number Diff line number Diff line 
--- ./lib/private/Template/JSResourceLocator.php	2024-03-15 16:35:05

+++ ./lib/private/Template/JSResourceLocator-new.php	2024-03-15 18:04:54

@@ -57,8 +57,13 @@

 			$found += $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.'.js');

 			$found += $this->appendIfExist($this->serverroot, $script.'.js');

 			$found += $this->appendIfExist($this->serverroot, $theme_dir.$script.'.js');

-			$found += $this->appendIfExist($this->serverroot, 'apps/'.$script.'.js');

-			$found += $this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.'.js');

+			

--- ./lib/private/Template/JSResourceLocator.php	2024-03-15 19:15:38

+++ ./lib/private/Template/JSResourceLocator-new.php	2024-03-15 19:16:54

@@ -60,8 +60,12 @@

 			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'core/'.$script);

 			$found += $this->appendScriptIfExist($this->serverroot, $script);

 			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$script);

-			$found += $this->appendScriptIfExist($this->serverroot, 'apps/'.$script);

-			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script);

+			foreach (\OC::$APPSROOTS as $appRoot) {

+				$dirName = basename($appRoot['path']);

+				$rootPath = dirname($appRoot['path']);
@@ -16,3 +15,4 @@ 
 

 			if ($found) {

 				return;

\ No newline at end of file