phpnut
7b78e475ca
Merge branch '1.3' of code.cakephp.org:cakephp into 1.3
2009-11-27 00:55:45 -06:00
phpnut
43fdde2dad
Removing unneeded code in Dispatcher::cached();
...
Fixing path search for themes
2009-11-27 00:49:20 -06:00
mark_story
fd98bc5d76
Expanding tests on Router and RouterRoute.
2009-11-26 23:46:42 -05:00
mark_story
feb0dec970
Starting tests for RouterRouter::parse()
2009-11-26 23:01:54 -05:00
mark_story
89d0ed8f3b
Route compilation tests passing again.
2009-11-26 21:42:33 -05:00
mark_story
8315b48e77
Removing String::getInstance() as it was causing fatal errors when eAccelerator was enabled, and is a deprecated method.
2009-11-26 18:24:14 -05:00
mark_story
18e0537869
Adding variable initialization
2009-11-26 17:50:33 -05:00
phpnut
21d2226f75
Merge branch '1.3' of code.cakephp.org:cakephp into 1.3
2009-11-26 14:53:06 -06:00
phpnut
903a1fd95a
Adding new Configure::$App['www_root']
...
Helper::webroot(); will now check for theme assets in APP/webroot/theme/<theme_name>/
Adding ico key to Media::$mimeType;
Fixed bug in previous commits that would not use views/themed/<theme_name>/layouts/ from a plugin
Adding test cases for Helper::webroot();
Adding more tests for ThemeView.
2009-11-26 14:52:38 -06:00
renan.saddam
f9204ebe7c
Adding $pos = 0; to avoid php notice.
2009-11-26 17:52:14 -02:00
ADmad
ad20e43730
Removing unneeded code for minor optimization
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-26 09:54:25 -05:00
mark_story
3907893263
Adding tests for incorrect function used in form.ctp.
...
Fixing mistyped function name. Fixes #364
2009-11-26 09:52:15 -05:00
mark_story
c4ceeabcf5
More tests and more passing tests for Route compilation.
...
Basic route compiling complete.
2009-11-26 09:41:05 -05:00
phpnut
3ad0595b86
Forgot to add plugin elements for additional tests
2009-11-25 23:20:43 -06:00
mark_story
6661c2fa70
Starting to refactor RouterRoute::_writeRoute
2009-11-26 00:17:43 -05:00
phpnut
f83a024a10
Increasing code coverage for View and ThemeView
2009-11-25 23:17:15 -06:00
phpnut
948f6b21e5
Refactored last commit changes are:
...
To override plugin views with a themed version of the view you would create:
<app_name>/views/themed/<theme_name>/plugins/<plugin_name>/<controller_name>/*.ctp
To override plugin views at the app view level you would create:
<app_name>/views/plugins/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:58:02 -06:00
mark_story
0b9ae92eb9
Adding a test case for RouterRoute to increase code coverage.
2009-11-25 23:51:27 -05:00
mark_story
3885466e9a
Changing $_this to the easier to type $self.
2009-11-25 23:40:52 -05:00
mark_story
1d7881b16f
Renaming connectDefaults to defaults().
...
Updating tests.
2009-11-25 23:39:07 -05:00
phpnut
21eb001a96
Refactoring themes/views to use a centralized location instead of allowing plugins to have themes.
...
The plugin should include all required views/assets, to override these at the application level using themes you would create:
<app_name>/views/themed/<theme_name>/<plugin_name>/<controller_name>/*.ctp
if you are not using themes you can override them at the app view level:
<app_name>/views/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:29:54 -06:00
mark_story
636d944e70
Adding Router::connectDefaults(). Allows the developer to disable Router's automatic generation of routes.
2009-11-25 23:21:10 -05:00
mark_story
52264cb61c
Fixing persistent param route exiting.
...
Adding test for exiting persist param routes.
2009-11-25 23:12:48 -05:00
mark_story
35fac165b3
Merge branch '1.3-misc' into 1.3-router
...
Conflicts:
cake/libs/router.php
2009-11-25 22:57:42 -05:00
mark_story
dc769041f3
Updating project task test case to reflect changes in skel dir.
2009-11-25 22:52:33 -05:00
mark_story
ae98a556d6
Removing vendors/img, vendors/css and vendors/js from skel dirs.
2009-11-25 22:51:33 -05:00
mark_story
dd4fbbab45
Updating PluginTask to create webroot dir and no longer create vendors/css, vendors/js and vendors/img
2009-11-25 22:50:50 -05:00
mark_story
10119f52c8
Removing INFLECTIONS it pointed at a directory that didn't exist.
2009-11-25 22:27:22 -05:00
mark_story
ee26bb5259
Removing PEAR. Its not a core path, and can be added in at app/config/bootstrap.php if needed.
2009-11-25 22:24:59 -05:00
mark_story
e345b2f788
Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-25 22:23:38 -05:00
phpnut
2eb85ef558
Removed App::path('plugins'); in favor of App::pluginPath($plugin); removing need for foreach()
2009-11-25 13:04:30 -06:00
phpnut
d685c18720
Adding checks for directory traversal attempts related to recent changes allowing plugins and themes to include their own webroot/* assets
2009-11-25 12:41:19 -06:00
phpnut
49c11a8219
More work allowing assets in themes and plugins.
2009-11-25 11:06:28 -06:00
phpnut
0977029c89
Removing limit of image, js and css in plugins
2009-11-25 09:47:23 -06:00
phpnut
c942fa7038
Merge branch '1.3' of code.cakephp.org:cakephp into 1.3
2009-11-25 08:40:14 -06:00
phpnut
2254bfe5c9
Adding ability for plugins to have there own webroot.
...
plugins/<PLUGINNAME>/webroot/*
Themes can also be self contained with a webroot directory.
app/views/themed/<THEMENAME>/webroot/*
vendors directory for assets is deprecated and no longer supported
2009-11-25 01:51:25 -06:00
mark_story
64dffb7663
Moving shared method from DboMysqli and DboMysql up to DboMysqlBase. Fixes #358
2009-11-24 22:49:40 -05:00
mark_story
3b1256cefb
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-24 22:10:11 -05:00
mark_story
69b72083be
Adding docblock and removing a call to array_slice()
2009-11-24 22:06:55 -05:00
dogmatic
53bfc8cca2
a new take on toList and more tests for passing a different separator
2009-11-24 22:00:33 -05:00
dogmatic
398113f828
fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-24 20:27:56 -05:00
dogmatic
51d0805ce0
fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-24 20:23:23 -05:00
mark_story
d758dbc343
Updating cake.generic.css to let .altrow class to apply to dd and dt elements. Fixes #361
2009-11-24 19:57:20 -05:00
mark_story
58446e0785
Adding documentation note about $options['q'] Refs #357
2009-11-24 11:57:56 -05:00
mark_story
72c0e2ca5a
Applying minor optimization from 'robustsolution' to Router::connectNamed().
...
Fixes #312
2009-11-24 09:27:13 -05:00
mark_story
5aba143620
Applying optimization to Controller::postConditions from 'robustsolution' Fixes #287
2009-11-23 12:52:38 -05:00
mark_story
c94702506d
Fixing fails in Set::reverse caused by _log property being removed from Object.
2009-11-22 21:31:44 -05:00
mark_story
8cdee90b4f
Merge branch '1.3-misc' into 1.3-merger
...
Conflicts:
cake/libs/view/helpers/html.php
2009-11-22 21:28:14 -05:00
mark_story
6fdaa82969
Merge branch '1.3' into 1.3-merger
2009-11-22 21:26:39 -05:00
mark_story
f28b3c6efd
Fixing failing tests on ModelIntegrationTest related to with keys with bound fields set not retaining the fields set.
2009-11-22 21:26:25 -05:00
