From 9461de674d40f579ef4d3a00a6e2aa895c0f1334 Mon Sep 17 00:00:00 2001 From: David Janssens Date: Mon, 27 Nov 2023 15:00:38 +0100 Subject: [PATCH] update for release 1.4.6 (#1548) --- README.md | 12 ++++++------ docs/changelog.md | 8 ++++---- htdocs/include/version.php | 7 ++++--- htdocs/modules/system/icms_version.php | 8 ++++---- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 714324666b8f..101030929aad 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -[![license](https://img.shields.io/badge/license-GPLv2-brightgreen.svg)](https://raw.githubusercontent.com/ImpressCMS/impresscms/branches/impresscms_1.4/docs/license.txt) [![GitHub release](https://img.shields.io/github/release/ImpressCMS/impresscms.svg?maxAge=86400&logo=github&logoColor=white&label=latest%20release)](github.com/ImpressCMS/impresscms/releases/latest) [![GitHub tag (latest SemVer pre-release)](https://img.shields.io/packagist/vpre/impresscms/impresscms.svg?label=preview&logo=github)](https://github.com/ImpressCMS/impresscms/releases) [![GitHub issues](https://img.shields.io/github/issues-raw/ImpressCMS/impresscms.svg?maxAge=3600&logo=github&logoColor=white)](https://github.com/ImpressCMS/impresscms/issues) [![Build Status](https://img.shields.io/travis/ImpressCMS/impresscms.svg?branch=branches/impresscms_1.4&maxAge=3600&logo=travis)](https://travis-ci.org/ImpressCMS/impresscms) [![Test Coverage](https://api.codeclimate.com/v1/badges/b27536db6688e64deef8/test_coverage)](https://codeclimate.com/github/ImpressCMS/impresscms/test_coverage) [![Maintainability](https://api.codeclimate.com/v1/badges/b27536db6688e64deef8/maintainability)](https://codeclimate.com/github/ImpressCMS/impresscms/maintainability) [![Website](https://img.shields.io/website-up-down-green-red/https/naereen.github.io.svg?maxAge=3600)](https://impresscms.org/) [![Twitter Follow](https://img.shields.io/twitter/follow/ImpressCMS.svg?color=%2338A1F3&label=twitter&style=flat&logo=twitter)](https://twitter.com/ImpressCMS) [![FaceBook](https://img.shields.io/badge/facebook-%3F%3F%3F-%233C5A99.svg?logo=facebook)](https://www.facebook.com/ImpressCMS/) [![Slack](http://invite.impresscms.org/badge.svg)](http://invite.impresscms.org) +[![license](https://img.shields.io/badge/license-GPLv2-brightgreen.svg)](https://raw.githubusercontent.com/ImpressCMS/impresscms/branches/impresscms_1.4/docs/license.txt) [![GitHub release](https://img.shields.io/github/release/ImpressCMS/impresscms.svg?maxAge=86400&logo=github&logoColor=white&label=latest%20release)](github.com/ImpressCMS/impresscms/releases/latest) [![GitHub tag (latest SemVer pre-release)](https://img.shields.io/packagist/vpre/impresscms/impresscms.svg?label=preview&logo=github)](https://github.com/ImpressCMS/impresscms/releases) [![GitHub issues](https://img.shields.io/github/issues-raw/ImpressCMS/impresscms.svg?maxAge=3600&logo=github&logoColor=white)](https://github.com/ImpressCMS/impresscms/issues) [![Test Coverage](https://api.codeclimate.com/v1/badges/b27536db6688e64deef8/test_coverage)](https://codeclimate.com/github/ImpressCMS/impresscms/test_coverage) [![Maintainability](https://api.codeclimate.com/v1/badges/b27536db6688e64deef8/maintainability)](https://codeclimate.com/github/ImpressCMS/impresscms/maintainability) [![Website](https://img.shields.io/website-up-down-green-red/https/naereen.github.io.svg?maxAge=3600)](https://impresscms.org/) [![FaceBook](https://img.shields.io/badge/facebook-%3F%3F%3F-%233C5A99.svg?logo=facebook)](https://www.facebook.com/ImpressCMS/) -# ImpressCMS 1.4.5 +# ImpressCMS 1.4.6 ImpressCMS is a community developed Content Management System. With this tool maintaining the content of a website becomes as easy as writing a word document. ImpressCMS is the ideal tool for a wide range of users: from business to community users, from large enterprises to people who want a simple, easy to use blogging tool. ImpressCMS is a powerful system that gets outstanding results and it is free! @@ -8,7 +8,7 @@ Starting with the 1.4 branch of ImpressCMS, we only support PHP versions 7.3 and ### What can you do with it? -ImpressCMS can be used for many types of web sites. The system is highly scalable and it can be used for example as an intranet for a company with 20,000 employees as well as for building a simple 5-page website for the promotion of your company. +ImpressCMS can be used for many types of web sites. The system is highly scalable and it can be used for example as an intranet for a company with 20,000 employees as well as for building a simple 5-page website for the promotion of your company. The system is extremely useful for managing online communities because it has the ability to create user groups and assign permissions for managing content to each different group. For each type of website ImpressCMS offers different functionality with a collection of free modules that are available on [https://www.impresscms.org/modules/downloads/](https://www.impresscms.org/modules/downloads/). A few examples of what you can do with them: @@ -48,7 +48,7 @@ Fully supports multi-byte languages, including Japanese, Simplified and Traditio ### Do you need any help? -You can find our official documentation at [our wiki](https://www.impresscms.org/modules/simplywiki/). +You can find our official documentation at [our wiki](https://www.impresscms.org/modules/simplywiki/). Also, help could be found on [our official forums](https://www.impresscms.org/modules/iforum/). @@ -56,6 +56,6 @@ Also, help could be found on [our official forums](https://www.impresscms.org/mo Open an [issue](https://github.com/ImpressCMS/impresscms/issues/new) or send us a [pull request](https://github.com/ImpressCMS/impresscms/pulls) -All development for 1.5 version happens on the *branches/impresscms_1.5* branch, so it is always the most up-to-date. +All development for 2.0 version happens on the *2.0.x* branch, so it is always the most up-to-date. -If you are going to be submitting a pull request, please branch from *branches/impresscms_1.5*, and submit your pull request back to same branch. +If you are going to be submitting a pull request, please branch from *2.0.x*, and submit your pull request back to same branch. diff --git a/docs/changelog.md b/docs/changelog.md index bc306d000d4f..f0ddedb74b70 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,12 +1,12 @@ # ImpressCMS ChangeLog -## ImpressCMS 1.4.6 RC -* Date : 24 Nov 2023 +## ImpressCMS 1.4.6 +* Date : 27 Nov 2023 * DB Version: 46 -* Build Version : 106 +* Build Version : 107 ### Bugfix -* Breaking bug in the mail function in [PR 1539](https://github.com/ImpressCMS/impresscms/pull/1539) +* Fix fatal error in mailusers by @skenow in https://github.com/ImpressCMS/impresscms/pull/1539 ### Updates * update jQuery 3.7.1 by @fiammybe in https://github.com/ImpressCMS/impresscms/pull/1543 diff --git a/htdocs/include/version.php b/htdocs/include/version.php index d5d8a50c9308..877db18b360f 100644 --- a/htdocs/include/version.php +++ b/htdocs/include/version.php @@ -10,7 +10,8 @@ * @version $Id: version.php 12500 2015-06-15 20:03:56Z fiammy $ */ -define('ICMS_VERSION_NAME', 'ImpressCMS 1.4.6 RC'); + +define('ICMS_VERSION_NAME', 'ImpressCMS 1.4.6'); // For backward compatibility with XOOPS define('XOOPS_VERSION', ICMS_VERSION_NAME); @@ -30,9 +31,9 @@ * * Every release has its own build number, incrementable by 1 everytime we make a release */ -// impresscms_1.3.10 = 82, 2.0.0 alpha 4 = 73, 1.4,1 beta : 94, 1.4.5 = 105 +// impresscms_1.3.10 = 82, 2.0.0 alpha 4 = 73, 1.4,1 beta : 94, 1.4.6 = 107 -define('ICMS_VERSION_BUILD', 106); +define('ICMS_VERSION_BUILD', 107); /** * Latest dbversion of the System Module diff --git a/htdocs/modules/system/icms_version.php b/htdocs/modules/system/icms_version.php index bbdc51dce015..214cfb42fa7e 100644 --- a/htdocs/modules/system/icms_version.php +++ b/htdocs/modules/system/icms_version.php @@ -64,11 +64,11 @@ 'image' => "images/system_slogo.png", /* for backward compatibility */ /** Development information */ - 'status_version' => "RC", - 'status' => "rc", - 'date' => "24 Nov 2023", + 'status_version' => "Final", + 'status' => "final", + 'date' => "27 Nov 2023", 'author_word' => "", - 'warning' => _CO_ICMS_WARNING_RC, + 'warning' => _CO_ICMS_WARNING_FINAL, /** * Contributors