Jose Lorenzo Rodriguez
a1daaf5960
Merge branch '2.1-http' into 2.1
2012-01-21 15:51:34 -04:30
Jose Lorenzo Rodriguez
1884cd1f28
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-21 15:49:25 -04:30
Jose Lorenzo Rodriguez
37314a2188
Logging transaction commands in DboSource, fixes #2457
2012-01-21 15:48:17 -04:30
Jose Lorenzo Rodriguez
6aa08b5f52
Preventing datasource creationa and access on models having $useTable = false;
2012-01-21 14:03:11 -04:30
mark_story
70bb839de9
Add validation guess for not null + text types.
...
Fixes #2493
2012-01-21 13:10:30 -05:00
mark_story
bc689151a4
Add note about PHP's include_path.
...
Refs #2497
2012-01-21 10:23:25 -05:00
mark_story
df5d9ac3d1
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
mark_story
e6f5ebc257
Merge changes from hmic/CakeEmail-2.0
...
Adds parameters for file attachments instead of having
boundary prefixes in multiple places.
Fixes #GH433
2012-01-20 20:17:02 -05:00
Ceeram
d4e2fbf6b8
set correct default validate option, now matches saveAll/saveMany default value, fixes #2492
2012-01-20 11:02:13 +01:00
mark_story
a70c8c7ac3
Merge changes from 1.3 to 2.0
...
Merge changes from #GH284 from 1.3 to 2.0.
Model::validate() no longer does queries when its not
necessary.
2012-01-19 22:50:40 -05:00
mattpotts
1c645152ca
added sftp to url()
2012-01-19 22:05:10 -05:00
mark_story
69a69d48a2
Add test for Validation::url() + sftp.
2012-01-19 22:04:10 -05:00
Jose Lorenzo Rodriguez
00a5510b1d
Readability changes
2012-01-19 22:26:59 -04:30
Jose Lorenzo Rodriguez
5df2a0957f
Not sending the response in beforeRender, better let Dispatcher do its work
2012-01-19 22:26:32 -04:30
mark_story
1693478889
Adding test for #GH424
2012-01-19 21:50:51 -05:00
mark_story
ad304e0b43
Reformat long line.
2012-01-19 21:50:51 -05:00
Mark Story
599d8b885c
Merge pull request #424 from stefanozoffoli/patch-2
...
Prevent blackhole auth error where are present multi fields
2012-01-19 18:50:39 -08:00
mark_story
eb101b9eb8
Update Model::saveAssociated() documentation
...
Fixes #2492
2012-01-19 21:10:46 -05:00
wnasich
c95ab282dc
Test case and Fix for: Number::currency() issue
...
Fixes currency() for custom formats and numbers between -1 and 1.
Fixes #2489
Conflicts:
lib/Cake/Test/Case/View/Helper/NumberHelperTest.php
lib/Cake/View/Helper/NumberHelper.php
2012-01-19 21:07:27 -05:00
ADmad
d61b6dc7d3
Removed constant available only in php 5.3 and changed exception type to fix errors on php 5.2. Fixes #2487
2012-01-20 04:05:40 +05:30
Ceeram
2a9e6771c3
allow other parent field, set in find options or TreeHebavior, for threaded find. Fixes #1769
2012-01-19 23:26:43 +01:00
ADmad
2c239cc851
Removed constant available only in php 5.3 and changed exception type to fix errors on php 5.2. Fixes #2487
2012-01-20 03:31:08 +05:30
Stefano Zoffoli
c3b806ce8c
Prevent blackhole auth error where are present multi fields
2012-01-19 17:48:39 +01:00
AD7six
b62d9729a9
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-19 10:51:24 +01:00
AD7six
a5240e23ab
Merge branch 'feature/set-nest' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
2012-01-19 10:51:09 +01:00
Jose Lorenzo Rodriguez
769a5c24e6
Fixing some failing test cases
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
979f7a28b5
Fixing a couple bugs in CakeResponse::checkNotModified() and implementing conditional rendering in
...
RequestHandlerComponent
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
28ee27e2dd
Making it possible to cancel the render() process from any beforeRender listener
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
b79e0ad8f3
Moving checkModified() to CakeResponse, having it in the RequestHandler has too restrivtive
2012-01-19 01:08:45 -04:30
José Lorenzo Rodríguez
6839f0c450
Fixing typo in docblock
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
a7662eba57
fixing doc comment identation
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
dffe84cfbc
Implementing RequestHandler::checkNotModified() as a helper for HTTP caching
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
8e979cc83e
Implementing CakeResponse::notModified()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
dbd097debb
Implementing the CakeResponse::etag()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
803d49c7c6
Adding CakeResponse::vary()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
3240f6221e
Implementing mustRevaidate()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
552c70a571
Removing Pragma headers, implementing sharedMaxAge in CakeResponse
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
2428e83e3f
Adding test case for maxAge()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
d9987c96db
Implementing sharable() and maxAge() in CakeResponse for a finer grain and easier control of cache headers
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
130b827e6f
Implementing the modified() method in CakeResponse to have an easier way of setting the modification time
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
bab7e772d2
Adding expires() to CakeResponse to help adding expiration dates to the http response cache directives
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
f32c703e7e
Not appending the charset information for content types that are not text/* in CakeResponse
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
4d19d536f6
Saving a few bytes by unsetting the content if the response status code is 204 (No Content) or 304 (Not Modified)
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
5b42cb8130
Adding length() method to CakeResponse as a shortcut for Content-Length. If you wish to force not Content-Length use length(false)
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
336ba1965e
Adding protocol() method to CakeResponse to be able to change it on the fly
2012-01-19 01:08:43 -04:30
José Lorenzo Rodríguez
6211be2acc
Merge pull request #422 from scottharwell/2.1
...
Fixing possible SQL error when using 'field NOT' => array(1)
2012-01-18 15:12:15 -08:00
Scott Harwell
e1738c8c4a
Added check for NOT in key when array count === 1 to prevent SQL error
2012-01-18 15:04:53 -05:00
AD7six
f1f1ce0db4
allow specifying an explicit root
2012-01-18 13:05:44 +01:00
Cauan Cabral
03bac42366
Change fullPath option to fullBase in HtmlHelper::image for consistency
...
Updated test cases for that.
Included doc block about that option.
2012-01-18 08:32:40 -03:00
mark_story
5e495ad90c
Simplify how options are checked.
2012-01-17 21:57:22 -05:00