mark_story
|
9b08b725fe
|
Merge branch '2.0' into 2.0-view
Conflicts:
cake/libs/controller/controller.php
cake/libs/view/helpers/cache.php
|
2010-11-13 21:03:54 -05:00 |
|
mark_story
|
01894b315f
|
Fixing issues caused by not accessing the request object correctly.
|
2010-11-12 23:14:34 -05:00 |
|
mark_story
|
18bb5f6b8b
|
Removing =& operators for construction of objects.
|
2010-11-12 23:05:44 -05:00 |
|
mark_story
|
6c0dfe9592
|
Fixing error where params[url] has moved.
|
2010-11-09 23:44:33 -05:00 |
|
mark_story
|
22497eb41c
|
Fixing failing tests in controller test.
|
2010-11-07 13:23:45 -05:00 |
|
Mark Story
|
94f9f7afeb
|
Fixing failing tests from merge with 1.3. Most tests were failing due to internal changes and PHPUnit being more specific than SimpleTest.
|
2010-10-31 22:42:16 -04:00 |
|
Mark Story
|
c2063f1229
|
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
|
2010-10-31 21:58:38 -04:00 |
|
Mark Story
|
08e7bcb7ab
|
Merge branch '1.3' into integration
Conflicts:
app/config/core.php
cake/console/libs/acl.php
cake/console/templates/skel/config/core.php
cake/console/templates/skel/webroot/test.php
cake/dispatcher.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/log/file_log.test.php
cake/tests/cases/libs/model/cake_schema.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/lib/reporter/cake_cli_reporter.php
|
2010-10-31 21:56:59 -04:00 |
|
Juan Basso
|
7f448a1d35
|
Allowed the use of empty() and isset() in Controllers aliases properties.
|
2010-10-31 22:02:26 -02:00 |
|
mark_story
|
4496a0a0bb
|
Reformatting code to use tabs.
Fixing issue with float comparison.
Fixes #219
|
2010-10-24 19:43:41 -04:00 |
|
C. James Callaway
|
b8f0dda964
|
Updating to match ticket, using radians() SQL function.
|
2010-10-24 19:39:18 -04:00 |
|
C. James Callaway
|
a429287c19
|
Adding testcase for ticket #219
|
2010-10-24 19:38:23 -04:00 |
|
mark_story
|
3ab77017ae
|
Fixing OpenTest license mentions to use MIT License
Fixing PHP versions 4 and 5 to only be PHP5.
|
2010-10-03 12:31:21 -04:00 |
|
mark_story
|
5c94bdd028
|
Fixing failing tests in group context caused by state being stuck in static objects.
|
2010-09-24 23:30:02 -04:00 |
|
mark_story
|
2385747899
|
Some more fixes to make tests run better under all tests.
|
2010-09-24 23:28:49 -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
|
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
|
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
|
dcb7a167b4
|
Fixing controller test cases.
|
2010-08-28 00:29:50 -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 |
|
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
|
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
|
238c734f70
|
Moving a test case that should be implemented in controller, as that is where the code that needs to be tested is located.
|
2010-08-11 22:47:54 -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
|
55d71dc4b5
|
Updating Controller test case to use new ComponentCollection.
|
2010-08-10 23:18:40 -04:00 |
|
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
|
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 |
|
mark_story
|
a78bb20bda
|
Fixing failing test in ControllerTest caused by ThemeView not being correctly found if it was not in the mapped files.
|
2010-07-18 21:28:52 -04:00 |
|
mark_story
|
0e184c66f4
|
Adding failing test for #917
|
2010-07-15 21:52:24 -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
|
7c0cda7ce5
|
Merge branch '2.0' into 2.0-request
Conflicts:
cake/libs/router.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/controller.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/html.test.php
cake/tests/cases/libs/view/helpers/js.test.php
|
2010-06-28 23:41:48 -04:00 |
|
mark_story
|
cd8dff362d
|
Merge branch '2.0-phpunit' into 2.0
Conflicts:
cake/libs/controller/components/email.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/controller/components/email.test.php
|
2010-06-28 22:31:35 -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
|
f20cc8110b
|
Adding a skip for persistModel as the feature is horribly broken right now. Controller test case is running with PHPUnit now.
|
2010-06-12 19:01:51 -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
|
26f7fcef3c
|
Updating Controller and its tests to use CakeRequest.
|
2010-05-06 23:23:13 -04:00 |
|
Mark Story
|
1a460e47f1
|
Removing reference operators in Controller and its tests.
|
2010-05-06 22:48:48 -04:00 |
|