euromark
6161aae54e
also bring template one in sync.
2014-06-17 13:08:13 +02:00
ADmad
4a7c3582d0
Merge pull request #3727 from cakephp/master-fix
...
remove wrong App::uses() call
2014-06-17 11:06:53 +05:30
euromark
a927f5d954
remove wrong App::uses() call
2014-06-17 05:10:19 +02:00
Bryan Crowe
1db10b4dd1
Basic grammar update to BasicAuthenticate docblock
2014-06-16 21:48:35 -04:00
mark_story
9136f63874
Fix autoLinkEmail() not working when emails are adjacent to HTML.
...
When an email address is adjacent to HTML it should be autolinked
correctly.
Refs #3656
2014-06-16 21:48:30 -04:00
mark_story
74d8e9ea40
Convert test to use a dataprovider instead of multiple calls.
...
Dataproviders are generally a bit easier to work with in the future.
2014-06-16 21:46:34 -04:00
euromark
a9de83daeb
console cake cleanup and unification
...
remove duplicate define
2014-06-17 02:28:52 +02:00
mark_story
96df2c4b68
Update version number to 2.5.2
2014-06-14 21:36:39 -04:00
Mark Story
7d8dcd020e
Merge pull request #3704 from cakephp/hash-matches
...
Fix Hash::extract() not matching 1/0 to true/false.
2014-06-13 15:21:10 -04:00
mark_story
fa19c34580
Fix Hash::extract() not matching 1/0 to true/false.
...
Historically [prop=1] has matched prop=true as well. This restores that
and also fixes [prop=0] not finding falsey values.
This makes the typing less strict in Hash::extract() but I don't think
it is unreasonable given PHP's type juggling.
Refs #3288
2014-06-12 11:30:48 -04:00
Bryan Crowe
d8b4c3967c
Fix typo
2014-06-10 23:31:42 -04:00
Mark Story
73189acb76
Merge pull request #3681 from cakephp/api-doc-comments
...
Fix api docblocks for behaviors.
2014-06-09 15:13:19 -04:00
ADmad
0b4ba0b049
Fix api docblocks for behaviors.
2014-06-10 00:38:44 +05:30
José Lorenzo Rodríguez
729e528eb0
Merge pull request #3666 from ADmad/2.5-basic-auth
...
Remove lies from API docblock for BasicAuthenticate class.
2014-06-08 10:41:35 +02:00
ADmad
4ee7cf6564
Remove lies from API docblock for BasicAuthenticate class.
...
Add info on how to configure for cookieless/stateless operation without redirection.
2014-06-08 14:05:08 +05:30
ADmad
92a89d7f5d
Merge pull request #3661 from cakephp/api-docs
...
Api docs
2014-06-06 23:57:31 +05:30
mark_story
146053c980
Update datasource API docs.
2014-06-06 14:06:32 -04:00
mark_story
d8b0083632
Fix api doc errors in TestSuite/
2014-06-06 13:57:48 -04:00
mark_story
07b43403fb
Fix doc errors in Component/Acl.
2014-06-06 13:57:15 -04:00
mark_story
849ad9a4f5
Remove dead, untested and unreachable code in FormHelper.
...
Closes #3650
2014-06-06 08:17:49 -04:00
ADmad
74cd3db5e1
Merge pull request #3645 from cakephp/api-doc-comment
...
Api doc comment
2014-06-05 10:15:44 +05:30
akiyan
6d2402fbf6
No truncate when drop table.
2014-06-05 13:37:22 +09:00
mark_story
ab5da2a09f
Fix the test suite package doc block errors.
2014-06-05 00:24:01 -04:00
mark_story
7058921275
Fix doc comment errors in Acl classes.
2014-06-05 00:15:45 -04:00
Mark Story
9c65337c9f
Merge pull request #3640 from cakephp/api-doc-comments
...
Fix API docblock CS errors.
2014-06-04 15:03:16 -04:00
ADmad
1d40f3e685
Fix API docblock CS errors.
2014-06-05 00:28:55 +05:30
mark_story
55672b6df3
Merge branch 'router-stars' from Hikkijp
...
Refs #3582 , #3581
2014-06-02 22:38:27 -04:00
mark_story
4362f7bf8b
Add tests for CakeRoute::match() and trailing * routes.
...
Add tests for /pages/** routes, and fix coding standards errors.
Refs #3581
2014-06-02 22:37:37 -04:00
mark_story
9ba7abd89f
Merge branch 'FormAuthenticate_empty_fix' from KeinBaum
...
Closes #3624
2014-06-02 22:03:40 -04:00
mark_story
975e4c3af0
Allow username of 0 in basic authentication.
...
Refs #3624
2014-06-02 22:02:28 -04:00
mark_story
d1e4dfac47
Add tests for #3624
...
The username of '0' should be accepted by FormAuthenticate.
Refs #3624
2014-06-02 21:58:50 -04:00
KeinBaum
88b3629f4f
#3623 : Allow username "0" with FormAuthenticate
2014-06-02 19:11:02 +02:00
Mark Story
ad43461974
Merge pull request #3621 from cakephp/api-doc-comments
...
More API docblock CS fixes.
2014-06-02 11:47:41 -04:00
ADmad
e7debd8692
More API docblock CS fixes.
2014-06-02 18:27:11 +05:30
Mark Story
3108217d73
Merge pull request #3609 from php-engineer/master-docblock
...
Correct Docblock
2014-06-01 09:25:08 -04:00
Stefan Dickmann
91907b5c6c
correct docblock
...
invalid certificate domain
2014-06-01 13:23:47 +02:00
ADmad
6e66815d67
Merge pull request #3614 from cakephp/api-doc-comments-2
...
Api doc comments 2
2014-06-01 11:10:09 +05:30
mark_story
47ce5928e1
Fix api doc errors in Cache.
2014-05-31 22:02:55 -04:00
mark_story
86a071353d
Fix api doc comment errors in Error/
2014-05-31 21:57:17 -04:00
mark_story
fe2003888b
Fix api doc errors in basics.php
2014-05-31 21:53:54 -04:00
mark_story
15f63e9c81
Removing peer verification failure test.
...
Since we are not running a domain with an invalid certificate relying on
someone else to do that is quite unreliable.
2014-05-31 21:51:03 -04:00
Mark Story
e467457319
Merge pull request #3612 from cakephp/api-doc-comments
...
More API docblock fixes.
2014-05-31 19:12:20 -04:00
Mark Story
21285746cf
Merge pull request #3611 from MaziyarMK/patch-1
...
added HTML for styling tables
2014-05-31 19:08:58 -04:00
ADmad
3d9b2b80cb
More API docblock fixes.
2014-06-01 03:06:05 +05:30
MaziyarMK
596c1c27cb
added HTML for styling tables
...
added <thead> and <tbody> to table for easier styling of generated templates.
2014-05-31 20:50:29 +00:00
Mark Story
90c0556a4a
Merge pull request #3607 from ADmad/2.5-hash-sort
...
Set default sort direction to 'asc'.
2014-05-30 12:18:29 -04:00
ADmad
543066f34a
Set default sort direction to 'asc'.
2014-05-30 19:43:09 +05:30
Mark Story
4e8e266754
Merge pull request #3598 from cakephp/api-doc-comments
...
Fix api docblocks for View layer classes.
2014-05-29 21:47:41 -04:00
ADmad
16df061d66
Fix api docblocks for View layer classes.
2014-05-30 01:23:12 +05:30
mark_story
390441d3b9
Accept older blowfish hashes.
...
Both `2a` and `2x` are valid types of blowfish hashes, that while being
older should be accepted.
Backport 00c94bd582b83f8b92228b750aea0e8816a4ea89 from 3.x to 2.5.x,
I see this as a bug fix as it fixes incompatibilities with hashes
created by hash_password().
Refs #3575
2014-05-28 22:53:21 -04:00
