ADmad
|
61bf8df454
|
Renaming base url config keys and methods for better uniformity.
|
2013-08-01 00:44:36 +05:30 |
|
ADmad
|
b7cee8ff57
|
Ensure Configure::boostrap() doesn't overwrite existing configs under 'App' key.
Fixes #3874
|
2013-07-31 17:24:36 +05:30 |
|
ADmad
|
d161b21ae1
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
|
2013-07-14 10:58:55 +05:30 |
|
mark_story
|
960ce7fa81
|
Don't use inline assignment.
CakePHP generally avoids inline assignment as it can be confusing and do
the wrong thing.
|
2013-07-09 21:11:06 -04:00 |
|
ADmad
|
4ded269549
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
lib/Cake/VERSION.txt
|
2013-07-07 12:22:12 +05:30 |
|
euromark
|
e7f380d2b7
|
doublespace to single space
|
2013-07-05 14:36:40 +02:00 |
|
euromark
|
c989624f80
|
whitespace coding standards
|
2013-07-05 14:15:18 +02:00 |
|
mark_story
|
c685f6ca13
|
Make check for .. more specific.
A `..` anywhere in the classname is invalid.
|
2013-07-04 21:40:30 -04:00 |
|
mark_story
|
c597855fe4
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Test/Case/Network/CakeRequestTest.php
|
2013-07-03 14:21:09 -04:00 |
|
mark_story
|
36d8473215
|
Make check for .. more specific.
A `..` anywhere in the classname is invalid.
|
2013-07-03 14:19:39 -04:00 |
|
mark_story
|
9754789b69
|
Don't load classnames with .. in their names.
Classnames with . in them are invalid and can be leveraged to load code
outside of an application by traversing directories.
|
2013-07-01 21:21:20 -04:00 |
|
mark_story
|
cd3c54bb9d
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/VERSION.txt
|
2013-06-10 22:12:10 -04:00 |
|
euromark
|
4518624187
|
more whitespace coding standard corrections
|
2013-06-09 17:39:48 +02:00 |
|
José Lorenzo Rodríguez
|
3b4a4fde31
|
Merge pull request #1317 from lorenzo/feature/full-base-url
Adding App.fullbaseURL as a recognized Configure value
|
2013-06-05 15:12:27 -07:00 |
|
ADmad
|
3303a2cda1
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
|
2013-06-02 18:03:59 +05:30 |
|
Marc Würth
|
4c9f0414cb
|
Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
|
2013-05-31 00:11:19 +02:00 |
|
Jose Lorenzo Rodriguez
|
4bc92b822e
|
Adding App.fullbaseURL as a recognized Configure value
|
2013-05-30 16:07:26 +02:00 |
|
mark_story
|
cdede82b7e
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Core/Object.php
|
2013-05-07 22:22:48 -04:00 |
|
ADmad
|
43b77bc0b5
|
Move App::uses() calls above the class.
Improve docblock for Object::log().
|
2013-05-07 03:30:19 +05:30 |
|
ADmad
|
a10275fb8b
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
|
2013-05-05 14:36:46 +05:30 |
|
euromark
|
09d9efe235
|
spelling corrections (a url to an URL, unify URL)
|
2013-04-29 11:05:17 +02:00 |
|
mark_story
|
3fc627c5f8
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
lib/Cake/Error/ErrorHandler.php
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
lib/Cake/View/Helper/HtmlHelper.php
|
2013-03-30 22:12:27 -04:00 |
|
euromark
|
2df65fe9da
|
Add missing App::uses() to avoid fatal error
|
2013-03-27 17:03:24 +01:00 |
|
mark_story
|
041c2d289f
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Console/Shell.php
|
2013-03-26 20:31:54 -04:00 |
|
mark_story
|
819029e1f3
|
Only load the object cache when requested.
Instead of loading a cache key that may not exist on every request, it
should only be loaded when required.
Fixes #3717
|
2013-03-20 21:26:42 -04:00 |
|
mark_story
|
4b13e0a5f2
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/VERSION.txt
|
2013-03-04 21:55:29 -05:00 |
|
Phally
|
83f6161d1d
|
Fixes API parse error for link to Configure::read() in the book.
|
2013-03-03 20:10:09 +01:00 |
|
Jad Bitar
|
8eb5ce410a
|
Add scopes to Object::log() signature.
|
2013-03-01 22:25:10 -05:00 |
|
euromark
|
111366d5c8
|
== to === and != to !== where applicable
|
2013-02-12 03:38:08 +01:00 |
|
Graham Weldon
|
66d856d883
|
Added extra line for referencing license file for copyright
|
2013-02-08 21:22:51 +09:00 |
|
Graham Weldon
|
7b860debe4
|
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
|
2013-02-08 20:59:49 +09:00 |
|
ADmad
|
970fdca89d
|
Added feature to ignore include errors for CakePlugin
|
2013-01-09 01:08:42 +05:30 |
|
Ceeram
|
3f4d24bfc0
|
remove unused local variables and a few improvements
|
2012-12-23 13:53:13 +01:00 |
|
euromark
|
b811afbc44
|
double spaces to single ones
|
2012-12-22 23:48:15 +01:00 |
|
ADmad
|
2bc5988674
|
Added ConfigReaderInterface::dump() and made all readers' dump() method support 'Plugin.keyname' format for keys. Closes #3363
|
2012-12-01 00:09:43 +05:30 |
|
mark_story
|
60f9626838
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Test/Case/View/MediaViewTest.php
|
2012-11-02 16:52:51 -04:00 |
|
mark_story
|
9ce70044b0
|
Fix missing query arguments in array urls.
Adding documented features that previously wasn't implemented.
Fixes #3328
|
2012-11-02 16:46:36 -04:00 |
|
dogmatic69
|
641ba9f3e6
|
Merge branch '2.3' into type-checks
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
|
2012-10-24 19:03:44 +01:00 |
|
AD7six
|
35686c9293
|
use the right language domain
these messages are for developers, not end users
|
2012-10-22 10:55:40 +02:00 |
|
Adam Taylor
|
4090c2e932
|
Remove trailing whitespace from comments
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
|
2012-10-15 18:19:37 -06:00 |
|
dogmatic69
|
408e619c9f
|
Merge branch '2.3' into type-checks
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
|
2012-10-01 02:08:00 +01:00 |
|
Jose Lorenzo Rodriguez
|
d5c9d97dc1
|
Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
|
2012-09-25 16:36:03 +02:00 |
|
Mark Story
|
89c98233b5
|
Merge pull request #843 from dereuromark/2.3-ticket-3172
check() for CookieComponent and Configure
|
2012-09-14 18:22:34 -07:00 |
|
euromark
|
6d3e0a25b2
|
save some memory usage (PHP < 5.4) in case of huge content and cut off the isset call
|
2012-09-15 02:33:05 +02:00 |
|
dogmatic69
|
cf8fccae96
|
converting $foo == null / $foo == false to !$foo
|
2012-09-14 18:26:30 +01:00 |
|
Kyle Robinson Young
|
bc40ac7d3f
|
Remove unused variables and code
|
2012-09-05 17:19:13 -07:00 |
|
mark_story
|
6664acba79
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/VERSION.txt
|
2012-09-05 20:15:36 -04:00 |
|
Kyle Robinson Young
|
200dd2dc9b
|
Code standards fixes, unneeded break statements
|
2012-09-04 11:30:52 -07:00 |
|
euromark
|
2170d87488
|
check() for CookieComponent and Configure (similar to CakeSession::check() )
|
2012-09-04 01:04:48 +02:00 |
|
mark_story
|
4487673060
|
Merge branch 'master' into 2.3
|
2012-08-09 20:43:47 -04:00 |
|