mark_story
|
f847080cbf
|
Changing more php version strings.
|
2010-10-03 12:46:03 -04:00 |
|
mark_story
|
f21161ef46
|
Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
differences upon merging.
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/libs/cache/file.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/i18n.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/model/model_write.test.php
|
2010-09-24 23:27:22 -04:00 |
|
mark_story
|
e91fa68f8e
|
Making the set() functions use + instead of array_merge() so that numeric indices are properly preserved across multiple method calls. Fixes #1105
|
2010-09-18 00:13:03 -04:00 |
|
mark_story
|
1707c92aa1
|
Removing duplicated code.
|
2010-09-14 23:15:10 -04:00 |
|
mark_story
|
f34cfd1f1e
|
Updating EmailComponent to use new methods on the ComponentCollection to ensure it always has a controller reference.
Removing triggerDisabled key as its no longer needed or wanted.
|
2010-09-14 23:02:38 -04:00 |
|
mark_story
|
97dd7c7644
|
Adding support to ObjectCollection and its subclasses to trigger callbacks on all objects instead of just the enabled ones. Fixes issues where inner components would not get access to the controller as the initialize callback wasn't fired. This fixes some backwards compatibility issues. Tests updated.
|
2010-09-14 21:57:40 -04:00 |
|
mark_story
|
e4b2fb173b
|
Removing the deprecated properties.
Removing property copying to helpers.
Making the view test cases pass again.
|
2010-09-13 23:11:59 -04:00 |
|
mark_story
|
a521291afd
|
Adding a __set() method to make some tests pass.
Updating internal usage to not use deprecated attributes.
Updating test cases to not use deprecated attributes.
|
2010-09-13 23:11:59 -04:00 |
|
mark_story
|
84565151de
|
Removing all the deprecated properties from Controller.
Adding a __get() method to provide the properties that were moved to CakeRequest.
Tests added.
|
2010-09-13 23:11:59 -04:00 |
|
mark_story
|
e4d34b640b
|
Merge branch '2.0-exceptions' into 2.0
Conflicts:
cake/libs/error.php
cake/tests/cases/libs/controller/scaffold.test.php
cake/tests/cases/libs/error.test.php
|
2010-09-10 20:31:16 -04:00 |
|
Mark Story
|
474ace09c1
|
Adding CakeResponse to the list of included files for Controller.
|
2010-09-06 01:11:26 -04:00 |
|
Mark Story
|
2e8a60f932
|
Removing some mentions of cakeError as its been removed. Also adding information about exceptions that can be raised.
|
2010-09-02 16:38:19 -04:00 |
|
mark_story
|
a8d4015f47
|
Updating bootstrap process in CLI to match the one in web.
Updating all_libs to use new file.
Updating error_handler test to run in cli.
Updating Controller so it imports required classes.
|
2010-08-30 22:59:10 -04:00 |
|
mark_story
|
9485f0a993
|
Merge branch 'request-response' into 2.0
Conflicts:
cake/tests/cases/libs/controller/controller.test.php
|
2010-08-28 00:24:07 -04:00 |
|
mark_story
|
2cdb10812d
|
Merge branch '2.0-exceptions' into 2.0
Conflicts:
cake/dispatcher.php
cake/libs/controller/scaffold.php
cake/tests/cases/dispatcher.test.php
|
2010-08-28 00:14:34 -04:00 |
|
José Lorenzo Rodríguez
|
f63b093d24
|
Merge branch '2.0-request' into 2.0
Still tons of tests failing
Conflicts:
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/request_handler.php
cake/libs/controller/components/security.php
cake/libs/controller/controller.php
cake/libs/router.php
cake/libs/view/helper.php
cake/libs/view/helpers/html.php
cake/libs/view/view.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/controller/components/auth.test.php
cake/tests/cases/libs/controller/components/request_handler.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helper.test.php
cake/tests/cases/libs/view/helpers/cache.test.php
cake/tests/cases/libs/view/helpers/form.test.php
cake/tests/cases/libs/view/helpers/html.test.php
cake/tests/cases/libs/view/helpers/js.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
|
2010-08-27 23:31:41 -04:30 |
|
mark_story
|
b301b0d86e
|
Adding MissingModelException.
|
2010-08-27 23:04:35 -04:00 |
|
mark_story
|
7221f9c3b9
|
Moving response construction into Controller, this will let controller classes more easily modify the response subclass they want to use.
Test case updated.
|
2010-08-22 12:31:55 -04:00 |
|
mark_story
|
c6a63bae82
|
Fixing incorrect method call from merge with 1.3
|
2010-08-10 23:18:42 -04:00 |
|
mark_story
|
5068d62473
|
Fixing issue that came up in rebasing.
|
2010-08-10 23:18:42 -04:00 |
|
mark_story
|
d01708b1ef
|
Adding temporary $View property to controller until I figure out a better way to provide access for it. Test case updated to reflect View not being in the registry anymore.
|
2010-08-10 23:18:42 -04:00 |
|
mark_story
|
a4e2f7c55f
|
Updating intialiize() callbacks. Moving $this->_set() int Component::__construct as all the core components did it. Updating constructors and including parent calls.
|
2010-08-10 23:18:40 -04:00 |
|
mark_story
|
fac97738ce
|
Making Controller use ComponentCollection.
|
2010-08-10 23:18:39 -04:00 |
|
José Lorenzo Rodríguez
|
077f71aaa1
|
Refactoring controller rendering to use the CakeResponse object
|
2010-08-01 01:38:45 -04:30 |
|
José Lorenzo Rodríguez
|
0824348db1
|
Removing Controller::output property and refactoring methods to not use it. CakeResponse::body() should be used instead
|
2010-08-01 01:13:41 -04:30 |
|
José Lorenzo Rodríguez
|
f9c97383e9
|
Refactored Controller::disableCache() to use the CakeResponse object, method was also deprecated
|
2010-08-01 00:16:50 -04:30 |
|
José Lorenzo Rodríguez
|
60f504a470
|
Refactored Controller::header() to use the CakeResponse object, deprecated Controller::header() and Controller::httpCodes()
|
2010-08-01 00:13:00 -04:30 |
|
José Lorenzo Rodríguez
|
9d104fee73
|
Refactoring Controller::redirect() to use the CakeResponse object
|
2010-08-01 00:10:46 -04:30 |
|
José Lorenzo Rodríguez
|
3ab4e09e11
|
Moving Controller::httpCodes() to CakeResponse
|
2010-08-01 00:09:09 -04:30 |
|
José Lorenzo Rodríguez Urdaneta
|
4c71dd845e
|
Merge remote branch 'origin/2.0' into 2.0-request
Conflicts:
cake/libs/controller/components/auth.php
cake/tests/cases/libs/controller/components/auth.test.php
|
2010-07-27 22:02:08 -04:30 |
|
mark_story
|
d38857095a
|
Merge branch '1.3' into 2.0
Conflicts:
cake/libs/model/model.php
cake/libs/validation.php
cake/libs/view/helpers/ajax.php
cake/tests/cases/libs/controller/components/session.test.php
|
2010-07-24 22:34:42 -04:00 |
|
Scott Reeves
|
ba59c93187
|
Fixing typo in method description.
Signed-off-by: mark_story <mark@mark-story.com>
|
2010-07-19 23:14:51 -04:00 |
|
Ceeram
|
32ea6d24cf
|
Moving Component::beforeRender triggering to allow components to modify
the view class to use for the render() call. Fixes #917
Signed-off-by: mark_story <mark@mark-story.com>
|
2010-07-15 21:54:18 -04:00 |
|
mark_story
|
c9079c8048
|
Removing magical un-removable plugin concatenation in Controller::loadModel(). Adding test case from 'real34'. Fixes #858
|
2010-07-13 20:19:31 -04:00 |
|
mark_story
|
413b875eef
|
Merge branch '2.0' into 2.0-request
Conflicts:
cake/libs/controller/controller.php
|
2010-07-10 11:49:58 -04:00 |
|
mark_story
|
0e2a313145
|
Removing reference operators from controller.
Removing cakeDebug as its no longer used.
|
2010-07-10 00:32:35 -04:00 |
|
mark_story
|
b7310afddf
|
Removing strtolower() loops on method names, as casing is preserved in php5.
|
2010-07-09 23:49:48 -04:00 |
|
mark_story
|
02e25f7557
|
Changing Configure::read() to not have a default value, and instead return all values in configure when no param is supplied. Test cases updated. Fixes #503
|
2010-07-05 21:50:36 -04:00 |
|
mark_story
|
ecf7811b7a
|
Merge branch '2.0' into 2.0-request
Conflicts:
cake/dispatcher.php
cake/libs/controller/components/request_handler.php
cake/libs/view/helpers/form.php
cake/tests/cases/libs/controller/components/request_handler.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/view/helpers/js.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
|
2010-06-27 23:21:11 -04:00 |
|
mark_story
|
929bb5769e
|
Merge branch '1.3' into 2.0
Conflicts:
app/webroot/index.php
cake/console/templates/skel/webroot/index.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/controller/scaffold.php
cake/libs/model/datasources/dbo/dbo_oracle.php
cake/libs/model/model_behavior.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/acl.test.php
cake/tests/cases/libs/file.test.php
|
2010-06-26 12:29:20 -04:00 |
|
mark_story
|
2db510d1c1
|
Modifying Controller::validateErrors so it can accept and validate arbitrary model objects, not just those attached to the controller. Test cases updated, fixes #832
|
2010-06-20 21:47:34 -04:00 |
|
mark_story
|
f114d4299d
|
Merge branch '2.0' into 2.0-request
Conflicts:
cake/libs/router.php
cake/tests/cases/libs/router.test.php
|
2010-05-17 21:52:14 -04:00 |
|
mark_story
|
36a71582fc
|
Fixing issues with Controller::referer() and CakeRequest::referer(). Tests updated.
|
2010-05-15 00:53:15 -04:00 |
|
predominant
|
8f880731c6
|
Removing closing PHP tags.
|
2010-05-11 08:27:28 +10:00 |
|
predominant
|
1ec220dac2
|
Removing closing PHP tags.
|
2010-05-11 08:07:49 +10:00 |
|
Mark Story
|
df910026ee
|
Updating Controller::referer() to use the request object if available. Tests updated.
|
2010-05-08 00:06:13 -04:00 |
|
Mark Story
|
77264da34a
|
Updating Controller tests to always pass in a CakeRequest. Fixing some notice errors that come up in the test cases.
|
2010-05-08 00:00:19 -04:00 |
|
Mark Story
|
22161874cb
|
Deprecating a number of Controller properties and adding $request.
|
2010-05-07 23:46:02 -04:00 |
|
Mark Story
|
26f7fcef3c
|
Updating Controller and its tests to use CakeRequest.
|
2010-05-06 23:23:13 -04:00 |
|
Mark Story
|
2b7723fd12
|
Removing reference operators and making Controller::__construct take a CakeRequest. If one is passed all the necessary properties will be populated. This lightens the Dispatcher, and gives more control to the end developer.
|
2010-05-06 23:18:50 -04:00 |
|