From b182eb5eb23249ccaa90b2fd0cedf1c3c1ba791d Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 15 Jan 2019 12:58:18 +0200 Subject: Merge pull request #5676 from albertleao/albertleao-patch-1 Added mobile google bot to user agents --- application/config/user_agents.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/config/user_agents.php b/application/config/user_agents.php index b6c85631e..ad0b0fd20 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -110,6 +110,7 @@ $mobiles = array( // Phones and Manufacturers 'motorola' => 'Motorola', 'nokia' => 'Nokia', + 'nexus' => 'Nexus', 'palm' => 'Palm', 'iphone' => 'Apple iPhone', 'ipad' => 'iPad', -- cgit v1.2.3-24-g4f1b From 4eaf80a6ec0b58a0adc95638153363e00ebf5378 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 16 Jan 2019 17:43:02 +0200 Subject: [ci skip] Prepare for 3.1.10 release --- system/core/CodeIgniter.php | 2 +- user_guide_src/source/changelog.rst | 7 +++++-- user_guide_src/source/conf.py | 4 ++-- user_guide_src/source/installation/downloads.rst | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 34af79f54..56826f1a6 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -55,7 +55,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); * @var string * */ - const CI_VERSION = '3.1.10-dev'; + const CI_VERSION = '3.1.10'; /* * ------------------------------------------------------ diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 58f6d71f0..6ed61649a 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -5,9 +5,12 @@ Change Log Version 3.1.10 ============== +Release Date: Jan 16, 2019 + - General Changes - - Added 'ssl_verify' support to the 'pdo/mysql' :doc:`Database driver. + - Added 'ssl_verify' support to the 'pdo/mysql' :doc:`Database ` driver. + - Renamed :doc:`Inflector Helper ` function ``is_countable()`` to :php:func:`word_is_countable()` due to the former colliding with one introduced in PHP 7.3.0. Bug fixes for 3.1.10 -------------------- @@ -264,7 +267,7 @@ Release Date: Oct 22, 2016 - General Changes - Added ``E_PARSE`` to the list of error levels detected by the shutdown handler. - - Updated :doc:`Inflector Helper ` :php:func:`is_countable()` with more words. + - Updated :doc:`Inflector Helper ` ``is_countable()`` with more words. - Updated :doc:`common function ` :php:func:`set_status_header()` with new status codes from IETF RFCs `2817 `_ (426) and `6585 `_ (428, 429, 431, 511). diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index 8114dc1fd..4f90eb48c 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2014 - 2019, British Columbia Institute of Technology' # built documents. # # The short X.Y version. -version = '3.1.10-dev' +version = '3.1.10' # The full version, including alpha/beta/rc tags. -release = '3.1.10-dev' +release = '3.1.10' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst index 5407e44e1..d7d891c80 100644 --- a/user_guide_src/source/installation/downloads.rst +++ b/user_guide_src/source/installation/downloads.rst @@ -2,7 +2,7 @@ Downloading CodeIgniter ####################### -- `CodeIgniter v3.1.10-dev (Current version) `_ +- `CodeIgniter v3.1.10 (Current version) `_ - `CodeIgniter v3.1.9 `_ - `CodeIgniter v3.1.8 `_ - `CodeIgniter v3.1.7 `_ -- cgit v1.2.3-24-g4f1b From 1a1269149c1a56032740782aa957f76477d0311a Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 16 Jan 2019 17:53:59 +0200 Subject: [ci skip] Start of 3.1.11 development --- system/core/CodeIgniter.php | 2 +- user_guide_src/source/changelog.rst | 7 +++++++ user_guide_src/source/conf.py | 4 ++-- user_guide_src/source/installation/downloads.rst | 3 ++- user_guide_src/source/installation/upgrade_3111.rst | 14 ++++++++++++++ user_guide_src/source/installation/upgrading.rst | 1 + 6 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 user_guide_src/source/installation/upgrade_3111.rst diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 56826f1a6..a053777c1 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -55,7 +55,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); * @var string * */ - const CI_VERSION = '3.1.10'; + const CI_VERSION = '3.1.11-dev'; /* * ------------------------------------------------------ diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 6ed61649a..ff9e92cf5 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -2,6 +2,13 @@ Change Log ########## +Version 3.1.11 +============== + +Release Date: Not Released + + + Version 3.1.10 ============== diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index 4f90eb48c..1bc93d1d4 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2014 - 2019, British Columbia Institute of Technology' # built documents. # # The short X.Y version. -version = '3.1.10' +version = '3.1.11-dev' # The full version, including alpha/beta/rc tags. -release = '3.1.10' +release = '3.1.11-dev' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst index d7d891c80..7d34d71f6 100644 --- a/user_guide_src/source/installation/downloads.rst +++ b/user_guide_src/source/installation/downloads.rst @@ -2,7 +2,8 @@ Downloading CodeIgniter ####################### -- `CodeIgniter v3.1.10 (Current version) `_ +- `CodeIgniter v3.1.11 (Current version) `_ +- `CodeIgniter v3.1.10 `_ - `CodeIgniter v3.1.9 `_ - `CodeIgniter v3.1.8 `_ - `CodeIgniter v3.1.7 `_ diff --git a/user_guide_src/source/installation/upgrade_3111.rst b/user_guide_src/source/installation/upgrade_3111.rst new file mode 100644 index 000000000..5463e40c1 --- /dev/null +++ b/user_guide_src/source/installation/upgrade_3111.rst @@ -0,0 +1,14 @@ +############################### +Upgrading from 3.1.10 to 3.1.11 +############################### + +Before performing an update you should take your site offline by +replacing the index.php file with a static one. + +Step 1: Update your CodeIgniter files +===================================== + +Replace all files and directories in your *system/* directory. + +.. note:: If you have any custom developed files in these directories, + please make copies of them first. diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst index c35cc05ff..0c2c0e8c9 100644 --- a/user_guide_src/source/installation/upgrading.rst +++ b/user_guide_src/source/installation/upgrading.rst @@ -8,6 +8,7 @@ upgrading from. .. toctree:: :titlesonly: + Upgrading from 3.1.10 to 3.1.11 Upgrading from 3.1.9 to 3.1.10 Upgrading from 3.1.8 to 3.1.9 Upgrading from 3.1.7 to 3.1.8 -- cgit v1.2.3-24-g4f1b