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 |
|
ADmad
|
dd2892ad8d
|
Added password hasher
|
2013-05-26 11:29:06 +05:30 |
|
Jose Lorenzo Rodriguez
|
db6dd18f86
|
Fixing case where it was possible to pass array data to FormAuthenticate
fields
|
2013-04-24 22:33:24 +02: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 |
|
Heath Nail
|
d24bbcb255
|
Add BlowfishAuthenticate adapter.
|
2012-08-23 11:23:51 -04:00 |
|
Ceeram
|
f0bd7386e2
|
created, modified and updated fields now use static timestamp in testcases
|
2012-04-21 17:38:49 +02:00 |
|
Juan Basso
|
3b1bd90ad6
|
Updated copyright to 2012.
|
2012-03-12 22:46:07 -04:00 |
|
mark_story
|
edb582944c
|
Fix coding standards in Test/Case/Controller
|
2012-03-11 22:20:25 -04:00 |
|
Kyle Robinson Young
|
4176e59e52
|
Typo fixes in tests
|
2012-02-23 15:29:53 -08:00 |
|
Kyle Robinson Young
|
22582aee63
|
Upgrade legacy uses of App::build() types
|
2012-02-18 04:31:29 -08:00 |
|
Kyle Robinson Young
|
c4829dc3b8
|
Use App::RESET instead of true with App::build()
|
2012-02-18 04:04:54 -08:00 |
|
Ceeram
|
7d6637f55b
|
ensure test doesnt fail by 1 second diff in timestamp
|
2011-11-22 10:57:36 +01:00 |
|
Gun.io Whitespace Robot
|
4742168253
|
Remove whitespace [Gun.io WhitespaceBot]
|
2011-10-28 18:25:08 -04:00 |
|
Majna
|
8c3f64be52
|
Fixing doc blocks in Test suite and some visibility keywords.
|
2011-10-10 23:18:48 +02:00 |
|
Jose Lorenzo Rodriguez
|
0a2553cce5
|
Making model tests less time dependent
|
2011-10-03 14:51:07 -04:30 |
|
Jose Lorenzo Rodriguez
|
cfd2d9e00b
|
Updating all @package annotations in doc blocks
|
2011-07-26 01:46:14 -04:30 |
|
Jose Lorenzo Rodriguez
|
a34358faa4
|
Fixing FormAuthenticateTest for Sqlsrv
|
2011-06-21 14:29:18 -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 |
|
Ceeram
|
005c690d94
|
Fixing incorrect filename for FormAuthenticateTest
|
2011-05-26 21:44:45 +02:00 |
|