Marc Würth
bf8a13a77c
Added binary type to field type map, defaulting to file input field
...
Refs https://github.com/cakephp/cakephp/issues/2071
2013-10-15 22:25:51 +02:00
Mark Story
8eb247528d
Merge pull request #2135 from bcrowe/htofix-returndocs
...
Add missing return tags
2013-10-14 20:15:06 -07:00
mark_story
5a394c379a
Merge branch 'master' into 2.5
2013-10-14 22:57:50 -04:00
Bryan Crowe
f9435aff27
Add missing return tags
2013-10-14 22:43:17 -04:00
Mark Story
d4ecb7d185
Merge pull request #2134 from dereuromark/master-test-case
...
Make tests pass on win.
2013-10-14 17:47:34 -07:00
euromark
69d0253109
coding standards
2013-10-15 02:07:36 +02:00
euromark
afb6471128
Make tests pass on win.
2013-10-14 23:59:14 +02:00
Mark Story
ce74153389
Merge pull request #1691 from uzyn/2.5-decimal
...
Add support for decimal type in Schema.
Fixes #3171
2013-10-14 08:36:15 -07:00
Mark Story
613dc03832
Merge pull request #2131 from bcrowe/hotfix-cs
...
Remove duplication of throws
2013-10-13 19:14:56 -07:00
Bryan Crowe
bb821a426d
Remove duplication of throws
2013-10-13 21:40:35 -04:00
Mark Story
76e35ca446
Merge pull request #2130 from dereuromark/master-unicode
...
Allow international domains to pass validation.
Fixes #1763
2013-10-13 15:09:34 -07:00
euromark
ed2054f4f2
Allow international domains to pass validation. Fixes #1763
2013-10-13 23:43:29 +02:00
euromark
ee0ed3a43a
coding standards
2013-10-13 18:18:24 +02:00
James Watts
081a3a857f
Updated and revised links to principal resources
2013-10-13 03:00:11 +02:00
Mark Story
8ff3ebdfd5
Merge pull request #2127 from ravage84/patch-2
...
Updated README with link to GitHub Issues instead of Lighthouse
2013-10-12 07:44:51 -07:00
Marc Würth
b73620232a
Updated README with link to GitHub Issues instead of Lighthouse
2013-10-12 16:40:37 +02:00
James Watts
cdfc1830ca
Updated contribution guidelines with references to GitHub
2013-10-12 10:06:25 +02:00
Mark Story
ecd9601d14
Merge pull request #2126 from dereuromark/master-cs
...
cs fixes using phpcs-fixer auto-correction.
2013-10-11 16:32:51 -07:00
euromark
1cb24ae537
CS fixes using phpcs-fixer auto-correction.
2013-10-12 01:27:00 +02:00
Jose Lorenzo Rodriguez
df549898ad
Merge remote-tracking branch 'origin/2.5' into k-halaburda-master
2013-10-12 01:05:02 +02:00
Jose Lorenzo Rodriguez
9673048c30
Merge branch 'master' of github.com:k-halaburda/cakephp into k-halaburda-master
2013-10-12 01:03:20 +02:00
Jose Lorenzo Rodriguez
63b65e2f69
Fixing CS
2013-10-12 00:58:14 +02:00
José Lorenzo Rodríguez
8cdbafd312
Merge pull request #1631 from ovidiupruteanu/patch-2
...
flushMethodCache not working if called before cacheMethod
2013-10-11 15:56:19 -07:00
José Lorenzo Rodríguez
6c2eb6e7c6
Merge pull request #1546 from rchavik/2.3-sqlite-truncate
...
Sqlite::truncate(): Verify `sqlite_sequence` exists before _execute()
2013-10-11 15:52:49 -07:00
José Lorenzo Rodríguez
99620ab58e
Merge pull request #1593 from kimegede/more-readable-code
...
More readable code
2013-10-11 15:51:28 -07:00
Mark Story
3c6d0af01d
Merge pull request #1644 from WyriHaximus/2.5
...
Add CompletionShell to allow easier development of shell scripts to provide autocompletion in environments like bash.
2013-10-11 13:17:05 -07:00
Mark Story
a1a937a6bc
Merge pull request #1718 from cakephp/issue-2931
...
Use App.base when there are no requests to generate URL's
Fixes #2931
2013-10-11 12:29:59 -07:00
mark_story
4265dbcc33
Use App.base when there are no requests to generate URL's
...
Setting App.fullBaseUrl to a non-host value causes issues generating
URL's in a web context. However, not including the base path generates
incorrect URL's in a CLI context. This change allows the use of App.base
to populate the base path which is used as a fallback when there are no
requests, or when the base path is empty.
Refs #2931
2013-10-10 23:07:03 -04:00
mark_story
5aa8a458b1
Update UUID pattern to accept the 'nil' UUID.
...
Fixes #4133
2013-10-10 21:11:55 -04:00
Mark Story
04eae1fc24
Merge pull request #1715 from bcrowe/hotfix-docblocks
...
Additional Cake references to CakePHP and docblock typo.
2013-10-10 09:54:14 -07:00
Frank de Graaf
bc92b1e600
Merge pull request #1716 from ricog/schema-name-and-file
...
SchemaShell: Prevent name param from overwriting file param if both are passed
Fixes #4134 .
2013-10-10 02:20:19 -07:00
Rick Guyer
a091c630d7
Prevent name param from overwriting file if both are passed
2013-10-09 23:20:25 -05:00
Bryan Crowe
46c21a9a20
Revert Cake to CakePHP in ShellDispatcher::_initEnvironment()
2013-10-09 23:41:15 -04:00
Bryan Crowe
4242bd4f3d
Additional Cake references to CakePHP and docblock typo
2013-10-09 19:38:16 -04:00
euromark
ce1939c4d6
Correct argument order.
2013-10-09 20:43:54 +02:00
Mark Story
9f3cf82629
Merge pull request #1714 from bcrowe/hotfix-uuid
...
Capitalize UUID acronym
2013-10-08 20:17:30 -07:00
Bryan Crowe
81c2e9db84
Capitalize UUID acronym
2013-10-08 21:46:30 -04:00
Mark Story
25c4175736
Merge pull request #1713 from ADmad/2.5-modelvalidator-optimize
...
Optimized whitelist jugglery.
2013-10-08 13:31:53 -07:00
Mark Story
166794aa0b
Merge pull request #1711 from dereuromark/2.5-strict
...
Strict checks where applicable.
2013-10-08 13:31:01 -07:00
Mark Story
8f9b75d016
Merge pull request #1712 from dereuromark/master-deprecated
...
Replace deprecated methods.
2013-10-08 13:30:39 -07:00
mark_story
59f441e6bc
Make equality checks more strict.
2013-10-08 16:29:24 -04:00
ADmad
f9c1c2aa7f
Optimized whitelist jugglery.
2013-10-09 00:17:34 +05:30
euromark
b5bd087bc5
Replace deprecated methods.
2013-10-08 20:23:57 +02:00
euromark
eb852a0247
Strict checks where applicable.
2013-10-08 20:16:55 +02:00
mark_story
f82b00c25e
Fix content view variable being stomped by send() parameter.
...
The content of send() should only be used if it is a non-empty value.
Fixes #4129
2013-10-08 12:28:45 -04:00
José Lorenzo Rodríguez
02acf636a7
Merge pull request #1708 from dereuromark/2.5-behavior-whitelist
...
Fix whitelist to be modifiable from behaviors to work with validate.
2013-10-07 23:54:36 -07:00
ADmad
105f032e81
Merge pull request #1705 from Schlaefer/FileLog-RotateOlderLogs
...
fixes FileLog doesn't delete on rotation if count(files) is greater 'rotate'
2013-10-07 20:58:07 -07:00
Mark Story
2cc9be75e3
Merge pull request #1709 from bcrowe/hotfix-url
...
Changed url to URL where appropriate
2013-10-07 20:39:47 -07:00
Bryan Crowe
c1dd0e4393
Changed url to URL where appropriate
2013-10-07 23:17:58 -04:00
euromark
381a8c1216
Simplify test.
2013-10-08 00:47:47 +02:00
