Melvin Ross
460cc29fff
Remove unneeded comment out line that I just saw in compare view on GH
2014-06-12 08:51:35 -05:00
Melvin Ross
361531509e
Fix coding standard violations
2014-06-12 08:47:40 -05:00
Melvin Ross
86923e3593
Modify CakeSocket and HttpSocket so that the "protocol" parameter can be used to specify which protocol to use for creating sockets. These are protcols in the php "[a-z]://" wrapper sense. I also modified the test for these two files respectively to accomodate these new changes.
...
Unrelated to this bug, I added a "head" function inside of HttpSocket to go along with the GET/POST/PUT/DELETE/PATCH combination that's already present. Came in handy for me for deciding if I wanted to hit a resource with HttpSocket or not.
2014-06-11 19:04:58 -05: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
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
José Lorenzo Rodríguez
bf9b8e1a52
Merge pull request #3586 from cakephp/api-doc-comments
...
Api doc comments
2014-05-28 20:56:29 +02:00
ADmad
7a4244d0a6
More docblock CS fixes.
2014-05-28 22:09:54 +05:30
mark_story
f6c868d706
Fix remaining doc block errors in Console/
2014-05-27 23:34:53 -04:00
mark_story
8f5acb0932
Fix CS errors in skel/
2014-05-27 23:21:32 -04:00
mark_story
bb58bbe642
Fix API doc errors in Console/
2014-05-27 23:16:05 -04:00
Mark Story
f287bc76c0
Force .bat files to have CRLF endings.
...
Newer versions of git convert line endings on checkout. This also causes
these files to show up as always modified when the repo is cloned
because the index and working copy have different line endings.
Hopefully this fixes the issue.
Fixes #3585
2014-05-27 19:06:08 -04:00
Hikkijp
c622a9dfc2
Fixes bug #3581
...
Fixes bug #3581 and the issue noticed by markstory
2014-05-27 17:30:38 -03:00
Hikkijp
f7e98e7427
Revert "Fixes bug described in #3581 "
...
This reverts commit e6c6e0bf2c
2014-05-27 17:25:28 -03:00
