Bryan Crowe
|
4242bd4f3d
|
Additional Cake references to CakePHP and docblock typo
|
2013-10-09 19:38:16 -04:00 |
|
Adam Taylor
|
186f2a27e0
|
Make the "pr" function use printf instead of echo sprintf
|
2013-09-10 19:52:18 -06:00 |
|
euromark
|
b09dc7213a
|
deprecate Controller::flash() and adjust some other deprecation messages.
|
2013-08-12 12:51:12 +02: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
|
af455b4121
|
correct return types in doc blocks
|
2013-07-05 17:19:22 +02:00 |
|
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
|
c597855fe4
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Test/Case/Network/CakeRequestTest.php
|
2013-07-03 14:21:09 -04:00 |
|
euromark
|
f389435bae
|
coding standards and else block simplification
|
2013-07-03 19:27:17 +02:00 |
|
euromark
|
7cb19b97db
|
coding standards and simplification of else cases as well as some minor fixes
|
2013-07-03 00:52:48 +02:00 |
|
ADmad
|
12da3b1f27
|
Merge branch 'master' into 2.4
|
2013-06-16 13:07:44 +05:30 |
|
mark_story
|
fe809cd85d
|
Remove undocumented magic features for IIS.
Undocumented, untested features break very easily. It is best to not
have them where possible.
|
2013-06-13 18:01:11 -04: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 |
|
Christian Winther
|
d14f0cece4
|
debug() in CLI should include newline..
If not, two debug() statements after each other is very hard to read, as the #### separater is on the same line
|
2013-05-28 11:57:59 +00:00 |
|
mark_story
|
92d215df4d
|
Merge branch 'pr-cli' into 2.4
From pull request 1142
|
2013-02-28 21:23:03 -05:00 |
|
dogmatic69
|
b0280b27b1
|
adding new lines for cli
|
2013-02-16 16:28:56 +00:00 |
|
dogmatic69
|
56a334146e
|
making pr() usable in terminal
|
2013-02-16 12:16:00 +00: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 |
|
euromark
|
b811afbc44
|
double spaces to single ones
|
2012-12-22 23:48:15 +01:00 |
|
Ceeram
|
a8eca60fc5
|
fix coding standards
|
2012-12-10 17:40:12 +01:00 |
|
mark_story
|
27d7e2865e
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
|
2012-11-20 23:02:33 -05:00 |
|
Ceeram
|
6d0e32e642
|
fix coding standards, remove break after return/continue
|
2012-11-15 12:09:14 +01:00 |
|
Ceeram
|
56225bcca3
|
fix all warnings except TODO warnings
|
2012-11-14 12:56:10 +01: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 |
|
euromark
|
17be6d0472
|
remove default value for debug's first argument
|
2012-10-12 16:14:17 +02:00 |
|
euromark
|
7bf08fdcc7
|
default value null makes more sense. add test cases for false.
|
2012-10-12 16:03:05 +02:00 |
|
dogmatic69
|
cfadc4dbb0
|
strict type checks and removing some duplicate count() calls by setting a variable
|
2012-09-14 19:26:00 +01:00 |
|
AD7six
|
99b798fa9a
|
make it possible to override all of basics.php
|
2012-09-06 10:19:06 +02:00 |
|
Simon East
|
1ea457e40e
|
Prevent booleans from being encoded (converted to strings) by h() function, helps prevent accidental fatal errors in some PHP versions around 5.2.9
|
2012-07-20 12:48:57 +10:00 |
|
Ceeram
|
4c6453501e
|
Merge branch '2.1' into 2.2
|
2012-06-02 01:47:21 +02:00 |
|
Rachman Chavik
|
483d7124dd
|
debug() may output path that is incorrectly truncated
This happens when debug is called in core source files that resides in
a different directory to the app.
|
2012-06-01 15:28:06 +07:00 |
|
Jelle Henkens
|
f7ce5262b7
|
Updating mixed @param documentation to seperate list of accepted types
|
2012-05-21 21:55:10 +01:00 |
|
Juan Basso
|
a233460c7f
|
Adding file lock when use cache function. It will avoid errors when view cache is created by 2 threads concurrently.
|
2012-04-21 21:01:58 -04:00 |
|
Kyle Robinson Young
|
e2a46f76c7
|
substr() optimizations
|
2012-03-28 13:07:26 -07:00 |
|
Juan Basso
|
3b1bd90ad6
|
Updated copyright to 2012.
|
2012-03-12 22:46:07 -04:00 |
|
mark_story
|
82d8df9c3e
|
Fix more coding standards.
|
2012-03-10 22:30:56 -05:00 |
|
Kyle Robinson Young
|
c7963835c7
|
Correct path in debug()
|
2012-03-05 14:44:45 -08:00 |
|
mark_story
|
664b0538b8
|
Fix more coding standards problems.
|
2012-03-04 22:49:38 -05:00 |
|
mark_story
|
6d269ce25d
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Command/TestsuiteShell.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Model/Datasource/Database/Sqlite.php
lib/Cake/Test/Case/Model/ModelTestBase.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
|
2011-12-03 13:45:28 -05:00 |
|
Kyle Robinson Young
|
5876744709
|
Adhering to coding standards
|
2011-11-30 07:44:11 -08:00 |
|
Kyle Robinson Young
|
1d843f84b9
|
Add @link to global functions
|
2011-11-26 14:42:37 -08:00 |
|
mark_story
|
21cd3f00ac
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Test/Case/BasicsTest.php
|
2011-11-19 20:40:07 -05:00 |
|
Dean Sofer
|
e6c49766c7
|
Unnecessary if statement. The else clause covers all necessary scenarios
|
2011-11-19 17:08:46 -08:00 |
|
mark_story
|
2f599e8a2a
|
Removing extra new lines.
Removing extra new lines and duplicated tests.
|
2011-11-16 21:51:49 -05:00 |
|
mark_story
|
fa0ec44dfd
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
lib/Cake/Test/Case/Error/ExceptionRendererTest.php
lib/Cake/Test/Case/Utility/DebuggerTest.php
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
|
2011-11-16 21:31:16 -05:00 |
|
Marko Marković
|
73429b357f
|
Fixed inconsistent debug parameters and empty '(line )'
|
2011-11-04 14:58:06 +01:00 |
|
mark_story
|
0304bb8796
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
|
2011-11-03 22:04:00 -04:00 |
|