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 |
|
Ceeram
|
89ecd95e55
|
fix failing tests
|
2013-03-18 18:47:05 +01:00 |
|
Ceeram
|
b28ea65b24
|
stop execution when unauthenticated, to prevent the page to show when canceling auth popup
|
2013-03-18 15:41:34 +01:00 |
|
ADmad
|
b7834a2b16
|
Implemented stateless login for Auth
|
2013-03-10 00:11:35 +05:30 |
|
ADmad
|
a9bbfd80c7
|
Added type hinting
|
2013-02-09 18:09:11 +05:30 |
|
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 |
|
Tigran Gabrielyan
|
3c4087da4f
|
Fixing default value of contain
|
2012-04-04 19:06:54 -07:00 |
|
Tigran Gabrielyan
|
bf628c493c
|
Added ability for Auth login to use contain
|
2012-04-04 18:09:38 -07:00 |
|
Juan Basso
|
c754fb2dcb
|
Updated copyright to 2012.
|
2012-03-12 22:46:46 -04:00 |
|
mark_story
|
61aba0f0f8
|
Fix most coding standard issues in Controller.
|
2012-03-03 19:27:46 -05:00 |
|
Thomas Ploch
|
521dff8468
|
Added 'recursive' settings option to BaseAuthenticate and BasicAuthenticate to have a bit more fine grained control in custom Authenticate objects.
|
2011-10-19 17:54:08 +02:00 |
|
Juan Basso
|
0575e92833
|
Added visibility in some methods and attributes.
|
2011-08-18 22:30:28 -04:00 |
|
Juan Basso
|
16ef234180
|
Removing trailing spaces.
|
2011-08-15 23:55:08 -04: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 |
|
Jose Lorenzo Rodriguez
|
0696dd9200
|
Fixing BasicAuthenticate test
|
2011-03-05 19:37:56 -04:30 |
|
Jose Lorenzo Rodriguez
|
f1e2f5e949
|
Starting to migrate AuthComponent to the new class loader
|
2011-03-05 17:40:42 -04:30 |
|
Jose Lorenzo Rodriguez
|
3ee49c0c5c
|
Moving BaseAuthenticate class
|
2011-03-05 17:37:09 -04:30 |
|