From 694d400efb077666955672c2e8c22e4d1b3a3a06 Mon Sep 17 00:00:00 2001 From: James L Parry Date: Wed, 3 Dec 2014 20:53:40 -0800 Subject: Flag the smiley helper and shopping cart as deprecated. They should be removed the next minor release. Lowered the "javascript" deprecation message to "important" instead of "warning", for consistency with the rest of CI. Signed-off-by:James L Parry --- user_guide_src/source/helpers/smiley_helper.rst | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'user_guide_src/source/helpers') diff --git a/user_guide_src/source/helpers/smiley_helper.rst b/user_guide_src/source/helpers/smiley_helper.rst index e7a5724a8..37dfdf664 100644 --- a/user_guide_src/source/helpers/smiley_helper.rst +++ b/user_guide_src/source/helpers/smiley_helper.rst @@ -2,6 +2,10 @@ Smiley Helper ############# +.. important:: This library is DEPRECATED and should not be used. + It is now no longer supported. + Currently only kept for backwards compatibility. + The Smiley Helper file contains functions that let you manage smileys (emoticons). -- cgit v1.2.3-24-g4f1b From 21c3c22320a10d32054b251b24e5b1e569ddeabf Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 4 Dec 2014 12:10:00 +0200 Subject: [ci skip] Update on the changes from PR #3388 - Fixed a broken link - Added missing notes about deprecations in the upgrade instructions - Improved consistency with other deprecation notices in the docs --- user_guide_src/source/helpers/email_helper.rst | 3 ++- user_guide_src/source/helpers/smiley_helper.rst | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'user_guide_src/source/helpers') diff --git a/user_guide_src/source/helpers/email_helper.rst b/user_guide_src/source/helpers/email_helper.rst index b665ce548..3b771a0b6 100644 --- a/user_guide_src/source/helpers/email_helper.rst +++ b/user_guide_src/source/helpers/email_helper.rst @@ -6,7 +6,8 @@ The Email Helper provides some assistive functions for working with Email. For a more robust email solution, see CodeIgniter's :doc:`Email Class <../libraries/email>`. -.. important:: The Email helper is **deprecated**. +.. important:: The Email helper is DEPRECATED and is currently + only kept for backwards compatibility. .. contents:: :local: diff --git a/user_guide_src/source/helpers/smiley_helper.rst b/user_guide_src/source/helpers/smiley_helper.rst index 37dfdf664..5de1d83bb 100644 --- a/user_guide_src/source/helpers/smiley_helper.rst +++ b/user_guide_src/source/helpers/smiley_helper.rst @@ -2,13 +2,12 @@ Smiley Helper ############# -.. important:: This library is DEPRECATED and should not be used. - It is now no longer supported. - Currently only kept for backwards compatibility. - The Smiley Helper file contains functions that let you manage smileys (emoticons). +.. important:: The Smiley helper is DEPRECATED and should not be used. + It is currently only kept for backwards compatibility. + .. contents:: :local: -- cgit v1.2.3-24-g4f1b From e29136567e2a12726f9ab40762bcb47a7cde759c Mon Sep 17 00:00:00 2001 From: Preetham Date: Thu, 4 Dec 2014 21:01:52 -0500 Subject: closing #51. Added img_id and img_name in capcha helper Signed-off-by: Preetham --- user_guide_src/source/helpers/captcha_helper.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'user_guide_src/source/helpers') diff --git a/user_guide_src/source/helpers/captcha_helper.rst b/user_guide_src/source/helpers/captcha_helper.rst index 3cf51330b..7d7f30de8 100644 --- a/user_guide_src/source/helpers/captcha_helper.rst +++ b/user_guide_src/source/helpers/captcha_helper.rst @@ -34,6 +34,8 @@ Once loaded you can generate a CAPTCHA like this:: 'expiration' => 7200, 'word_length' => 8, 'font_size' => 16, + 'img_id' => 'Image id', + 'img_name' => 'Image name', 'pool' => '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', // White background and border, black text and red grid @@ -60,7 +62,9 @@ Once loaded you can generate a CAPTCHA like this:: in the captcha folder before it will be deleted. The default is two hours. - **word_length** defaults to 8, **pool** defaults to '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' -- **font_size** defaults to 16, the native GD font has a size limit. Specify a "true type" font for bigger sizes. +- **font_size** defaults to 16, the native GD font has a size limit. Specify a "true type" font for bigger sizes. +- The **img_id** will be set as the "id" of the captcha image. +- The **img_name** will be set as the "name" of the captcha image. - If any of the **colors** values is missing, it will be replaced by the default. Adding a Database -- cgit v1.2.3-24-g4f1b From be7e493fd7a4dcc8f00b60201d4948f3618d9b6a Mon Sep 17 00:00:00 2001 From: Preetham Date: Fri, 5 Dec 2014 11:13:57 -0500 Subject: Removed img_name from captcha helper Signed-off-by: Preetham --- user_guide_src/source/helpers/captcha_helper.rst | 2 -- 1 file changed, 2 deletions(-) (limited to 'user_guide_src/source/helpers') diff --git a/user_guide_src/source/helpers/captcha_helper.rst b/user_guide_src/source/helpers/captcha_helper.rst index 7d7f30de8..6e0cfc979 100644 --- a/user_guide_src/source/helpers/captcha_helper.rst +++ b/user_guide_src/source/helpers/captcha_helper.rst @@ -35,7 +35,6 @@ Once loaded you can generate a CAPTCHA like this:: 'word_length' => 8, 'font_size' => 16, 'img_id' => 'Image id', - 'img_name' => 'Image name', 'pool' => '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', // White background and border, black text and red grid @@ -64,7 +63,6 @@ Once loaded you can generate a CAPTCHA like this:: - **word_length** defaults to 8, **pool** defaults to '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' - **font_size** defaults to 16, the native GD font has a size limit. Specify a "true type" font for bigger sizes. - The **img_id** will be set as the "id" of the captcha image. -- The **img_name** will be set as the "name" of the captcha image. - If any of the **colors** values is missing, it will be replaced by the default. Adding a Database -- cgit v1.2.3-24-g4f1b From 6157e52f1988c3640082fe6fd323ebbc07887259 Mon Sep 17 00:00:00 2001 From: Preetham Date: Fri, 5 Dec 2014 12:19:09 -0500 Subject: removing extra spaces Signed-off-by: Preetham --- user_guide_src/source/helpers/captcha_helper.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide_src/source/helpers') diff --git a/user_guide_src/source/helpers/captcha_helper.rst b/user_guide_src/source/helpers/captcha_helper.rst index 6e0cfc979..4aacafd49 100644 --- a/user_guide_src/source/helpers/captcha_helper.rst +++ b/user_guide_src/source/helpers/captcha_helper.rst @@ -34,7 +34,7 @@ Once loaded you can generate a CAPTCHA like this:: 'expiration' => 7200, 'word_length' => 8, 'font_size' => 16, - 'img_id' => 'Image id', + 'img_id' => 'Imageid', 'pool' => '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', // White background and border, black text and red grid -- cgit v1.2.3-24-g4f1b From 0ef898b7ea947c6ba4957877d1afd713a189b6f2 Mon Sep 17 00:00:00 2001 From: Peter Denk Date: Tue, 6 Jan 2015 16:03:17 +0100 Subject: Documentation updated. Signed-off-by: Peter Denk --- user_guide_src/source/helpers/date_helper.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_guide_src/source/helpers') diff --git a/user_guide_src/source/helpers/date_helper.rst b/user_guide_src/source/helpers/date_helper.rst index d9019a203..dcff7a4e5 100644 --- a/user_guide_src/source/helpers/date_helper.rst +++ b/user_guide_src/source/helpers/date_helper.rst @@ -357,7 +357,7 @@ The following functions are available: - + @@ -428,7 +428,7 @@ UP9 (UTC +9:00) Japan Standard Time, Korea Standard Time, Yakutsk UP95 (UTC +9:30) Australian Central Standard Time UP10 (UTC +10:00) Australian Eastern Standard Time, Vladivostok Time UP105 (UTC +10:30) Lord Howe Island -UP11 (UTC +11:00) Magadan Time, Solomon Islands, Vanuatu +UP11 (UTC +11:00) Srednekolymsk Time, Solomon Islands, Vanuatu UP115 (UTC +11:30) Norfolk Island UP12 (UTC +12:00) Fiji, Gilbert Islands, Kamchatka, New Zealand UP1275 (UTC +12:45) Chatham Islands Standard Time -- cgit v1.2.3-24-g4f1b