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 |
|
Angel S. Moreno
|
2c4e9dc8f6
|
Added Aliasing of Tasks in the TaskCollection() class and added tests
|
2013-05-03 01:53:37 -04: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 |
|
Ceeram
|
16be9d4990
|
remove unused local vars
|
2013-01-23 17:22:06 +01:00 |
|
euromark
|
8acdb129b2
|
unify object load/unload and loaded methods
|
2012-11-16 12:14:28 +01:00 |
|
Kyle Robinson Young
|
b8488b8dfe
|
Update 1.x @link in docblocks
|
2012-04-26 19:49:18 -07:00 |
|
Juan Basso
|
3b1bd90ad6
|
Updated copyright to 2012.
|
2012-03-12 22:46:07 -04:00 |
|
mark_story
|
ed1d34accc
|
Fix most coding standards issues in Test/Console
|
2012-03-10 23:32:02 -05:00 |
|
mark_story
|
2e8498e166
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
|
2011-12-11 22:51:40 -05:00 |
|
Kyle Robinson Young
|
1e1c7a036d
|
Code consistency formatting tweaks
|
2011-12-06 12:52:48 -08:00 |
|
Kyle Robinson Young
|
5388237099
|
Consistently setting setUp() and tearDown() on test cases
|
2011-12-04 13:27:51 -08:00 |
|
ADmad
|
90b007ef75
|
Implemented priority based triggering of callbacks for objects in collection
|
2011-11-17 12:36:54 +05:30 |
|
mark_story
|
3f506b287b
|
Rename file.
Fix build error caused by legacy workaround fixes.
|
2011-11-13 16:48:52 -05:00 |
|
Renan Gonçalves
|
1cf67b1e55
|
Little cleanup in exceptions.
- Removed duplicated or non-used exceptions.
- Making the error messages more descriptive and stardard.
|
2011-10-15 20:08:02 +02:00 |
|
Jose Lorenzo Rodriguez
|
cfd2d9e00b
|
Updating all @package annotations in doc blocks
|
2011-07-26 01:46:14 -04:30 |
|
Juan Basso
|
192812ee7f
|
Updating the copyright to 2011.
|
2011-05-30 22:32:43 -04:00 |
|
Renan Gonçalves
|
438050dcaa
|
Adding 'public' visibility to all public methods.
|
2011-05-30 22:02:32 +02:00 |
|
AD7six
|
8e27cf992f
|
correct a few missing constant replacements
|
2011-05-15 18:49:38 +02:00 |
|
AD7six
|
afa8f6b441
|
remove LIBS constant
libs always means the Cake lib - so use the CAKE constant
|
2011-05-15 18:29:52 +02:00 |
|
Jose Lorenzo Rodriguez
|
8746a485bd
|
Search and replace for changed paths
|
2011-05-13 02:53:35 -04:30 |
|
Jose Lorenzo Rodriguez
|
900dfef2f7
|
Starting unification of casing in remaining folders
|
2011-05-13 01:53:49 -04:30 |
|