mark_story
d2577fac60
Merge branch 'master' into 2.5
2013-09-21 20:01:50 -04:00
Mark Story
7d0452fbbc
Merge pull request #1662 from dereuromark/2.5-coverage
...
2.5 coverage
2013-09-21 15:55:27 -07:00
euromark
cbbd3ec6b3
correct doc block
2013-09-20 19:31:16 +02:00
euromark
b6a7cb7c7e
Output overall coverage.
2013-09-20 19:15:51 +02: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
Kamisama
d099c5ad7e
Add doc about the new serialize setting
2013-09-19 18:56:33 -04:00
Kamisama
7c83f7140f
Rename serializer
to serialize
2013-09-19 18:40:41 -04:00
Kamisama
0a704cc288
Fix test
2013-09-19 18:38:02 -04:00
Mark Story
68aefe7eda
Merge pull request #1658 from dereuromark/master-tests
...
correct and simplify tests
2013-09-18 16:24:36 -07:00
euromark
f62f46562c
add missing create() for creating a new record.
2013-09-19 00:23:56 +02:00
euromark
17bd465cae
simplify tests
2013-09-19 00:17:21 +02:00
Mark Story
3e8db7e5f7
Merge pull request #1657 from ADmad/bugfix/tree
...
Fixed TreeBehavior::recover() when using scope.
Fixes #4062 .
2013-09-18 14:57:37 -07:00
ADmad
1d89ee1c6d
Fixed TreeBehavior::recover() when using scope. Fixes #4062 .
2013-09-19 00:39:19 +05:30
Mark Story
e690c9340c
Merge pull request #1656 from dereuromark/master-validation-rules-casing
...
Fix casing of validation rules in bake
2013-09-18 10:39:39 -07:00
Kamisama
72965f793c
Remove unnecessary sprintf
2013-09-18 12:45:08 -04:00
euromark
58f38f1667
Fix casing of validation rules in bake
2013-09-18 18:31:55 +02:00
ADmad
61602990de
Merge pull request #1652 from bcrowe/fix-caketimedocs
...
Updated CakeTime::i18nFormat() doc block description
2013-09-17 22:02:14 -07:00
Kamisama
5d509e23c2
Throw exception when selected serializer is not installed
2013-09-18 00:46:21 -04:00
Kamisama
bd3f005ab6
Add serializer option to Memcached Cache engine
...
Add option to select a serializer engine among php, json or igbinary
2013-09-18 00:29:48 -04:00
Bryan Crowe
5c329b4875
Updated CakeTime::i18nFormat() doc block description
2013-09-17 23:09:46 -04:00
mark_story
809f6129e0
Update docs for HttpSocket methods.
...
delete() uses the request body, not the query string.
2013-09-17 21:17:26 -04:00
Mark Story
da805783fd
Merge pull request #1650 from bcrowe/fix-jsonviewdocs
...
Corrected some grammar in the JsonView class doc blocks
2013-09-17 17:37:26 -07:00
Bryan Crowe
24a522f972
Updated doc block for JsonView's subDir property
2013-09-17 20:25:32 -04:00
Bryan Crowe
878e599976
Corrected some grammar in the JsonView class doc blocks
2013-09-17 20:15:18 -04:00
mark_story
a7a6fcae8a
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-09-17 10:11:24 -04:00
Mark Story
eea56d3f23
Merge pull request #1648 from dereuromark/master
...
cs corrections
2013-09-17 07:05:14 -07: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
5ec9b145bf
Fix label element for attributes not matching their inputs.
...
Radio elements would contain ModelModelFieldValue instead of
ModelFieldValue like they should. This was caused by the fix for #3936
and lack of tests for create() + radio().
Fixes #4071
2013-09-16 22:38:28 -04:00
Mark Story
aee71fad11
Merge pull request #1646 from spiliot/patch-1
...
removed duplicate test case in CakeRequest Referer
2013-09-16 14:52:30 -07:00
spiliot
37c9832dc1
removed duplicate test case
...
Was exact duplicate of case starting line 692
2013-09-17 00:48:09 +03:00
mark_story
4ea6c158d1
Fix wording and remove trailing spaces.
2013-09-16 12:04:29 -04:00
Mark Story
9df34967f5
Merge pull request #1645 from ShinKenDo/patch-1
...
Improved wording of Model::invalidFields()
2013-09-16 09:03:53 -07:00
Jerome Roethlisberger
3a4a0e54eb
Improved wording of Model::invalidFields()
...
Inspired by
http://book.cakephp.org/2.0/en/models/data-validation/validating-data-from-the-controller.html#validating-data-from-the-controller
2013-09-16 16:13:58 +02:00
euromark
c8b18164c5
fix test
2013-09-16 00:49:01 +02:00
euromark
910ee33710
remove wrong trailing slash
2013-09-16 00:40:37 +02:00
mark_story
085636ea1b
Update version number to 2.4.1
2013-09-14 22:07:19 -04: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
José Lorenzo Rodríguez
d40f9f7f67
Merge pull request #1574 from dereuromark/2.5-logging
...
2.5 logging - deprecate/disallow magic logging
2013-09-13 00:29:22 -07:00
Mark Story
2ec54fba50
Merge pull request #1632 from ravage84/cakelog_config
...
Corrected a CakeLog example in a DocBlock about scopes and types
2013-09-12 20:20:51 -07:00
Marc Würth
0a7d5b9c3f
Corrected a CakeLog example in a DocBlock about scopes and types
...
> Its important to remember that
> when using scopes you must also define the `types` of log messages
> that a logger will handle. Failing to do so will result in the logger
> catching all log messages even if the scope is incorrect.
According to this the previous example would fail to log correctly.
2013-09-13 03:07:46 +02:00
euromark
61b05c40c6
remove autologging
2013-09-13 02:28:25 +02:00
mark_story
ba4afcc074
Fix incorrectly encoded address fields.
...
Address fields cannot contain : or " it causes a number of
mail servers/clients to be confused.
Fixes #4058
2013-09-12 20:14:11 -04:00
mark_story
a2bd91638e
Merge branch 'master' into 2.5
2013-09-12 19:47:13 -04:00
Mark Story
ba016c2c68
Merge pull request #1630 from dereuromark/master-cleanup
...
Master cleanup
2013-09-12 16:46:18 -07:00
euromark
a796b26f13
fix renderLayout and update deprecated and outdated code
2013-09-13 00:09:31 +02:00
ovidiupruteanu
f416a321c7
flushMethodCache not working if called before cacheMethod
...
When calling flushMethodCache it correctly empties self::$methodCache but if cacheMethod is called afterwards self::$methodCache gets populated with data from the Cache.
2013-09-12 22:02:39 +03:00
Mark Story
8f2bd51834
Merge pull request #1628 from ravage84/sqlserver-elseif
...
Replaced two elseifs by if in sqlserver datasource
2013-09-11 16:22:46 -07:00
Marc Würth
446792987a
Replaced two elseifs by if in sqlserver datasource
2013-09-11 23:15:05 +02:00