Commit graph

14071 commits

Author SHA1 Message Date
dogmatic69
91c09d87bc simplify the code for object collection
Fixed up some abreviated variables, removing extra long lines and removed
variables that were not used.
2012-09-12 21:56:59 +01:00
José Lorenzo Rodríguez
b227ff486e Merge pull request #822 from rchavik/2.3
enable PluginDot for routeClass parameter
2012-09-12 08:04:44 -07:00
Rachman Chavik
0cae19a14e enable PluginDot for routeClass parameter 2012-09-12 21:24:56 +07:00
AD7six
99b798fa9a make it possible to override all of basics.php 2012-09-06 10:19:06 +02:00
mark_story
6664acba79 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/VERSION.txt
2012-09-05 20:15:36 -04:00
Mark Story
878f18419c Merge pull request #817 from shama/patch-trimpath
Remove never reached code in Debugger::trimPath and test more results
2012-09-05 17:12:23 -07:00
Kyle Robinson Young
a214fcd992 Remove never reached code in Debugger::trimPath and test more results 2012-09-05 15:57:53 -07:00
Mark Story
f1c2b1fba8 Merge pull request #816 from shama/patch-email-component
Fix $readReceipt variable in EmailComponent::send
2012-09-05 14:59:19 -07:00
Kyle Robinson Young
602240c08e Fix $readReceipt variable in EmailComponent::send 2012-09-05 12:49:09 -07:00
mark_story
c7647b775f Attempt to fix build error in travis. 2012-09-04 17:25:02 -04:00
Mark Story
f6b1d08f02 Merge pull request #814 from shama/patch-cs
Code standards fixes: removing unneeded break statements
2012-09-04 14:12:22 -07:00
Kyle Robinson Young
200dd2dc9b Code standards fixes, unneeded break statements 2012-09-04 11:30:52 -07:00
ADmad
28951865c6 Hidden divs created by FormHelper can now be customized. 2012-09-04 23:56:30 +05:30
mark_story
5b641287e9 Make schema errors clearer.
When a schema fails because of the name, the error should display
the name & file name that it attempted to load. This gives people
a slightly better chance of figuring things out.
2012-09-03 21:06:48 -04:00
mark_story
0d826528e1 Supress fewer errors.
PHPUnit raises exceptions on errors, there isn't much point in
supressing all these errors.
2012-09-03 20:13:30 -04:00
mark_story
771cfde196 Fix coding standards. 2012-09-03 20:09:13 -04:00
mark_story
bacd8afde3 Remove duplicated header. 2012-09-03 19:55:29 -04:00
Mark Story
eb33929829 Merge pull request #731 from dereuromark/2.3-fix-rss-test
2.3 fix rss test
2012-09-03 15:03:44 -07:00
mark_story
3cb501f1c5 Fix issue created in [e8b5d81fd7]
Query conditions with `-` and no surrounding spaces were quoted
incorrectly.

Fixes #3178
2012-09-03 13:24:38 -04:00
mark_story
583bb37df0 Fix typo. 2012-09-03 13:10:27 -04:00
ADmad
a392892756 Merge pull request #812 from dereuromark/2.3-mediaview
Remove redundant prefixing of APP to path. It's already done in CakeResponse::file()
2012-09-03 05:39:02 -07:00
euromark
387a974396 avoid path being made absolute twice 2012-09-03 13:16:40 +02:00
Mark Story
a1edede41e Merge pull request #811 from brq/2.3
Allow postLink() to support other HTTP methods; it defaults to POST
2012-09-02 11:06:47 -07:00
brq
fca98e39f9 Allow postLink() to support other HTTP methods; it defaults to POST 2012-09-02 12:57:35 -05:00
mark_story
f155687cfa Update version number to 2.2.2 2012-09-01 18:28:03 +01:00
mark_story
21a51a374a Revert "Make test a bit more solid."
This reverts commit 072991d0da.
2012-09-01 14:43:11 +01:00
mark_story
072991d0da Make test a bit more solid. 2012-09-01 14:34:10 +01:00
mark_story
571c8bc08c Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/Task/TestTask.php
2012-09-01 13:51:40 +01:00
mark_story
474e42cc08 Switch File::info() tests to use a different file.
text/php files are not detected reliably across platforms. Use a plain
text file instead.  This should fix builds on travis.ci
2012-09-01 12:40:05 +01:00
mark_story
d3105332dc Fix coding standards errors. 2012-09-01 12:14:15 +01:00
mark_story
e8b5d81fd7 Fix quoting of field names containing -.
Fixes #3165
2012-08-31 14:25:02 +01:00
ADmad
3e17c7aef9 Merge pull request #807 from kamui545/master
Fix typo
2012-08-30 23:59:10 -07:00
Maggion Emmanuel
03f6f041b2 Fix typo 2012-08-31 09:50:22 +03:00
mark_story
894fc1256a Add test cases for strings containing quotes.
Show that both double and single quoted strings are
handled correctly by ExtractTask.

Closes #3155
2012-08-30 23:48:32 +01:00
mark_story
728300786b Merge branch 'master' into 2.3 2012-08-30 19:43:11 +01:00
mark_story
d92ff9cc10 Merge branch '2.3' of github.com:cakephp/cakephp into 2.3 2012-08-30 19:42:46 +01:00
mark_story
e64f5f15e2 Fix big int lengths on SQLserver
SQLserver big ints aren't as big as other database servers.
2012-08-30 19:18:25 +01:00
mark_story
d4ee62be61 Add support for biginteger on SQLserver. 2012-08-30 16:35:36 +01:00
mark_story
8d8f4b5c5d Add bigint support for Sqlite.
* Update SQLite for biginteger.
* Update CakeSchema tests for integration purposes.
2012-08-30 14:48:59 +01:00
mark_story
7bad865d6e Add bigint support for postgres 2012-08-30 14:48:59 +01:00
Tommy MacWilliam
ec35e3158c added tests for bigints 2012-08-30 14:48:59 +01:00
Tommy MacWilliam
68116f7017 BIGINTs can also be primary keys 2012-08-30 14:48:59 +01:00
Tommy MacWilliam
15555a7309 added schema support for mysql bigints 2012-08-30 14:48:59 +01:00
mark_story
6a95b5746a Remove un-necessary parameter. 2012-08-30 14:48:13 +01:00
mark_story
19c2a58185 Fix strict errors. 2012-08-30 14:46:29 +01:00
Mark Story
1239d39b16 Merge pull request #805 from shama/doc-viewblock
Correct docblock see tags from View to ViewBlock
2012-08-30 02:14:31 -07:00
Mark Story
876d5ee168 Merge pull request #804 from Ivoz/master
Update readme
2012-08-30 01:58:52 -07:00
Kyle Robinson Young
ee9a545c7d Correct docblock see tags to ViewBlock
Fixes http://cakephp.lighthouseapp.com/projects/43067/tickets/97-about-api-description-of-viewassign
2012-08-29 21:53:29 -07:00
Ivoz
027c464e2d Travis status going in... 2012-08-30 12:01:24 +10:00
Ivoz
949dfd3819 Made IRC a webchat link, for noobs 2012-08-30 11:25:03 +10:00