From 2764566bcb37ebde9e87f9106e9defed3d7d7c0c Mon Sep 17 00:00:00 2001 From: RussH Date: Thu, 18 Mar 2021 10:08:40 +0000 Subject: [PATCH] Merging develop back to master. Develop has been installed locally for UAT (passed) (#527) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @RussH updated version to 0.9.6 @pribeiro42 Update index.php (#498) … a0b3324 @KPull Fix a syntax error in the Mailer.php file (#511) … fb73517 @RussH Update composer.json (#525) … --- ajax.php | 2 +- careers/index.php | 3 ++- composer.json | 2 +- constants.php | 4 +++- index.php | 2 +- modules/activity/dataGrids.php | 2 +- modules/companies/dataGrids.php | 2 +- modules/contacts/dataGrids.php | 2 +- modules/home/dataGrids.php | 2 +- modules/joborders/dataGrids.php | 2 +- modules/lists/dataGrids.php | 2 +- rss/index.php | 2 +- xml/index.php | 2 +- 13 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ajax.php b/ajax.php index 2e4dd4d6d..fd2333daf 100644 --- a/ajax.php +++ b/ajax.php @@ -3,7 +3,7 @@ * CATS * AJAX Delegation Module * - * CATS Version: 0.9.4 Countach + * CATS Version: 0.9.6 * * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc. * diff --git a/careers/index.php b/careers/index.php index fd0a69ff6..cd059de7e 100644 --- a/careers/index.php +++ b/careers/index.php @@ -3,7 +3,7 @@ * CATS * Careers Page Display Module * - * CATS Version: 0.9.4 Countach + * CATS Version: 0.9.6 * * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc. * @@ -34,6 +34,7 @@ $careerPage = true; chdir('..'); +include_once('config.php') ; include_once(LEGACY_ROOT . '/lib/CATSUtility.php'); include_once(CATSUtility::getIndexName()); diff --git a/composer.json b/composer.json index 459f688f6..a9dc10205 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "OpenCATS/OpenCATS", + "name": "opencats/opencats", "require-dev": { "behat/behat": "~3.0.4", "phpunit/phpunit": "^7", diff --git a/constants.php b/constants.php index 9a062a8f1..11c7fd2ad 100644 --- a/constants.php +++ b/constants.php @@ -41,7 +41,9 @@ ); /* CATS Version */ -define('CATS_VERSION', '0.9.5.2'); + +define('CATS_VERSION', '0.9.6'); + /* Copyright information at bottom of pages. */ define('COPYRIGHT_HTML', '© 2007-2020 OpenCATS.'); diff --git a/index.php b/index.php index fe88c3169..cf3d71d79 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ * CATS * Index (Delegation Module) * - * CATS Version: 0.9.4 Countach + * CATS Version: 0.9.6 * * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc. * diff --git a/modules/activity/dataGrids.php b/modules/activity/dataGrids.php index 5f9923659..264501e1b 100644 --- a/modules/activity/dataGrids.php +++ b/modules/activity/dataGrids.php @@ -3,7 +3,7 @@ * CATS * Contacts Datagrid * - * CATS Version: 0.9.4 Countach + * CATS Version: 0.9.6 * * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc. * diff --git a/modules/companies/dataGrids.php b/modules/companies/dataGrids.php index 7c47385c5..cf89e32ba 100644 --- a/modules/companies/dataGrids.php +++ b/modules/companies/dataGrids.php @@ -3,7 +3,7 @@ * CATS * Companies Datagrid * - * CATS Version: 0.9.4 Countach + * CATS Version: 0.9.6 * * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc. * diff --git a/modules/contacts/dataGrids.php b/modules/contacts/dataGrids.php index d423f4572..7eba3b20b 100644 --- a/modules/contacts/dataGrids.php +++ b/modules/contacts/dataGrids.php @@ -3,7 +3,7 @@ * CATS * Contacts Datagrid * - * CATS Version: 0.9.4 Countach + * CATS Version: 0.9.6 * * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc. * diff --git a/modules/home/dataGrids.php b/modules/home/dataGrids.php index 8a9e889af..a451b8d92 100644 --- a/modules/home/dataGrids.php +++ b/modules/home/dataGrids.php @@ -3,7 +3,7 @@ * CATS * Home Datagrid * - * CATS Version: 0.9.4 Countach + * CATS Version: 0.9.6 * * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc. * diff --git a/modules/joborders/dataGrids.php b/modules/joborders/dataGrids.php index ec15feb13..e2e6ef049 100644 --- a/modules/joborders/dataGrids.php +++ b/modules/joborders/dataGrids.php @@ -3,7 +3,7 @@ * CATS * Joborder Datagrid * - * CATS Version: 0.9.4 Countach + * CATS Version: 0.9.6 * * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc. * diff --git a/modules/lists/dataGrids.php b/modules/lists/dataGrids.php index 9ee91d589..a6d150b41 100644 --- a/modules/lists/dataGrids.php +++ b/modules/lists/dataGrids.php @@ -3,7 +3,7 @@ * CATS * Companies Datagrid * - * CATS Version: 0.9.4 Countach + * CATS Version: 0.9.6 * * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc. * diff --git a/rss/index.php b/rss/index.php index 8812b20e7..a699cd8e6 100644 --- a/rss/index.php +++ b/rss/index.php @@ -3,7 +3,7 @@ * CATS * RSS Display Module * - * CATS Version: 0.9.4 Countach + * CATS Version: 0.9.6 * * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc. * diff --git a/xml/index.php b/xml/index.php index 82ef28faf..f0a306b34 100644 --- a/xml/index.php +++ b/xml/index.php @@ -3,7 +3,7 @@ * CATS * RSS Display Module * - * CATS Version: 0.9.4 Countach + * CATS Version: 0.9.6 * * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc. *