From 8bedae5600ab0c5bf0320afb8be2ecac3e74c23f Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 8 Oct 2019 10:33:07 +0300 Subject: [ci skip] Merge pull request #5851 from ossamamehmood/patch-1 Fix for #5711 and added two more models --- application/config/user_agents.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'application/config') diff --git a/application/config/user_agents.php b/application/config/user_agents.php index c1581e5cd..ec8e3cffd 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -152,6 +152,10 @@ $mobiles = array( 'open web' => 'Open Web', 'openweb' => 'OpenWeb', 'meizu' => 'Meizu', + 'huawei' => 'Huawei', + 'xiaomi' => 'Xiaomi', + 'oppo' => 'Oppo', + 'vivo' => 'Vivo', // Operating Systems 'android' => 'Android', -- cgit v1.2.3-24-g4f1b From d180cadbfda28b3e4bfef9a0313f039a6eac211d Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 8 Oct 2019 11:15:59 +0300 Subject: [ci skip] Merge pull request #5849 from Lablnet/patch-1 Added Infinix manufacture in user_agents.php --- application/config/user_agents.php | 1 + 1 file changed, 1 insertion(+) (limited to 'application/config') diff --git a/application/config/user_agents.php b/application/config/user_agents.php index ec8e3cffd..c4429aac5 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -156,6 +156,7 @@ $mobiles = array( 'xiaomi' => 'Xiaomi', 'oppo' => 'Oppo', 'vivo' => 'Vivo', + 'infinix' => 'Infinix', // Operating Systems 'android' => 'Android', -- cgit v1.2.3-24-g4f1b From c1b604e82378dcd1e981157638d947db9e3d096b Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 30 Mar 2020 11:50:47 +0300 Subject: [ci skip] Merge pull request #5907 from pkarunyu/develop Fixed double spacing in mimes.php --- application/config/mimes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index 7aa5c9e4e..88a621a19 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | ------------------------------------------------------------------- | MIME TYPES | ------------------------------------------------------------------- -| This file contains an array of mime types. It is used by the +| This file contains an array of mime types. It is used by the | Upload class to help identify allowed file types. | */ @@ -85,7 +85,7 @@ return array( 'jpm' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), 'mj2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), 'mjp2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), - 'png' => array('image/png', 'image/x-png'), + 'png' => array('image/png', 'image/x-png'), 'tiff' => 'image/tiff', 'tif' => 'image/tiff', 'css' => array('text/css', 'text/plain'), -- cgit v1.2.3-24-g4f1b From 3e01078f6913395d0955cf0752f534f550df3705 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 30 Mar 2020 12:03:35 +0300 Subject: [ci skip] Merge pull request #5918 from wobility/patch-1 Update with heic format --- application/config/mimes.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index 88a621a19..f5407ff89 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -88,6 +88,8 @@ return array( 'png' => array('image/png', 'image/x-png'), 'tiff' => 'image/tiff', 'tif' => 'image/tiff', + 'heic' => 'image/heic', + 'heif' => 'image/heif', 'css' => array('text/css', 'text/plain'), 'html' => array('text/html', 'text/plain'), 'htm' => array('text/html', 'text/plain'), -- cgit v1.2.3-24-g4f1b From 409a950bd856dddac28b3212a1acd014ab7ee336 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 9 Jul 2020 11:18:48 +0300 Subject: [ci skip] Merge pull request #5922 from robsonpiere/develop Add UptimeRobot user agent --- application/config/user_agents.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/user_agents.php b/application/config/user_agents.php index c4429aac5..5e1f6afba 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -217,5 +217,6 @@ $robots = array( 'curious george' => 'Curious George', 'ia_archiver' => 'Alexa Crawler', 'MJ12bot' => 'Majestic-12', - 'Uptimebot' => 'Uptimebot' + 'Uptimebot' => 'Uptimebot', + 'UptimeRobot' => 'UptimeRobot' ); -- cgit v1.2.3-24-g4f1b From 3de79e995faf021fab70b6a82ec57e9fdb0dbedb Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 9 Jul 2020 11:33:52 +0300 Subject: [ci skip] Merge pull request #5970 from sapics/fix/user-guide-url Fix user guide url --- application/config/config.php | 10 ++++++---- application/config/hooks.php | 2 +- application/config/memcached.php | 2 +- application/config/profiler.php | 2 +- application/config/routes.php | 2 +- application/config/smileys.php | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index 10315220e..9ab8248e3 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -62,7 +62,9 @@ $config['uri_protocol'] = 'REQUEST_URI'; | This option allows you to add a suffix to all URLs generated by CodeIgniter. | For more information please see the user guide: | -| https://codeigniter.com/user_guide/general/urls.html +| https://codeigniter.com/userguide3/general/urls.html +| +| Note: This option is ignored for CLI requests. */ $config['url_suffix'] = ''; @@ -110,8 +112,8 @@ $config['enable_hooks'] = FALSE; | This item allows you to set the filename/classname prefix when extending | native libraries. For more information please see the user guide: | -| https://codeigniter.com/user_guide/general/core_classes.html -| https://codeigniter.com/user_guide/general/creating_libraries.html +| https://codeigniter.com/userguide3/general/core_classes.html +| https://codeigniter.com/userguide3/general/creating_libraries.html | */ $config['subclass_prefix'] = 'MY_'; @@ -321,7 +323,7 @@ $config['cache_query_string'] = FALSE; | If you use the Encryption class, you must set an encryption key. | See the user guide for more info. | -| https://codeigniter.com/user_guide/libraries/encryption.html +| https://codeigniter.com/userguide3/libraries/encryption.html | */ $config['encryption_key'] = ''; diff --git a/application/config/hooks.php b/application/config/hooks.php index a8f38a5dc..79c5c162f 100644 --- a/application/config/hooks.php +++ b/application/config/hooks.php @@ -8,6 +8,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | This file lets you define "hooks" to extend CI without hacking the core | files. Please see the user guide for info: | -| https://codeigniter.com/user_guide/general/hooks.html +| https://codeigniter.com/userguide3/general/hooks.html | */ diff --git a/application/config/memcached.php b/application/config/memcached.php index 5c23b39c1..65a149617 100644 --- a/application/config/memcached.php +++ b/application/config/memcached.php @@ -7,7 +7,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | ------------------------------------------------------------------------- | Your Memcached servers can be specified below. | -| See: https://codeigniter.com/user_guide/libraries/caching.html#memcached +| See: https://codeigniter.com/userguide3/libraries/caching.html#memcached | */ $config = array( diff --git a/application/config/profiler.php b/application/config/profiler.php index 3db22e39c..3436e931e 100644 --- a/application/config/profiler.php +++ b/application/config/profiler.php @@ -9,6 +9,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | data are displayed when the Profiler is enabled. | Please see the user guide for info: | -| https://codeigniter.com/user_guide/general/profiling.html +| https://codeigniter.com/userguide3/general/profiling.html | */ diff --git a/application/config/routes.php b/application/config/routes.php index 1b45740d7..e8e2296f0 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -19,7 +19,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | | Please see the user guide for complete details: | -| https://codeigniter.com/user_guide/general/routing.html +| https://codeigniter.com/userguide3/general/routing.html | | ------------------------------------------------------------------------- | RESERVED ROUTES diff --git a/application/config/smileys.php b/application/config/smileys.php index abf9a898d..a9b9191cc 100644 --- a/application/config/smileys.php +++ b/application/config/smileys.php @@ -10,7 +10,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | :-) and :) use the same image replacement. | | Please see user guide for more info: -| https://codeigniter.com/user_guide/helpers/smiley_helper.html +| https://codeigniter.com/userguide3/helpers/smiley_helper.html | */ $smileys = array( -- cgit v1.2.3-24-g4f1b