mark_story
c1ab6fa9d1
Merge branch 'master' into 2.5
2014-01-30 10:13:37 -05:00
Mark Story
6eb5a38f22
Merge pull request #2692 from jrbasso/2.5-cors
...
Added support to cross origin requests
2014-01-29 06:45:11 -08:00
Mark Story
8db034cbf1
Merge pull request #2731 from joostdekeijzer/console-extract-not-handling-validation-quotes
...
Console Extract task doesn't handle validation messages with qoutes correctly
2014-01-29 06:43:23 -08:00
Mark Story
5629dfdcc3
Merge pull request #2728 from joostdekeijzer/2721-fix-in-translatebehavior
...
Fix Model::field() and TranslateBehavior::beforeFind() not working together.
Fixes #2721
2014-01-29 06:40:27 -08:00
joostdekeijzer
42daa25340
Fix Console "extract i18n from sources" to handle quotes in Model::validate parameters correctly
2014-01-29 14:53:52 +01:00
joostdekeijzer
987187ef8c
Fix #2721 in TranslateBehavior::beforeFind() supporting both Model::field('fieldname') and Model::read('fieldname')
2014-01-29 13:37:47 +01:00
joostdekeijzer
827c815cf1
correct property comment
2014-01-29 12:25:09 +01:00
Rachman Chavik
b83b59a9d7
Log errors instead of calling trigger_error()
2014-01-29 17:51:07 +07:00
ADmad
c093804b35
Merge branch 'master' into 2.5
2014-01-26 17:39:50 +05:30
José Lorenzo Rodríguez
ddf046a246
Merge pull request #2694 from bar/patch-3
...
Correctly remove routing url from query string.
2014-01-22 05:15:03 -08:00
mark_story
61dd1c3f9d
Fix trailing whitespace.
2014-01-21 20:23:12 -05:00
Juan Basso
dae756c84a
Added option to allowed headers
2014-01-21 15:31:05 -05:00
Ber Clausen
5b4121f643
Update tests.
2014-01-21 16:56:37 -03:00
Juan Basso
5af3da7fe6
Changed tests to support PHP 5.2 :(
2014-01-21 10:44:00 -05:00
Juan Basso
ec7196013c
Added support to cross origin requests
2014-01-21 09:44:49 -05:00
mark_story
55e1619c59
Fix issue with find(count) and TranslateBehavior.
...
Fixes #2667
2014-01-18 21:54:09 -05:00
Rob McVey
7a27650297
Test case that demonstrates issue with count and Translate
2014-01-18 21:49:07 -05:00
mark_story
75dd2ff1fb
Merge branch 'master' into 2.5
2014-01-16 15:20:40 -05:00
mark_story
f25e84f4fb
Don't select year 0 when there are all 0's.
...
Year 0 is almost never a 'good' selection value and causes odd behavior
when paired with MySQL.
Fixes #2658
2014-01-15 10:23:45 -05:00
Matthew Ouyang
84eb46dbdc
allow additional status codes through constructor
...
through $options['statusCodes']
2014-01-14 11:18:57 -05:00
euromark
690f54ad9d
more corrections in order
2014-01-10 00:33:27 +01:00
euromark
3ff23c732f
unify and correct assert order
2014-01-10 00:18:08 +01:00
José Lorenzo Rodríguez
606362d519
Merge pull request #2636 from dereuromark/2.5-title-for-layout
...
Follow the deprecation note in the doc block of View class
2014-01-09 15:13:07 -08:00
euromark
97e43e5806
unify to expected
2014-01-09 16:52:21 +01:00
euromark
738b34c2d0
Correct assert param order
2014-01-09 16:50:27 +01:00
euromark
29e15386b2
Follow the deprecation note of 2.1 migration guide and switch to fetch(title)
...
correct assert order for test
2014-01-09 16:45:49 +01:00
mark_story
b20ca3f4e0
Fix errors with postgres tests.
2014-01-08 09:42:13 -05:00
mark_story
312b2c3cd1
Merge branch 'translate-patch'
2014-01-06 21:21:25 -05:00
mark_story
3763350667
Add test for issue #2595
...
Fold conditions that did the same thing and add a test case.
Closes #2595
2014-01-06 21:21:13 -05:00
euromark
ecfd64c082
adding test
2014-01-06 21:07:00 +01:00
mark_story
3cee3b0e99
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-12-30 21:28:22 -05:00
Rachman Chavik
c48afae2dc
Add test to prove issue when saving invalid tree data
2013-12-27 12:35:28 +07:00
mark_story
1daa27c0d7
Add tests for uncovered case of :0 replacements.
...
There were previously no tests for the :0, :1 style replacement markers
in DboSource. In fact I didn't even know it was a 'feature'.
2013-12-24 13:13:05 -05:00
Mark Story
1cb7e4f0ff
Merge pull request #1635 from dereuromark/master-dom-ids
...
Fix duplicate ID generation of for multiple checkboxes.
2013-12-24 07:02:38 -08:00
euromark
b392254c92
fix cs
2013-12-24 15:20:32 +01:00
mark_story
99e4dbd827
Merge branch 'master' into 2.5
2013-12-23 11:58:07 -05:00
mark_story
70530135d6
Don't use FORWARDED_HOST when getting referer values.
...
HTTP_X_FORWARDED_HOST is supposed to be used by proxies to indicate the
original HTTP_HOST value. It has nothing to do with referer values.
Since the HTTP_X_FORWARDED_HOST is intended to replace the HOST header
in proxied setups, add a trustProxy parameter to host() and default it
to false. This maintains existing behavior and allows people to access
the proxied value.
Fixes #2537
2013-12-23 11:32:14 -05:00
mark_story
62e89734ab
Throw exceptions from Hash::combine()
...
When the key + value counts do not match Hash should throw an exception.
Silently doing the wrong thing is generally not a good idea. While this
change could break existing applications, those applications were
probably behaving incorrectly anyways.
Fixes #2470
2013-12-21 17:46:05 -05:00
José Lorenzo Rodríguez
60d2ece035
Merge pull request #2506 from dereuromark/2.5-string
...
Correct tokenize for empty strings.
2013-12-21 10:31:52 -08:00
mark_story
7e5c0f7185
Merge branch 'master' into 2.5
2013-12-20 14:15:35 -05:00
mark_story
5bddc477a3
Fix incorrectly handled time values around 12:00:00
...
When using 12 hour formats & intervals, values around 12:00 were
incorrecly converted to midnight.
Fixes #2507
2013-12-19 17:36:27 -05:00
euromark
3ecce19732
Correct tokenize for empty strings.
2013-12-19 15:58:08 +01:00
Saleh Souzanchi
bbbf3076ab
undo remove end line break
2013-12-19 00:36:20 +03:30
OKINAKA Kenshin
3433e10fbd
Fix Postgres for bigint primary key.
2013-12-18 14:58:18 +09:00
Saleh Souzanchi
4639d3597c
add DispatcherFilter Settings
2013-12-18 06:54:27 +03:30
ADmad
49a9d24ca7
By default use filter_var() to valid email addresses in CakeEmail.
...
Refs #2477
2013-12-18 01:07:40 +05:30
mark_story
30e139412d
Fix input type inference when type=>checkbox
...
FormHelper should not infer types when the explicit type is checkbox.
Instead the provided type should be used.
Fixes #2491
2013-12-16 23:26:20 -05:00
ADmad
27979286b2
Revert change done in 11f543f1f2.
...
The change is unneeded now as Security::encrypt() no longer throws exception
for falsey values.
2013-12-15 20:29:41 +05:30
ADmad
8a666fb37e
Don't throw exception when trying to encrypt falsey value.
2013-12-15 19:28:56 +05:30
mark_story
e15d1652ed
Relax the 'my' and 'ym' date validation formats.
...
All other formats that include 'y' allow 2006 or 06. These formats are
now conformant with the other formats available.
Closes #2436
2013-12-14 23:02:12 -05:00
