Mark Story
ce9f547175
Merge pull request #1655 from dereuromark/2.5-inlist-clean
...
2.5 inList(), multiple() and case sensitivity
2013-09-25 11:45:29 -07:00
euromark
f7e507145c
Case insensitive validation inList option. Resolves ticket 3521. Added two tests to proof the faulty behavior of $strict here. Also address the faulty behavior in multiple() and replace it with case sensitivity.
2013-09-24 02:01:50 +02:00
mark_story
d2577fac60
Merge branch 'master' into 2.5
2013-09-21 20:01:50 -04:00
mark_story
a30f861f2c
Use array_key_exists instead of isset()
...
This allows contains() to work with null values.
Fixes #4083
2013-09-19 21:44:09 -04:00
Bryan Crowe
5c329b4875
Updated CakeTime::i18nFormat() doc block description
2013-09-17 23:09:46 -04:00
mark_story
a7a6fcae8a
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-09-17 10:11:24 -04:00
euromark
e3a3946e89
address casting cs
2013-09-17 15:15:25 +02:00
euromark
12f2f729c8
more cs
2013-09-17 14:53:07 +02:00
euromark
382f75dbfc
cs corrections, bool to boolean and int to integer.
2013-09-17 14:44:34 +02:00
mark_story
7379d32b59
Simplify & fix phone number validation.
...
The changes made in fa3d4a0bb5
tightened
the area code validation too much and excluded at least one valid area
code. This change replaces that with a more generic solution that does
not attempt to exclude non-allocated but potentially valid area codes.
Fixes #4066
2013-09-13 23:05:40 -04:00
ADmad
c27aa99af9
Merge branch 'master' into 2.5
2013-09-08 20:36:40 +05:30
euromark
959988cfa1
Remove last yoda conditions as per coding standards guidelines.
2013-09-06 18:36:57 +02:00
mark_story
f22c4cf90b
Merge branch 'master' into 2.5
2013-09-05 10:21:41 -04:00
Schlaefer
82da8d9d07
performance improvements in CakeTime::timeAgoInWords Edit
...
- rearranges code to move return statements before otherwise dead code
- only do translation if translated string is actually used
2013-09-05 12:22:28 +02:00
Rob McVey
7f44cc01b5
Plural of breif is breifs not breives
2013-09-04 09:20:32 +01:00
mark_story
4c92cdcada
Reorder inflection rules.
...
Place rules for words like 'archives' and 'relatives' before words like
'knives'.
Fixes #4040
2013-09-03 12:50:02 -04:00
mark_story
59bb05b433
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-09-02 11:35:09 -04:00
mark_story
13b870d7e1
Fix coding standards error.
2013-09-01 21:44:45 -04:00
José Lorenzo Rodríguez
fec646b69f
Merge pull request #1588 from kimegede/caketime-docblock-update
...
Added @link CakeTime.
2013-08-31 21:59:11 -07:00
Kim Egede Jakobsen
539040aa07
Added @link CakeTime.
2013-08-31 21:56:15 -07:00
Kim Egede Jakobsen
fcf9f34392
Added @link to CakeNumber's docblock
2013-08-31 17:32:48 -07:00
Kim Egede Jakobsen
46d3d8e48e
Added @link to all public functions there have documentation.
...
And correct a small 'typo'.
2013-08-31 17:12:29 -07:00
mark_story
95ad5f5c78
Add hmac to encrypted data.
...
Using an HMAC ensures that the ciphertext has not been
modified.
2013-08-29 14:40:01 -04:00
mark_story
c5092851d1
Fix compatibility with PHP 5.2
2013-08-27 23:03:08 -04:00
mark_story
215d43eb06
Add encrypt() and decrypt() methods.
...
These methods use AES-256 and provide a simple to use API with easy to
remember names.
2013-08-27 21:20:22 -04:00
mark_story
f655e8a7bc
Minor simplification.
2013-08-24 21:49:17 -04:00
Chen Cohen
a0014e7a30
Ticket 4011 - Adding matchers support for Hash::remove() and Hash::insert()
2013-08-24 02:02:01 +03:00
euromark
361980fade
remove code, class names and paths from translation strings.
2013-08-21 00:05:53 +02:00
mark_story
0f2d59d987
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Network/CakeResponse.php
lib/Cake/TestSuite/CakeTestCase.php
2013-08-18 23:10:08 -04:00
mark_story
3244b9e3d7
Merge branch 'master' into 2.4
2013-08-16 14:47:01 -04:00
euromark
6cf147e8c8
unify null checks - avoid method call in favor of strict check
2013-08-16 20:12:49 +02:00
dmromanov
56ef44f495
Excluded method names from several tanslation strings
...
Removed unnecessary sprintfs
2013-08-16 13:42:28 +04:00
ADmad
8428928fd6
Merge pull request #1528 from mvdriel/caketime-fix
...
Added workaround for strtotime("0000-00-00 00:00:00") returning -6216995...
2013-08-15 10:55:03 -07:00
Mark van Driel
97aaa89b3f
Refactored the fix
2013-08-15 17:13:31 +02:00
Floris
85313e84af
Minor Sanitize::escape() update
...
If the Datasource is not going to be used, do access it.
2013-08-15 12:15:09 +02:00
Mark van Driel
1595287290
Added workaround for strtotime("0000-00-00 00:00:00") returning -62169955200 on a 64 bit system
2013-08-15 08:58:05 +02:00
Mark van Driel
559fb5805b
Fix formatting with locales using , as decimal separator
...
No double number formatting for readable size
Fixed testPrecisionLocalized for travis (when locale is missing?)
Switched locale to nl_NL and fixed test
Skip test when locale is not available
2013-08-14 22:19:38 +02:00
mark_story
1c1701813b
Fix failing test from merge with 2.3
...
Fix a failed test from bad merge and remove nested conditions.
2013-08-12 14:47:43 -04:00
mark_story
26769edd04
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Utility/CakeTime.php
lib/Cake/VERSION.txt
2013-08-12 14:39:02 -04:00
Christian Winther
af1c2a1c51
Merge pull request #1511 from ankr/caketime_accuracy_about
...
Making CakeTime display 'about X ago' when time passed is lower than acc...
2013-08-12 09:23:46 -07:00
ankr
1cb41294b8
Making CakeTime display 'about X ago' when time passed is lower than accuracy
...
Removing unnecessary else
Also support 'about' times for future times
Make 'about' times translateable in all languages
2013-08-12 10:01:38 -04:00
euromark
7c856e6ab7
missing whitespace
2013-08-12 16:00:24 +02:00
Marc Würth
7d4f229310
Fixed statement about Security:hash's salt parameter
...
Just nitpicking, but it prepends the salt, not appends it:
https://github.com/cakephp/cakephp/blob/master/lib/Cake/Utility/Security.php#L120
2013-08-12 12:52:34 +02:00
euromark
b09dc7213a
deprecate Controller::flash() and adjust some other deprecation messages.
2013-08-12 12:51:12 +02:00
José Lorenzo Rodríguez
789400ac44
Merge pull request #1409 from cdburgess/phone-validation-update
...
Phone validation update
2013-08-11 14:37:05 -07:00
Jose Lorenzo Rodriguez
9d07fc4330
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/ShellDispatcher.php
lib/Cake/Utility/CakeNumber.php
lib/Cake/View/Elements/sql_dump.ctp
2013-08-11 23:31:10 +02:00
ADmad
1d809e9807
Deprecated Sanitize class
2013-08-10 00:10:05 +05:30
euromark
1339a9dfe1
coding standards according to new sniffer rules
2013-08-08 01:03:21 +02:00
euromark
e1365336e2
avoid notice in mime()
2013-08-07 23:35:19 +02:00
Mark Story
dc15c78710
Merge pull request #1483 from tigrang/debugger-fix
...
Added case for `unknown` type.
Fixes #3966
2013-08-06 19:39:13 -07:00