Skip to content

Commit

Permalink
Merge pull request #4210 from codeigniter4/develop
Browse files Browse the repository at this point in the history
4.1.1 Ready code
  • Loading branch information
MGatner authored Feb 1, 2021
2 parents 51e2371 + a790851 commit 5e852b3
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 13 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@

## [Unreleased](https://github.com/codeigniter4/CodeIgniter4/tree/HEAD)

[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.0...HEAD)
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.1...HEAD)

## [v4.1.1](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.0) (2021-02-01)

[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.0...v4.1.1)

**Fixed bugs:**

- Fixed an issue where **.gitattributes** was preventing framework downloads

## [v4.1.0](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.0) (2021-01-31)

Expand Down
9 changes: 0 additions & 9 deletions admin/framework/.gitattributes

This file was deleted.

2 changes: 1 addition & 1 deletion system/CodeIgniter.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class CodeIgniter
/**
* The current version of CodeIgniter Framework
*/
const CI_VERSION = '4.1.0';
const CI_VERSION = '4.1.1';

/**
* App startup time.
Expand Down
2 changes: 2 additions & 0 deletions user_guide_src/source/changelogs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ See all the changes.
.. toctree::
:titlesonly:

v4.1.2
v4.1.1
v4.1.0
v4.0.5
v4.0.4
Expand Down
8 changes: 7 additions & 1 deletion user_guide_src/source/changelogs/v4.1.1.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Version 4.1.1
====================================================

Release Date: Not released
Release Date: February 1, 2021

**4.1.1 release of CodeIgniter4**

Bugs Fixed:

- Fixed an issue where **.gitattributes** was preventing framework downloads.

Note that this fix was also applied retroactively to ``4.0.5`` on the **framework** repo.
6 changes: 6 additions & 0 deletions user_guide_src/source/changelogs/v4.1.2.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Version 4.1.2
====================================================

Release Date: Not released

**4.1.2 release of CodeIgniter4**
2 changes: 1 addition & 1 deletion user_guide_src/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
version = '4.1'

# The full version, including alpha/beta/rc tags.
release = '4.1.0'
release = '4.1.1'

# -- General configuration ---------------------------------------------------

Expand Down
12 changes: 12 additions & 0 deletions user_guide_src/source/installation/upgrade_410.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
######################################
Upgrading from 4.0.5 to 4.1.0 or 4.1.1
######################################

**Legacy Autoloading**

`Autoloader::loadLegacy()` method was originally for transition to CodeIgniter v4. Since `4.1.0`,
this support was removed and this method should not be used.

**Model::fillPlaceholders**

Replace any use of this method with its equivalent version from Validation instead.
1 change: 1 addition & 0 deletions user_guide_src/source/installation/upgrading.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ upgrading from.
.. toctree::
:titlesonly:

Upgrading from 4.0.5 to 4.1.0 or 4.1.1 <upgrade_410>
Upgrading from 4.0.4 to 4.0.5 <upgrade_405>
Upgrading from 4.0.x to 4.0.4 <upgrade_404>
Upgrading from 3.x to 4.x <upgrade_4xx>

0 comments on commit 5e852b3

Please sign in to comment.