Commit graph

16002 commits

Author SHA1 Message Date
Marc Würth
39cd7565ef Throw an exception when starting a view block twice 2013-10-26 03:35:12 +02:00
euromark
4048c686b7 coding standards 2013-10-25 19:29:33 +02:00
mark_story
7624884240 Use + instead of array_merge.
If you have numeric columns in your database, array_merge() will re-key
the array dropping the original values.

Fixes #2198
2013-10-25 10:23:50 -04:00
euromark
8a90cbd4fe coding standards 2013-10-24 23:14:09 +02:00
Mark Story
ea0c66e713 Merge pull request #2187 from bar/model-optimizations
Optimize conditionals and reduce lookups.
2013-10-24 14:09:47 -07:00
Mark Story
d7f37efc34 Merge pull request #2196 from ravage84/orphaned-home
Emptied home.ctp in test_app as much as possible
2013-10-24 09:21:00 -07:00
Marc Würth
86bc9d73cf Emptied home.ctp in test_app as much as possible
This file is never seen by anyone but gets analyzed by
``ExtractTaskTest::testExecute()``
2013-10-24 16:57:58 +02:00
José Lorenzo Rodríguez
a6eb348e2f Merge pull request #2194 from ravage84/gh-link-home.ctp
Improved wording of link to GH repo in home.ctp
2013-10-24 07:33:19 -07:00
ADmad
df523ded7c Fixed docblock. Closes #2193 2013-10-24 19:27:56 +05:30
Marc Würth
0e348dfbbd Improved wording of link to GH repo in home.ctp 2013-10-24 15:51:59 +02:00
Ber Clausen
1fbe9c0021 Optimize conditionals and reduce lookups.
Also, make the code easier to read removing unneded indentations.
2013-10-24 10:16:55 -03:00
James Watts
f3b667de03 Added link to CakePHP roadmaps to support contributions 2013-10-24 15:12:41 +02:00
James Watts
22761a4bef Added link to CakePHP roadmaps to support contributions 2013-10-24 15:09:02 +02:00
José Lorenzo Rodríguez
230b9dac66 Merge pull request #2191 from jameswatts/feature/skel-links
Updated links to CakePHP resources
2013-10-24 05:42:37 -07:00
James Watts
12f0cc0559 Updated links to CakePHP resources 2013-10-24 14:39:32 +02:00
Mark Story
8f52add62e Merge pull request #2189 from jameswatts/feature/home-links
Revised CakePHP and external links on the home page
2013-10-24 05:15:04 -07:00
Mark Story
287a526d94 Merge pull request #2188 from ravage84/model-docblocks
Some DocBlock improvements for Model.php
2013-10-24 05:13:36 -07:00
Marc Würth
7c07d37fb3 Some DocBlock improvements for Model.php 2013-10-24 13:05:32 +02:00
James Watts
65ad320d6f Revised CakePHP and external links on the home page 2013-10-24 12:59:52 +02:00
Mark Story
7422b16327 Merge pull request #2186 from bar/clearcache
Optimize _clearCache().
2013-10-23 19:23:25 -07:00
Ber Clausen
6dcfd28600 Optimize _clearCache().
It is cheaper to make an assignment or call strtolower() than to pluralize.
2013-10-23 22:29:42 -03:00
Mark Story
43fccc1cbf Merge pull request #2184 from ravage84/sortby
Renamed $sortby to $sortBy in sortByKey
2013-10-23 09:42:28 -07:00
mark_story
23b23d8050 Fix delivery issues with long subject lines and MailTransport.
A few people have reported issues sending wrapped messages via
MailTransport. Removing the new lines has been suggested as a fix.

Refs #2176
2013-10-23 12:41:57 -04:00
Marc Würth
c44135a50b Renamed $sortby to $sortBy in sortByKey 2013-10-23 17:28:48 +02:00
Mark Story
b4a0182bf0 Merge pull request #2181 from bcrowe/hotfix-classname
Add space between classname(s)
2013-10-23 04:37:23 -07:00
Mark Story
bd4aff13ee Merge pull request #2180 from bcrowe/hotfix-strict
Strict null check on group parameter
2013-10-22 20:13:37 -07:00
Bryan Crowe
a943ea5c34 Add space between classname(s) 2013-10-22 22:59:50 -04:00
mark_story
328fcdc376 Sync skel and app directories.
Closes #1698
2013-10-22 22:18:59 -04:00
Bryan Crowe
79846d25f8 Strict null check on group parameter 2013-10-22 22:11:02 -04:00
mark_story
75624c0279 Update version number to 2.4.2 2013-10-22 21:49:25 -04:00
Mark Story
f737183205 Merge pull request #2178 from Phally/master-dbosource
Makes DboSource less string dependent.
2013-10-22 14:19:05 -07:00
Frank de Graaf
ab89f6ec97 Makes DboSource less string dependent. 2013-10-22 16:43:32 +02:00
José Lorenzo Rodríguez
dcffa923bc Merge pull request #2175 from bcrowe/hotfix-aURL
Correct 'an URL' to 'a URL' in docblocks
2013-10-22 00:43:27 -07:00
Bryan Crowe
d39ced8381 Correct 'an URL' to 'a URL' in docblocks 2013-10-22 00:09:34 -04:00
mark_story
e27e887707 Deprecate features being removed in 3.0 2013-10-21 16:55:21 -04:00
mark_story
bcafde6212 Add numeric validator for float fields by default.
Make bake add numeric validator to float fields.

Fixes #2163
2013-10-20 22:54:30 -04:00
euromark
c08df2a7f9 Correct wording of Hash::expand() 2013-10-19 17:54:43 +02:00
Mark Story
5fbf02e1f1 Merge pull request #2153 from Cameri/master
Added 'xhr' as callback in JqueryEngineHelper::request() so it formats as Javascript.
2013-10-18 10:44:58 -07:00
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