From 80e73b2211465b0ca31f9e9b370f7df8b0207f8a Mon Sep 17 00:00:00 2001 From: Tom Elliott Date: Mon, 5 Aug 2024 16:08:45 -0500 Subject: [PATCH 1/2] Should ensure we check stable --- .githooks/pre-commit | 2 +- packages/web/lib/fog/system.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.githooks/pre-commit b/.githooks/pre-commit index 4a4f6d1f82..20c45b4dff 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -26,7 +26,7 @@ verbegin="" channel="" case $branchon in - dev) + dev|stable) # Describe the tag and append the commit count correctly tagversion=$(git describe --tags ${gitcom}) baseversion=${tagversion%.*} # Retain everything before the last segment diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php index 155b13d787..d7faf31954 100644 --- a/packages/web/lib/fog/system.class.php +++ b/packages/web/lib/fog/system.class.php @@ -53,7 +53,7 @@ private static function _versionCompare() public function __construct() { self::_versionCompare(); - define('FOG_VERSION', '1.5.10.67'); + define('FOG_VERSION', '1.5.10.68'); define('FOG_SCHEMA', 271); define('FOG_BCACHE_VER', 141); define('FOG_CLIENT_VERSION', '0.13.0'); From 249da8d4f1ef04f9d99733b1946ffe90efc7564f Mon Sep 17 00:00:00 2001 From: JJ Fullmer Date: Mon, 5 Aug 2024 15:13:18 -0600 Subject: [PATCH 2/2] add docs to readme --- README.md | 3 ++- packages/web/lib/fog/system.class.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index abf4266af4..63ed74bcc6 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,8 @@ cd /path/to/fogproject-dev-branch/bin All should now be installed and you can start configuring and registering systems. Please see: http://fogproject.org/wiki/index.php/Managing_FOG to assist you in setting up further. There are many resources for assistance. - - **Wiki:** http://fogproject.org/wiki for any information. + - **docs:** https://docs.fogproject.org for documentation. (New docs, under construction) + - **Wiki:** http://fogproject.org/wiki for any information. (Legacy docs) - **Forum:** http://fogproject.org/forum. - **Email:** A Developer directly. If a dev permits a change, they can have themselves added on the wiki/Credits page. diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php index d7faf31954..c419e00a42 100644 --- a/packages/web/lib/fog/system.class.php +++ b/packages/web/lib/fog/system.class.php @@ -53,7 +53,7 @@ private static function _versionCompare() public function __construct() { self::_versionCompare(); - define('FOG_VERSION', '1.5.10.68'); + define('FOG_VERSION', '1.5.10.69'); define('FOG_SCHEMA', 271); define('FOG_BCACHE_VER', 141); define('FOG_CLIENT_VERSION', '0.13.0');