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

Commit 90d0d80f authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

fix(offset): applied offset corrections to more additional patches

parent 47a299a9
Loading
Loading
Loading
Loading
Loading
+21 −20
Original line number Diff line number Diff line
--- apps/files/js/files.js	2022-11-28 19:10:48.625188000 +0530
+++ apps/files/js/files-new.js	2022-11-28 19:12:41.425188000 +0530
@@ -181,6 +181,18 @@
@@ -177,6 +177,18 @@
 						{type : 'error'}
 					);
 				} else {
@@ -19,7 +19,7 @@
 					OC.Notification.show(t('files',
 						'Your storage is full, files cannot be updated or synced anymore!'),
 						{type: 'error'}
@@ -210,6 +222,19 @@
@@ -206,6 +218,20 @@
 						{type : 'error'}
 					);
 				} else {
@@ -27,8 +27,9 @@
+					$('body').find('.toastify').each(function(i, obj) {
+						var toastmsg = $(obj).text();
+						toastmsg = toastmsg.replace('✖', '').trim();
+						actualmsg=t('files', 'Your storage is almost full ({usedSpacePercent}%).',
+						{usedSpacePercent: usedSpacePercent});
+						actualmsg = t('files', 'Your storage is almost full ({usedSpacePercent}%).', {
+							usedSpacePercent: usedSpacePercent
+						});
+						if (toastmsg === actualmsg) {
+							exist = 1;
+						}
+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Subject: [PATCH] To fix the primary color in nextcloud 25 onwards

--- apps/theming/lib/Themes/CommonThemeTrait.php	2023-04-12 17:16:23.456078658 +0530
+++ apps/theming/lib/Themes/CommonThemeTrait-new.php	2023-04-12 17:17:30.456079957 +0530
@@ -40,6 +40,9 @@
@@ -26,6 +26,9 @@
 	 */
 	protected function generatePrimaryVariables(string $colorMainBackground, string $colorMainText, bool $highContrast = false): array {
 		$isBrightColor = $this->util->isBrightColor($colorMainBackground);
@@ -17,7 +17,7 @@ Subject: [PATCH] To fix the primary color in nextcloud 25 onwards

--- apps/theming/lib/Util.php	2023-04-12 17:16:23.456078658 +0530
+++ apps/theming/lib/Util-new.php	2023-04-12 17:17:30.456079957 +0530
@@ -57,7 +57,7 @@
@@ -35,7 +35,7 @@
 	 * @return bool
 	 */
 	public function invertTextColor(string $color): bool {
+3 −2
Original line number Diff line number Diff line
--- ./lib/private/Template/JSResourceLocator.php	2024-08-29 22:10:30.588659044 +0530
+++ ./lib/private/Template/JSResourceLocator-new.php	2024-08-29 23:55:00.239753244 +0530
@@ -67,6 +67,7 @@
@@ -47,6 +47,7 @@
 		} catch (AppPathNotFoundException $e) {
 			// ignore
 		}
@@ -8,7 +8,7 @@
 
 		if (str_contains($script, '/l10n/')) {
 			// For language files we try to load them all, so themes can overwrite
@@ -77,7 +78,7 @@
@@ -57,7 +58,7 @@
 			$found += $this->appendScriptIfExist($this->serverroot, $script);
 			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$script);
 			$found += $this->appendScriptIfExist($appRoot, $script, $appWebRoot);
@@ -17,3 +17,4 @@
 
 			if ($found) {
 				return;