Commit graph

16154 commits

Author SHA1 Message Date
mark_story
85d72443b6 Remove ext-mbstring dependency.
mbstring is not a hard dependency for 2.x. The Multibyte class can shim
up the missing extension.

Refs #2564
2013-12-29 23:49:17 -05:00
Mark Story
107f883223 Merge pull request #2570 from dereuromark/master-pkpass
Add missing pkpass mimetype
2013-12-29 20:36:08 -08:00
euromark
2f02d0c755 Add missing pkpass mimetype 2013-12-30 01:19:09 +01:00
Mark Story
b728bced73 Merge pull request #2564 from josegonzalez/master
Added composer.json for CakePHP 2.x
2013-12-28 16:08:03 -08:00
Jose Diaz-Gonzalez
c86f9ab3e5 Added composer.json for CakePHP 2.x 2013-12-28 18:24:22 -05:00
Mark Story
b682732c1e Merge pull request #2557 from rchavik/2.4-save-tree-invalid-scope
2.4 save tree invalid scope
2013-12-27 07:17:52 -08:00
Rachman Chavik
c4f8289b53 Fix test by checking against an empty array instead of false 2013-12-27 12:37:39 +07: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
af9611d460 Update version number to 2.4.4 2013-12-23 21:44:46 -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
José Lorenzo Rodríguez
1aaa56575b Merge pull request #2534 from zoghal/master-phpcs-error-fix
fix phpcs error "Missing @throws tag in function comment"
2013-12-23 00:41:00 -08:00
Saleh Souzanchi
328125ad43 Merge branch 'master' into master-phpcs-error-fix 2013-12-23 11:43:54 +03:30
Mark Story
321347e52b Merge pull request #2532 from bar/patch-2
Trivial continue.

fix phpcs error "Missing @throws tag in function comment"
2013-12-23 11:21:18 +03:30
Mark Story
fb8472ae40 Merge pull request #2532 from bar/patch-2
Trivial continue.
2013-12-22 20:03:56 -08:00
Mark Story
d3b7fda961 Merge pull request #2531 from bar/patch-1
Parenthesis are preferred.
2013-12-22 20:03:09 -08:00
ber clausen
e0c85a18bc Trivial continue. 2013-12-22 22:15:47 -02:00
ber clausen
4e70e44247 Parenthesis are preferred. 2013-12-22 22:10:37 -02:00
Mark
0142137d31 Merge pull request #2530 from bar/patch-1
Double rainbow.
2013-12-22 15:58:03 -08:00
ber clausen
98962806cd Double rainbow. 2013-12-22 21:47:19 -02: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
mark_story
df4b978ce4 Clarify the docs for DboSource::fetchAll()
Refs #2508
2013-12-19 17:39:44 -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
Mark Story
ca2fb6fcfc Merge pull request #2503 from dereuromark/master-string
Correct doc block
2013-12-18 09:27:00 -08:00
Mark Story
16237a8163 Merge pull request #2502 from okinaka/fix-postgres-for-bigint-primary-key
Fix Postgres for bigint primary key.
2013-12-18 09:26:21 -08:00
euromark
3100118a4e Correct doc block 2013-12-18 12:10:23 +01:00
OKINAKA Kenshin
3433e10fbd Fix Postgres for bigint primary key. 2013-12-18 14:58:18 +09:00
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
Mark Story
81d14e4f1a Merge pull request #2494 from bcrowe/hotfix-configTimezone
Add Configure timezone to bootstrap
2013-12-16 19:01:37 -08:00
Bryan Crowe
20faace775 Clean up grammar in Configure timezone in bootstrap 2013-12-16 21:59:29 -05:00
Bryan Crowe
3a7650ad9b Remove smart quotes from Configure timezone in bootstrap 2013-12-16 21:51:36 -05:00
Bryan Crowe
4b28254319 Fix whitespace error in Validation utility 2013-12-16 21:40:46 -05:00
mark_story
44b7d013ae Fix whitespace error. 2013-12-16 21:39:06 -05:00
Bryan Crowe
708d462bf9 Add Configure timezone to boostrap 2013-12-16 21:14:32 -05:00
mark_story
01be15d654 Don't always wipe a Model's _schema property when calling setSource()
Only wipe the internal schema cache if listSources() returned a useful
list of sources. Otherwise retain the old schema. This lets datasources
that don't implement listSources to be combined with models that define
static schema properties.

Fixes #2467
2013-12-16 14:42:21 -05:00
mark_story
ef899f0c93 Make API docs easier to read. 2013-12-14 23:08:07 -05:00
mark_story
47497029bb Fix mixed tabs/spaces. 2013-12-14 23:03:34 -05:00
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
mark_story
15c390586f Pull out some re-used subpatterns.
Having smaller segments makes reading the larger patterns simpler, and
allows for less duplication across the various patterns.

Refs #2436
2013-12-14 18:20:20 -05:00
Mark Story
384c3a815d Merge pull request #2350 from tuffz/formatting_app_uses_blocks
formatting app::uses blocks
2013-12-14 12:37:02 -08:00
mark_story
79701af501 Make Hash::numeric() accept more numeric things.
Negative numbers and other stringy forms of numbers should be accepted.
The name Hash::numeric implies is_numeric which it now uses.

Fixes #2478
2013-12-12 17:41:38 -05:00
Jose Lorenzo Rodriguez
fc6edf4d9c Fixed small coding standard error 2013-12-12 09:07:00 +01:00
ADmad
87440bba87 Fixed docblock. Closes #2476 2013-12-12 11:00:29 +05:30
mark_story
3b867a048e Add test for saveMany + validate=false.
Closes #2468
2013-12-11 12:43:18 -05:00
mark_story
2a58e529b7 Merge branch 'glorand-master'
Fix Hash::extract() operating on non-array data.

Closes #2433
2013-12-09 12:17:36 -05:00
mark_story
edcfe2d3a8 Add tests for #2433 2013-12-09 12:17:25 -05:00
José Lorenzo Rodríguez
6358741944 Merge pull request #2449 from cakephp/fix-session-cyclic-error
Fixed error in CakeSession that would call start() in an infinite loop
2013-12-09 02:18:21 -08:00
mark_story
abf4af14a8 Change quotes to keep postgres happy. 2013-12-08 11:58:26 -05:00