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
|
eeda60b89e
|
Fixing failing test in Dispatcher caused by strtolower of method names.
|
2010-07-10 11:54:36 -04:00 |
|
José Lorenzo Rodríguez Urdaneta
|
906ef65547
|
Refactoring header sending in dispatcher to be able to test it properly
|
2010-07-07 23:42:19 -04:30 |
|
mark_story
|
f9de88d6cf
|
Reverted regression with ob_clean() called even when ob_start() was not
executed, introduced in cb3100f71f Refs #864. Fixes #882
|
2010-07-03 17:24:54 -04:00 |
|
mark_story
|
8b847cffef
|
Merge branch '2.0' into 2.0-request
Conflicts:
cake/libs/view/helper.php
cake/tests/cases/libs/controller/components/request_handler.test.php
|
2010-06-30 22:54:28 -04:00 |
|
mark_story
|
2020675078
|
Merge branch '1.3' into 2.0
Conflicts:
cake/dispatcher.php
cake/tests/cases/libs/controller/components/request_handler.test.php
|
2010-06-30 22:47:27 -04:00 |
|
mark_story
|
e18e0cc64e
|
Removing blank line.
|
2010-06-30 20:52:58 -04:00 |
|
mark_story
|
8b9d9b1b12
|
Removing literal '/' for DS which works better under windows.
|
2010-06-30 20:37:09 -04:00 |
|
mark_story
|
16cae72417
|
Using App::themePath inside Dispatcher.
|
2010-06-30 20:23:04 -04:00 |
|
mark_story
|
3e6cd0be44
|
Removing inheritance on Object as Dispatcher has no use for the inherited methods.
Removing flush() call as it was causing the test suite to not display anything.
|
2010-06-29 00:13:24 -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
|
cb3100f71f
|
Applying patch from 'tbhot3ww' to make Dispatcher::asset() more forgiving with whitespace. Fixes #864
|
2010-06-28 22:35:07 -04:00 |
|
mark_story
|
8f25547fc1
|
Applying patch from 'tbhot3ww' to make Dispatcher::asset() more forgiving with whitespace. Fixes #864
|
2010-06-28 22:34:47 -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
|
a1911b4714
|
Changing array_key_exists for the faster isset().
|
2010-06-20 22:05:56 -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 |
|
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
|
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 |
|
Mark Story
|
1a460e47f1
|
Removing reference operators in Controller and its tests.
|
2010-05-06 22:48:48 -04:00 |
|
Mark Story
|
d94ff92a9d
|
Merge branch '2.0' into 2.0-request
Conflicts:
cake/libs/view/pages/home.ctp
cake/tests/cases/dispatcher.test.php
cake/tests/lib/reporter/cake_html_reporter.php
|
2010-05-02 18:03:23 -04:00 |
|
Mark Story
|
adf604a966
|
Merge branch '1.3' into 2.0
Conflicts:
cake/console/templates/default/actions/controller_actions.ctp
cake/console/templates/default/views/form.ctp
cake/console/templates/default/views/index.ctp
cake/console/templates/default/views/view.ctp
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/view/pages/home.ctp
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/model/cake_schema.test.php
|
2010-05-02 17:53:42 -04:00 |
|
Mark Story
|
4a0ead8a62
|
Fixing asset filtering for assets in themes and plugins. These assets should now correctly enter the configured asset filters. Fixes #650. Fixes #160
|
2010-05-02 16:48:35 -04:00 |
|
Mark Story
|
26279851e1
|
Making Router::setRequestInfo() able to accept arrays. It will convert older style arrays into a CakeRequest object for later use.
Updating uses of Router::setRequestInfo() to just pass the object where possible.
|
2010-05-02 01:59:56 -04:00 |
|
Mark Story
|
e336df6de8
|
Updating some uses of Router::setRequestInfo().
|
2010-05-02 01:43:37 -04:00 |
|
Mark Story
|
bd1365f8ae
|
Changing interactions inside Router so it doesn't need a CakeRequest object, makes changes to Router test not necessary.
|
2010-05-02 00:29:35 -04:00 |
|
Mark Story
|
d2ea077b81
|
Moving parameter parsing below asset dispatching, should speed up asset dispatching.
Updating + fixing tests to reflect API changes and fixing some issues where router was breaking assets.
|
2010-05-01 23:19:47 -04:00 |
|
Mark Story
|
fbd70bf23c
|
Making Dispatcher::parseParams require a CakeRequest object instead of as string url. Updating tests in the Dispatcher, and fixing an issue where POST params would be wiped out by Router.
|
2010-05-01 10:48:30 -04:00 |
|
Mark Story
|
ffd05ffc3e
|
Removing methods from Dispatcher that have been moved to CakeRequest.
Removing test cases for features that don't exist anymore.
Updating Router and Dispatcher to use the request object.
|
2010-05-01 01:43:06 -04:00 |
|
Mark Story
|
bb239e3816
|
Fixing parse error in php4 for MediaView. Also fixing undefined variable error in Dispatcher. Fixes #628
|
2010-04-27 22:42:33 -04:00 |
|
Mark Story
|
50c04332cb
|
Moving methods that do not need to be private into protected.
|
2010-04-23 22:08:11 -04:00 |
|
predominant
|
92215e1795
|
Merge remote branch 'origin/1.3' into 2.0
Conflicts:
cake/libs/inflector.php
cake/libs/view/helpers/text.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/view/helpers/time.test.php
|
2010-04-16 23:43:28 +10:00 |
|
predominant
|
c7fcaf995f
|
Convert getMictime() php4 hack to microtime(true)
|
2010-04-16 02:58:28 +10:00 |
|
Mark Story
|
431b1f2328
|
Removing parameter mangling that is no longer needed.
|
2010-04-10 21:21:53 -04:00 |
|
predominant
|
52cdef900b
|
Merge remote branch 'origin/1.3' into 2.0
Conflicts:
cake/dispatcher.php
cake/libs/model/behaviors/acl.php
cake/libs/model/behaviors/containable.php
cake/libs/model/behaviors/tree.php
cake/libs/router.php
cake/tests/cases/libs/validation.test.php
|
2010-04-09 22:05:00 +10:00 |
|
predominant
|
94603b2cb7
|
Making dispatcher constructor public and removing return statement.
|
2010-04-09 13:19:47 +10:00 |
|
predominant
|
50a547167b
|
Changing protected methods to specify protected access.
|
2010-04-05 13:21:28 +10:00 |
|
predominant
|
1497ec3910
|
Changed all public methods to specify public access.
|
2010-04-05 13:19:38 +10:00 |
|
predominant
|
850ca02bb6
|
Changed all public 'var' declarations to be 'public $var'
|
2010-04-04 17:14:00 +10:00 |
|
Mark Story
|
6fe46314c9
|
Removing Dispatcher::_restructureParams() as it is no longer used.
|
2010-04-03 23:56:06 -04:00 |
|
Mark Story
|
ed60939292
|
Fixing tests that should have never worked, and removing additional calls to _restructureParams. Adding in prefixed plugin shortcuts as they were missing.
|
2010-04-03 23:32:14 -04:00 |
|
Mark Story
|
2814ddc2d5
|
Modifying Dispatcher tests to modify private variables (which is bad, but there is no way to change which plugins Router uses to create patterns). This allows the removal of two calls to _restructureParams.
|
2010-04-03 22:24:31 -04:00 |
|
Mark Story
|
8ff0b536d8
|
Fixing @link tags and updating documentation for basics.php, Controller, and Dispatcher.
|
2010-03-28 11:28:03 -04:00 |
|
Mark Story
|
38d53b9359
|
Fixing typo in dispatcher. Fixes #420
|
2010-03-04 22:04:50 -05:00 |
|
Mark Story
|
cec6692123
|
Re-arrange the arguments of triggerCallback. Modifying Dispatcher so its not calling methods on Component directly. Additional methods added to Controller.
|
2010-02-27 22:01:08 -05:00 |
|
Mark Story
|
6a3347ef7c
|
Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
cake/VERSION.txt
cake/config/config.php
cake/console/libs/tasks/model.php
cake/dispatcher.php
cake/libs/l10n.php
cake/libs/model/datasources/dbo_source.php
cake/libs/view/pages/home.ctp
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/text.test.php
|
2010-02-20 01:32:04 -05:00 |
|
Mark Story
|
bff7ce6925
|
Refactoring Dispatcher::asset() to remove code left behind from previous
refactoring. Simplifies asset location as well.
|
2010-02-16 23:31:54 -05:00 |
|
Mark Story
|
0b1efd3e86
|
Fixing delivery of plugin assets that reside in the root of a plugin webroot directory. Tests added.
|
2010-02-16 23:18:49 -05:00 |
|