José Lorenzo Rodríguez
bf33e1cf57
Merge pull request #3761 from aka-toxa/master
...
improving acl perfomance
2014-06-24 21:58:30 +02:00
José Lorenzo Rodríguez
3df972faa2
Merge pull request #3782 from cakephp/issue-3779
...
Whitelist more URL-y characters in digest parsing.
2014-06-24 21:56:40 +02:00
José Lorenzo Rodríguez
e9e09bf19a
Merge pull request #3788 from dereuromark/master-composer
...
Fix composer app issues with cake.php
2014-06-24 21:56:01 +02:00
euromark
05709908a7
Fix composer app issues with cake.php
2014-06-24 17:49:18 +02:00
Mark
9365913abe
Merge pull request #3789 from suzuki86/fix-typo
...
Fix typo
2014-06-24 17:30:24 +02:00
suzuki86
8f9589f7c8
Fix typo
2014-06-25 00:20:54 +09:00
Mark Story
044065df6f
Merge pull request #3783 from dereuromark/master-cakeplugin-path
...
Mark App::pluginPath as deprecated and don't use it anymore.
2014-06-24 07:38:57 -04:00
euromark
26fe1265ab
Mark App::pluginPath as deprecated and don't use it anymore.
2014-06-24 11:52:29 +02:00
mark_story
b4bcd74e60
Whitelist more URL-y characters in digest parsing.
...
Android clients include a full URL instead of just the URI. Also handle
situations where URLencoded bytes and document fragments are used.
Refs #3779
2014-06-23 14:39:35 -04:00
Anatoliy Petrovskiy
ad678e3988
improving acl perfomance
2014-06-23 13:51:52 +03:00
mark_story
59c3b73f7a
Skip autoloaders for APCIterator
...
We can skip autoloaders for this class as it is provided by
a C extension and will never come from userland code.
2014-06-22 21:22:00 -04:00
mark_story
ffe811935c
Remove else.
...
By returning early we can avoid the else statement entirely.
2014-06-20 16:07:47 -04:00
mark_story
e683616329
Apply patch from 'biesbjerg' to ApcEngine
...
This set of changes allows ApcEngine to work with APCu and newer
versions of APC.
Fixes #3749
2014-06-20 13:59:05 -04:00
Anatoliy Petrovskiy
bb15271622
improving acl perfomance by adding indexes on acl tables and reorganization joins in getting acl node function
2014-06-20 20:49:02 +03:00
José Lorenzo Rodríguez
6a8033aea2
Merge pull request #3759 from dereuromark/master-core-dispatcher
...
make coredispatcher fully BC again
2014-06-20 14:48:14 +02:00
euromark
d81d568cc0
make coredispatcher fully BC again
2014-06-20 14:05:18 +02:00
Mark Story
282a5d1cb5
Merge pull request #3731 from cakephp/issue-3656
...
Fix TextHelper::autoLinkEmail() near HTML
Refs #3656
2014-06-18 09:53:30 -04:00
Mark Story
163cacbd1d
Merge pull request #3734 from voycey/patch-1
...
Add 'research' to the list of uninflected words.
2014-06-18 09:31:54 -04:00
Mark Story
c99c68684b
Merge pull request #3646 from nanapi/no-truncate-fixture
...
Don't truncate test fixtures when the table has been freshly created.
2014-06-18 09:18:24 -04:00
Mark Story
562ed73562
Merge pull request #3726 from dereuromark/master-console-cake-unification
...
DS console cake unification
2014-06-18 08:55:53 -04:00
Dan Voyce
4915639efb
Update Inflector.php
...
Added Research
2014-06-18 11:48:16 +10:00
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
