mark_story
1e49be3472
Fix stack traces not being highlighted correctly.
...
Fixes #3439
2012-12-08 20:48:45 -05:00
dogmatic69
49ea72e53e
rename the method and fix docblock return type
2012-12-08 13:10:12 +00:00
mark_story
b1aa75bec0
Fix coding standards.
2012-12-07 22:06:15 -05:00
Mark Story
38c592928d
Merge pull request #1000 from dogmatic69/validation-simplify
...
Validation simplify
Simplify internals in Model/Validation
2012-12-07 19:00:46 -08:00
mark_story
8b0a7ee13d
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-12-07 20:53:10 -05:00
mark_story
6cf6903982
Fix incorrect argument order.
2012-12-07 14:40:27 -05:00
dogmatic69
b3dba95b7d
making uuid field check protected
2012-12-07 02:24:12 +00:00
dogmatic69
521a759911
refactor uuid checks into a method
2012-12-07 02:22:24 +00:00
Mark Story
6bfbce128f
Merge pull request #1004 from dogmatic69/hash-expand-integer-key
...
Fix issue where Hash::expand() sets incorrect array keys
Fixes #3434
2012-12-06 17:44:07 -08:00
dogmatic69
85de93a4a7
fixing issue where merge is renumbering array keys
2012-12-07 01:26:14 +00:00
Mark Story
00d178fa28
Merge pull request #999 from dogmatic69/model-simplify
...
Simplify some model code
2012-12-05 18:18:50 -08:00
Mark Story
8e6909625f
Merge pull request #1002 from dereuromark/2.3-new-lines
...
unify new lines at the end of the file
2012-12-05 18:16:50 -08:00
euromark
881127ef4d
unify new lines at the end of the file
2012-12-05 15:00:24 +01:00
dogmatic69
b92b7c2d2d
removing variables that are unnecessarily used
2012-12-05 10:55:11 +00:00
dogmatic69
0ada30f3bc
removing nested if statement
2012-12-05 10:54:30 +00:00
dogmatic69
b99066ddd9
simplify some model code
...
remove nested if's and else where possible and early return.
2012-12-04 02:06:20 +00:00
dogmatic69
03882f4b55
fix up the fails
2012-12-04 01:58:57 +00:00
ADmad
06c3f01af6
Fix docblock
2012-12-04 03:18:35 +05:30
Mark Story
5ccba463bc
Merge pull request #998 from dereuromark/2.3-bake-fixture-fix
...
Remove double semicolon in generated fixtures.
Fixes #3429
2012-12-03 12:55:56 -08:00
dogmatic69
24abed969a
simplify validation code
2012-12-03 15:51:20 +00:00
euromark
41f2d812bb
fix ticket 3429
2012-12-03 12:31:56 +01:00
mark_story
002700071d
Fix incorrectly quoted fields when using the || operator.
...
Fixes #3404
2012-12-02 20:59:56 -05:00
Jose Lorenzo Rodriguez
9bcc05b18b
Update version number to 2.3.0-RC1
2012-12-02 23:22:43 +01:00
Jose Lorenzo Rodriguez
0b508b887a
Update version number to 2.2.4
2012-12-02 23:15:46 +01:00
Mark Story
ab07eba4af
Merge pull request #995 from zoghal/fix-utf8-pattern-in-router
...
fixed utf-8 pattern in router option
2012-12-02 07:49:08 -08:00
Saleh Souzanchi
d5283af818
fixed utf-8 pattern in router option
2012-12-02 16:30:45 +03:30
Kyle Robinson Young
ff26db5d44
Add .editorconfig file.
...
Config file to help define the code style for supported editors and IDEs.
http://editorconfig.org
2012-12-01 22:13:01 -08:00
Jose Lorenzo Rodriguez
c1551d9828
Merge branch 'master' into 2.3
2012-12-02 00:34:55 +01:00
Jose Lorenzo Rodriguez
da4fdbac3a
Fixing failing test case
2012-12-02 00:34:26 +01:00
Jose Lorenzo Rodriguez
0f5fa290ed
Merge remote-tracking branch 'origin/master' into 2.3
2012-12-01 23:19:53 +01:00
José Lorenzo Rodríguez
99e84b8a08
Merge pull request #930 from LiquidityC/2.3_3315_viewblock_startifempty
...
Added: View::startIfEmpty($name)
2012-12-01 14:06:55 -08:00
José Lorenzo Rodríguez
dfb154464e
Merge pull request #994 from dereuromark/2.3-missing-elements
...
make View trigger notice if elements are missing.
2012-12-01 13:38:54 -08:00
José Lorenzo Rodríguez
dc370826af
Merge pull request #918 from bar/2.3-form-empty-error
...
Calling Form->input() with 'errorMessage'=> false should trigger field error, but not render error element.
2012-12-01 13:09:35 -08:00
euromark
d4af674ccb
doc block correction
2012-12-01 10:34:02 +01:00
mark_story
479aefc438
Update TLD validation to accept gTLD variations
...
The upcoming gTLD extensions will allow much more variety in TLD names.
Loosen the validation to better accept different length TLDs.
Fixes #3414
2012-11-30 22:11:57 -05:00
ADmad
2bc5988674
Added ConfigReaderInterface::dump() and made all readers' dump() method support 'Plugin.keyname' format for keys. Closes #3363
2012-12-01 00:09:43 +05:30
mark_story
889c1ebc09
Fix sorting empty data with Hash & Set.
...
Fixes #3420
2012-11-30 13:05:14 -05:00
euromark
e1e4d93134
make View trigger notice by default if elements are missing
...
and add elementExists() method
2012-11-30 14:11:45 +01:00
ADmad
4a6ebaa07b
Added Helper::$settings
2012-11-30 12:19:40 +05:30
ADmad
1de8ed18de
Avoiding specifying 'maxLimit' too when setting 'limit' greater than default 'maxLimit' in code.
2012-11-30 11:26:10 +05:30
Mark Story
68976a028e
Merge pull request #990 from beeman/minor-js-fix
...
Minor js fix, makes two files in test suite valid JavaScript
2012-11-29 18:10:40 -08:00
Mark Story
0230fa102a
Merge pull request #975 from dereuromark/2.3-i18n
...
use CakeSession wrapper in i18n class
2012-11-28 18:33:39 -08:00
Thomas Ploch
7f0085cd4e
Added type hinting to Model::validator()
...
Added missing param and fixed typo in method's phpdoc.
Used 'assertSame' and 'assertNotSame'. Removed piped NULL type from phpdoc.
Simplify condition in Model::validator()
2012-11-28 21:32:00 -05:00
mark_story
ffcf71c810
Merge branch 'master' into 2.3
2012-11-28 21:30:15 -05:00
mark_story
f250592fee
Fix multi-model validators with deep & atomic.
...
Apply patch from 'Christian Buffin' to fix validateMany() and
validateAssociated() when atomic=false & deep=true are used in
conjunction. Using Hash to flatten the nested set of validation results
yields the correct results.
Fixes #3352
2012-11-28 21:26:40 -05:00
mark_story
35d67bf4a8
Merge branch 'master' into 2.3
2012-11-28 21:00:30 -05:00
José Lorenzo Rodríguez
4366f9c1e0
Merge pull request #991 from ADmad/2.3-docblock
...
Docblock fixes
2012-11-28 15:11:53 -08:00
ADmad
72d6ca636f
Docblock fixes
2012-11-29 04:36:29 +05:30
Bram Borggreve
f69fe20376
Makes sure these two files are valid JavaScript by adding comment marks
...
to them, this way editors (NetBeans 7.3 for instance) stop marking them
invalid.
2012-11-28 15:29:50 +01:00
mark_story
966c69cb98
Fix missing plugin parameters in scaffolding.
...
Add missing plugin parameter to scaffolded associations.
This improves link generation and correctness overall.
Fixes #3396
2012-11-27 21:59:06 -05:00