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 |
|
Juan Basso
|
c754fb2dcb
|
Updated copyright to 2012.
|
2012-03-12 22:46:46 -04:00 |
|
Ceeram
|
2897c72215
|
AclNode now extends Model, to avoid infinite loop when attaching AclBehavior to AppModel
Conflicts:
lib/Cake/Model/AclNode.php
lib/Cake/Model/Aco.php
lib/Cake/Model/Aro.php
|
2012-02-10 23:38:40 +01:00 |
|
euromark
|
9d6ea57c30
|
Fix missing App::uses() added
Fixes #2374
Signed-off-by: mark_story <mark@mark-story.com>
|
2011-12-14 08:08:35 -05:00 |
|
Kyle Robinson Young
|
c836ba08a3
|
Add/move docblocks to make text available in the API docs
|
2011-12-08 07:35:02 -08:00 |
|
Juan Basso
|
9bc3e567c1
|
Removed the @access and @static.
|
2011-07-30 20:56:48 -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 |
|
José Lorenzo Rodríguez
|
4c0e06c451
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/bootstrap.php
cake/libs/view/helpers/js.php
lib/Cake/Model/AclNode.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/bootstrap.php
lib/Cake/tests/cases/libs/controller/controller.test.php
|
2011-01-02 02:00:03 -04:30 |
|
José Lorenzo Rodríguez
|
eed6d26ab6
|
Extracting acl model classes to their own files
|
2010-12-22 00:01:03 -04:30 |
|