aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuchen Pei <hi@ypei.me>2021-10-12 08:59:23 +1100
committerYuchen Pei <hi@ypei.me>2021-10-12 09:12:29 +1100
commit9811e14665879801028e5ef088aa538cbb8b5f94 (patch)
tree2ef738448782aedc34bf1d26507273d3feda1758
parenta433241c0aff14110d1355f904d3dace8b6bae6b (diff)
Adding newline to param.php to fix the patching error.
-rw-r--r--h-source/Application/Include/params.php2
-rw-r--r--h-source/mark-staging.patch17
2 files changed, 6 insertions, 13 deletions
diff --git a/h-source/Application/Include/params.php b/h-source/Application/Include/params.php
index 19f1ed7..5ab28df 100644
--- a/h-source/Application/Include/params.php
+++ b/h-source/Application/Include/params.php
@@ -225,4 +225,4 @@ class Account
$result = $mailer->batchSend($message);
}
-} \ No newline at end of file
+}
diff --git a/h-source/mark-staging.patch b/h-source/mark-staging.patch
index d55e607..37b6af0 100644
--- a/h-source/mark-staging.patch
+++ b/h-source/mark-staging.patch
@@ -1,18 +1,18 @@
-From 4eccedeb80e83cf6e6b276a4ee91ee1efd603d5d Mon Sep 17 00:00:00 2001
+From d00ede2e9a33cf88b6a5d20358f127b1cf1d5863 Mon Sep 17 00:00:00 2001
From: Yuchen Pei <hi@ypei.me>
-Date: Wed, 22 Sep 2021 12:23:40 +1000
+Date: Tue, 12 Oct 2021 09:08:38 +1100
Subject: [PATCH] Adding prominant notice that the site is staging.
And directing visitors to the official site.
---
- h-source/Application/Include/params.php | 4 ++--
+ h-source/Application/Include/params.php | 2 +-
h-source/Application/Views/Desktop/header.php | 1 +
h-source/Application/Views/Mobile/header.php | 4 +++-
h-source/config.xml | 9 +++++++++
- 4 files changed, 15 insertions(+), 3 deletions(-)
+ 4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/h-source/Application/Include/params.php b/h-source/Application/Include/params.php
-index 19f1ed7..29cdc6c 100644
+index 5ab28df..29cdc6c 100644
--- a/h-source/Application/Include/params.php
+++ b/h-source/Application/Include/params.php
@@ -26,7 +26,7 @@ class Website
@@ -24,13 +24,6 @@ index 19f1ed7..29cdc6c 100644
static public $projectName = "h-node";
-@@ -225,4 +225,4 @@ class Account
- $result = $mailer->batchSend($message);
-
- }
--}
-\ No newline at end of file
-+}
diff --git a/h-source/Application/Views/Desktop/header.php b/h-source/Application/Views/Desktop/header.php
index d153840..2a20ef6 100644
--- a/h-source/Application/Views/Desktop/header.php