dogmatic69
|
408e619c9f
|
Merge branch '2.3' into type-checks
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
|
2012-10-01 02:08:00 +01:00 |
|
Jose Lorenzo Rodriguez
|
d5c9d97dc1
|
Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
|
2012-09-25 16:36:03 +02:00 |
|
dogmatic69
|
22a2e1b51e
|
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
|
2012-09-14 18:42:25 +01:00 |
|
Kyle Robinson Young
|
bc40ac7d3f
|
Remove unused variables and code
|
2012-09-05 17:19:13 -07:00 |
|
euromark
|
3945c0e6a8
|
rtim files
|
2012-07-18 03:55:29 +02:00 |
|
Jelle Henkens
|
f7ce5262b7
|
Updating mixed @param documentation to seperate list of accepted types
|
2012-05-21 21:55:10 +01:00 |
|
mark_story
|
19e0d8d946
|
Switch usage to Hash where possible.
|
2012-03-26 22:32:53 -04: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 |
|
euromark
|
22452f61f8
|
type hinting controllers and views
|
2012-02-25 19:46:06 -05:00 |
|
0x20h
|
3abfaeecf3
|
Don't let every role inherit from default role. Filter empty aco paths
|
2012-02-05 15:30:26 +01:00 |
|
0x20h
|
4532659fed
|
code cleanup, added some tests
|
2012-01-18 20:59:44 +01:00 |
|
0x20h
|
9838338976
|
docblocks
|
2012-01-13 23:34:35 +01:00 |
|
0x20h
|
bfaea78504
|
allow more elaborate regex rules
|
2012-01-13 23:29:23 +01:00 |
|
0x20h
|
95a41af9db
|
allow multiple roles for a rule to be specified as string or array
|
2012-01-13 22:02:25 +01:00 |
|
0x20h
|
ef5eead038
|
use more appropriate array key when passing options to the adapter
|
2012-01-13 21:55:47 +01:00 |
|
0x20h
|
153152642c
|
PHP configuration file base Acl implementation
|
2012-01-13 21:43:48 +01:00 |
|