Commit graph

16214 commits

Author SHA1 Message Date
Cameri
2b234236d6 Removed /mpm from 'url' option for last test in JqueryEngineHelper::testRequest(). 2013-10-18 11:41:38 -04:00
Cameri
069b309249 Added test case for JqueryEngineHelper::request() to validate 'xhr' callback. 2013-10-18 11:00:15 -04:00
Cameri
bb33d52cc6 Added 'xhr' as callback in JqueryEngineHelper::request() so it formats as Javascript. 2013-10-17 18:26:39 -04:00
mark_story
1ae470a284 Fix inflection rules for curves.
Remove curve from the uninflected list and update rules so it, wolves,
and lives are still properly handled.

Fixes #2148
2013-10-17 12:15:56 -04:00
mark_story
935a51c892 Add tests for curve<->curves
Closes #2148
2013-10-17 12:10:49 -04:00
ADmad
5d15c648de Merge pull request #2147 from bcrowe/hotfix-dispatcher
Readability update for Dispatcher::_invoke()
2013-10-17 04:42:33 -07:00
Bryan Crowe
1f2a4113bf Readability update for Dispatcher::_invoke() 2013-10-17 00:48:17 -04:00
Mark Story
80fc94cf2a Merge pull request #2143 from bcrowe/hotfix-extraSpace
Remove extra space around the brace in CakeSchema::_arrayDiffAssoc()
2013-10-16 09:23:48 -07:00
Bryan Crowe
bc2fcf421f Remove extra space around the brace in CakeSchema::_arrayDiffAssoc() 2013-10-16 09:52:29 -04:00
Mark Story
ff0b963941 Merge pull request #2142 from bcrowe/hotfix-strictNull
Change is_null() calls to strict checks
2013-10-15 20:00:12 -07:00
Bryan Crowe
5addb2cc9f Change is_null() calls to strict checks in CakeSchema::_arrayDiffAssoc() 2013-10-15 22:53:04 -04:00
Bryan Crowe
39b7023e75 Change is_null() calls to strict checks 2013-10-15 22:32:46 -04:00
Mark Story
0390aa89d1 Merge pull request #2140 from ravage84/include-parentheses
include calls without parentheses
2013-10-15 17:56:30 -07:00
Marc Würth
fcb7f86b76 include calls without parentheses
Refs https://github.com/cakephp/cakephp/pull/1698/files#r6748085
2013-10-16 01:40:45 +02:00
mark_story
5c8eb5c5a7 Add test cases for pluralization/singularlization of quota.
Closes #2077
2013-10-15 17:48:26 -04:00
Mark Story
8eb247528d Merge pull request #2135 from bcrowe/htofix-returndocs
Add missing return tags
2013-10-14 20:15:06 -07: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
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
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
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
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
euromark
b5bd087bc5 Replace deprecated methods. 2013-10-08 20:23:57 +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