Commit graph

14070 commits

Author SHA1 Message Date
Mark Story
261b6b01e8 Merge pull request #819 from ceeram/2.2-cookie
remove cookie reading in startup
2012-09-06 18:50:57 -07:00
Ceeram
0b0d83f261 remove cookie reading in startup 2012-09-07 00:04:03 +02:00
Mark Story
93004fcf2f Merge pull request #818 from shama/patch-unused-vars
Remove unused variables and code
2012-09-05 17:50:06 -07:00
Mark Story
c8cb3ae75f Merge pull request #810 from schrolli/patch-2
Update lib/Cake/Configure/IniReader.php
2012-09-05 17:45:43 -07:00
Kyle Robinson Young
bc40ac7d3f Remove unused variables and code 2012-09-05 17:19:13 -07: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
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
bacd8afde3 Remove duplicated header. 2012-09-03 19:55:29 -04: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
schrolli
83c05c24b3 Update lib/Cake/Configure/IniReader.php
Updated docblock and set NULL as the default value of $path
2012-09-02 14:23:26 +03:00
schrolli
a4c382b23a Update lib/Cake/Configure/IniReader.php
Copied standard path from PhpReader
2012-09-02 06:02:30 +03:00
mark_story
f155687cfa Update version number to 2.2.2 2012-09-01 18:28:03 +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
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
Ivoz
5f7f0727cd Fixed Capitalization... 2012-08-30 11:22:52 +10:00
Ivoz
d077724cf7 Now with pics! 2012-08-30 11:03:31 +10:00
Ivoz
0b7f141deb Updated the readme to be cool, and down with it. 2012-08-30 11:02:06 +10:00
mark_story
4fdd5e5d45 Ignore non-scalar values for length.
Fixes #3159
2012-08-28 21:58:32 -04:00
Mark Story
f97d8f9bb7 Merge pull request #800 from bar/master-validator-decimal
Refactor Validator::decimal() to be more flexible with decimal separators and PHP magic. Lots of testing added.
2012-08-28 13:41:40 -07:00
Ber Clausen
63548267e9 Refactor Validator::decimal() to be more flexible with decimal
separators and PHP magic.
Lots of testing added.
2012-08-27 23:25:17 -03:00
mark_story
b27c8a05bd Make invalid short option error more helpful.
Refs #3157
2012-08-27 22:12:05 -04:00
mark_story
fba17cffe9 Move OptionParser initialization out of try block.
This allows exceptions that result from creating the optionparser to
display to the developer, making debugging easier.

Fixes #3157
2012-08-27 22:07:28 -04:00
Mark Story
7135ff29fb Merge pull request #773 from bar/master-fix-inireader
Add plugin support to IniReader, and harden tests.
2012-08-27 12:36:57 -07:00
mark_story
988a847f49 Fix unescaped entities. 2012-08-27 14:48:07 -04:00
Ber Clausen
bdac857293 Add plugin support to IniReader, and harden tests.
The actual config file must always have .ini extension.
For backwards compatibility, acl.ini.php will be treated specially until 3.0.
2012-08-27 10:04:26 -03:00
mark_story
cbb64bd082 Fix blackhole requests with empty select boxes.
When a select box was entirely empty (no option element)
secured form submission should not fail.

Fixes #3153
2012-08-26 22:53:48 -04:00
mark_story
b68a2ed84d Update API docs. 2012-08-26 22:15:18 -04:00
Mark Story
a553142a0a Merge pull request #796 from MrRio/ticket-3152
Fix Email test fails when not running on port 80  

Fixes #3152
2012-08-25 18:18:50 -07:00
James Hall
20baeb83db Change to match coding standards 2012-08-26 02:11:43 +01:00
James Hall
a3b5065f8a Make sure the environment variable is set 2012-08-26 00:33:32 +01:00
James Hall
6c4ba233ba Fix testSendRenderWithImage when non running on port 80 2012-08-26 00:23:32 +01:00
mark_story
7966c00700 Merge branch 'master' of github.com:cakephp/cakephp 2012-08-25 17:53:22 -04:00
James Hall
7484007fa7 Fix #3148 MediaView does not support Microsoft Office default formats 2012-08-25 17:51:48 -04:00