Commit graph

6005 commits

Author SHA1 Message Date
mark_story
7259a1b920 Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/helpers/text.php
	cake/libs/view/theme.php
2009-12-06 21:43:53 -05:00
mark_story
4cefb5fbd0 Applying patch from kleingeist to fix Js->value incorrectly calling Helper::value() 2009-12-06 20:45:12 -05:00
mark_story
cc750d15f1 Adding test to disprove #385. Proves saveAll with validate => first behaves correctly. 2009-12-04 14:39:12 -05:00
mark_story
be64f26f9f Updating doc blocks for model::validates. 2009-12-03 00:53:31 -05:00
mark_story
6046528744 Moving XmlNode::__killParent() to a protected method so Xml can access it. Adding _killParent(true) call to Xml::__destruct. Forces destruction of circular references held in child objects when an xml object is garbage collected. Fixes #369 2009-12-01 10:01:36 -05:00
mark_story
547ed839d9 Correcting constructor of MediaView to fix issues with viewVars not being set.
Correcting use of MediaView in Dispatcher.  Fixes #366
2009-12-01 09:50:27 -05:00
mark_story
0293a840c5 Adding test to disprove #368. FormHelper::year() is working correctly and includes model name in the input name attribute. 2009-11-30 13:43:26 -05:00
mark_story
cd46f4db2e Fixing function signature of ThemeView constructor. Fixes issues where ThemeView would always be registered causing issues with EmailComponent and themed views. Fixes #370 2009-11-30 09:19:25 -05:00
mark_story
fccfe14e8d Expanding doc block for ClassRegistry. 2009-11-30 09:18:24 -05:00
mark_story
26aa3731e0 Fixing _name_ elements being inserted into serialized xml from Xml lib. Test case added. Fixes #367 2009-11-27 14:27:32 -05:00
phpnut
8bc84948f0 Adding more tests for theme assets 2009-11-27 10:27:15 -06:00
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
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
phpnut
3ad0595b86 Forgot to add plugin elements for additional tests 2009-11-25 23:20:43 -06: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
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
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
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
mark_story
4d37e75f18 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/controller/components/cookie.php
	cake/libs/debugger.php
	cake/libs/flay.php
	cake/libs/http_socket.php
	cake/libs/inflector.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
mark_story
33ef318fce Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-22 18:19:03 -05:00
ceeram
cd6fd74caf Added -empty flag for ProjectTask to bake with empty dir files, tests included
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-22 18:18:14 -05:00
mark_story
2e0acbf505 Making habtm join conditions used by __saveMulti when finding link records to remove. It should be noted that having conditions on non-joinTable tables, and not having a model on the joinTable can cause SQL issues. Fixes #304 2009-11-22 17:56:46 -05:00
mark_story
6c3bcdd7e6 Removing commented code. 2009-11-22 17:34:11 -05:00
AD7six
4f3852618f correcting $this -> $self
removing debug code
2009-11-22 19:58:10 +01:00
robustsolution
b0aec35422 Dispatch::baseUrl() needs optimization a little bit
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-22 12:30:54 -05:00
Juan Basso
c6c7474502 Fix test of the size of lines in MagicDb (included test for it).
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-22 12:27:57 -05:00
mark_story
7e889d8495 Changing require_once to require for custom session handlers. If you are using a class to do your custom session handling you must include checks to prevent duplicate class errors. Fixes #324 2009-11-22 12:25:53 -05:00
mark_story
f038cb8ffb Updating default bake templates to exclude primary key input for all actions containing 'add'
Fixes #319
2009-11-21 21:10:31 -05:00
mark_story
a30aec99fd Applying patch from 'robustsolution' for optimization in Dispatcher::dispatch. Fixes #317 2009-11-21 21:00:15 -05:00