 Jose Lorenzo Rodriguez
|
343d3279b9
Merge branch 'master' into 2.5
|
12 years ago |
 euromark
|
0d09a54033
more missing doc block tags added
|
12 years ago |
|
euromark
|
690f54ad9d
more corrections in order
|
12 years ago |
 mark_story
|
c2b8778ce8
Merge branch 'master' into 2.5
|
12 years ago |
|
Mark Story
|
384c3a815d
Merge pull request #2350 from tuffz/formatting_app_uses_blocks
|
12 years ago |
|
mark_story
|
97ab2c0e9b
Merge branch 'imsamurai-2.5' into 2.5
|
12 years ago |
|
mark_story
|
71312932e8
Merge branch 'master' into 2.5
|
12 years ago |
|
mark_story
|
ec38ee1c48
Only enable cacheSources if both the datasource + model agree on it.
|
12 years ago |
 ADmad
|
dda6080579
Merge branch 'master' into 2.5
|
12 years ago |
 Eric Büttner
|
1e3865acc7
formatting app::uses blocks (refs #2265)
|
12 years ago |
 imsamurai
|
20dc92291e
fix broken test
|
12 years ago |
|
imsamurai
|
8bcfe452da
not add `unsigned` to not numeric fields, fix broken test, add new test
|
12 years ago |
 Marc Würth
|
7cfa0116f4
Removed "PHP 5" from file header DocBlocks
|
12 years ago |
|
Jose Lorenzo Rodriguez
|
9673048c30
Merge branch 'master' of github.com:k-halaburda/cakephp into k-halaburda-master
|
12 years ago |
|
euromark
|
b5bd087bc5
Replace deprecated methods.
|
12 years ago |
 k-halaburda
|
9ad75e078a
Successfully :)
|
12 years ago |
|
mark_story
|
675f828e16
Remove insertQuery and deleteQuery.
|
12 years ago |
|
k-halaburda
|
d7dab3282f
Remove added fixtures and use existing. Updated one old test to add data from afterFind callback
|
12 years ago |
|
euromark
|
1339a9dfe1
coding standards according to new sniffer rules
|
12 years ago |
|
euromark
|
a643295e4c
remove @access and unnecessary $name
|
12 years ago |
|
Marc Würth
|
4c9f0414cb
Improved the DocBlocks and other code cleanup
|
13 years ago |
 Ceeram
|
8374eb92cc
fix failing tests. test and mocked sources would cause exceptions
|
13 years ago |
 Graham Weldon
|
66d856d883
Added extra line for referencing license file for copyright
|
13 years ago |
|
Graham Weldon
|
7b860debe4
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
|
13 years ago |
|
Ceeram
|
16be9d4990
remove unused local vars
|
13 years ago |
|
euromark
|
11a88042bd
fix doc block endings
|
13 years ago |
|
euromark
|
b811afbc44
double spaces to single ones
|
13 years ago |
|
José Lorenzo Rodríguez
|
a8bd7c6678
Merge pull request #961 from dereuromark/2.3-unify-object-collection
|
13 years ago |
|
mark_story
|
554d5794ce
Merge branch 'master' into 2.3
|
13 years ago |
|
mark_story
|
08cde9f5a2
Fix foreach error when useTable = false.
|
13 years ago |
