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 |
|
0x20h
|
4532659fed
|
code cleanup, added some tests
|
2012-01-18 20:59:44 +01: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 |
|
Mark Story
|
e080bb27b9
|
Merge pull request #411 from fitorec/2.0
Check the logic in the Shell::in($prompt, $options = null, $default = null)
|
2012-01-17 18:53:00 -08:00 |
|
Mark Story
|
8608caa8a2
|
Merge pull request #298 from vitorpc/2.0
Property 'name' removed of PagesController.
|
2012-01-17 18:52:26 -08:00 |
|
Cauan Cabral
|
90426674cb
|
Merge branch 'master' into 2.1
|
2012-01-17 23:18:54 -03:00 |
|
Cauan Cabral
|
d2315ef35b
|
Fix test for HtmlHelper::link
|
2012-01-17 23:15:11 -03:00 |
|
Cauan Cabral
|
0c0135ff5e
|
Option to return img src with fullpath address
|
2012-01-17 22:55:24 -03:00 |
|
José Lorenzo Rodríguez
|
7e9e3f92a7
|
Merge pull request #418 from majna/2.1-model
Cleanup some Model code and update doc block
|
2012-01-17 14:33:54 -08:00 |
|
Majna
|
d2dd861417
|
Update doc block for 'keepExisting' HABTM option.
|
2012-01-17 22:02:30 +01:00 |
|
Majna
|
e947df36a5
|
Remove unnecessary condition in Model::getID().
|
2012-01-17 21:57:40 +01:00 |
|
Majna
|
826374e57c
|
Remove unnecessary param when calling begin, commit and rollback on datasource.
|
2012-01-17 21:52:22 +01:00 |
|
Ceeram
|
828117583f
|
fix that argument with 0 as value will stop parsing args, tests added
|
2012-01-17 20:01:40 +01:00 |
|
0x20h
|
54869fc965
|
moved note about 'default' cache configuration to the APC config docblock
|
2012-01-17 19:39:46 +01:00 |
|
Mark Story
|
c718b102a9
|
Merge pull request #415 from scottharwell/bake-test-plurals
Bake test plurals
|
2012-01-17 09:23:07 -08:00 |
|
0x20h
|
588090da21
|
moved docblock on default cache configuration to bootstrap.php, left a note in core.php
|
2012-01-17 08:58:22 +01:00 |
|
mark_story
|
c81fe6249d
|
Fix prefix = false in connect()
Connecting routes with a prefix = false created an un-matchable route.
Ignore falsey prefix values when setting up prefixes.
Fixes #2479
|
2012-01-16 21:30:26 -05:00 |
|
Scott Harwell
|
153b9f9ee2
|
Updated to use camelize rather than classify
|
2012-01-16 20:52:05 -05:00 |
|
Scott Harwell
|
33dc57e667
|
Added check for duplicate methods to prevent fatal php error
|
2012-01-16 14:45:12 -05:00 |
|
Renan Gonçalves
|
3a3d89d6d1
|
Updating test to reflect last changes made by pull #413.
|
2012-01-16 16:51:49 +01:00 |
|
Renan Gonçalves aka renan.saddam
|
4059eed3a7
|
Merge pull request #413 from bfanger/2.0
Fixes the MethodNotAllowed when deleting with scaffolding
|
2012-01-16 07:37:31 -08:00 |
|
Bob Fanger
|
5cb974ee70
|
Fixes the MethodNotAllowed when deleting a model from an scaffolding view.ctp page
|
2012-01-16 16:21:06 +01:00 |
|
Fitorec
|
ddbaa66997
|
Reviewing the logic in the Shell::in($prompt, $options = null, $default = null)
|
2012-01-15 21:16:45 -06:00 |
|
José Lorenzo Rodríguez
|
b8d23515b0
|
Merge pull request #409 from josegonzalez/patch-1
Fixed broken testcase for Controller::setAction()
|
2012-01-15 12:20:34 -08:00 |
|
Jose Diaz-Gonzalez
|
adde2a9af5
|
Fixed broken Controller::setAction() testcase
|
2012-01-15 15:16:49 -05:00 |
|
José Lorenzo Rodríguez
|
68c919d787
|
Merge pull request #407 from josegonzalez/patch-1
Missing TestCase for Controller::setAction()
|
2012-01-15 12:04:03 -08:00 |
|