mark_story
58383d3cb9
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/model.php
2009-11-15 20:05:55 -05:00
mark_story
63ab96d751
Setting $primary = false inside DboSource::queryAssociation. Fixed #208
2009-11-15 17:48:41 -05:00
mark_story
ea6e3dd076
Fixing issue with bake model <name>
2009-11-15 16:47:58 -05:00
mark_story
6039d6ebe4
Applying optimization in Dispatcher::parseParams() from 'robustsolution'. Fixes #309
2009-11-15 15:32:58 -05:00
mark_story
17e377de7e
Updating doc block for MemcacheEngine
2009-11-14 19:40:30 -05:00
ADmad
862ff82ad4
Updating Configure::store to fix escaping issues
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-14 19:38:53 -05:00
mark_story
06d4e5e553
Reformatting code in memcache.
...
Adding unset() to test case to remove unnecessary keys that can cause test failure.
2009-11-14 18:50:23 -05:00
mark_story
8b1a2b1f72
Applying optimization in Router::__parseExtension from 'robustsolution'. Fixes #301
2009-11-14 16:29:33 -05:00
mark_story
9376826aa4
Fixing HttpSocket::buildUri when host key is empty.
...
Tests added
Fixes #271
2009-11-13 14:42:40 -05:00
mark_story
d93c94f702
Fixing failing test, picked in from 1.2.
2009-11-13 09:53:31 -05:00
mark_story
bfde6b81fe
Adding test to form helper to increase code coverage.
2009-11-13 09:48:31 -05:00
mark_story
8d407ac915
Adding test to form helper to increase code coverage.
2009-11-13 09:45:25 -05:00
mark_story
d302ed1bfa
Fixing comment block formatting.
2009-11-13 09:44:51 -05:00
ceeram
a67a97722a
refs #291
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-13 09:25:47 -05:00
ceeram
ea482442ff
test to prove ticket #291
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-13 09:22:05 -05:00
mark_story
13f9b79dc9
Removing console/libs/templates. Has been moved in 1.3 and a merge with 1.2 added it again.
2009-11-13 09:15:31 -05:00
mark_story
2c5fa171e0
Updating CakeSchema to pass a Model object into DboSource::fullTableName(); Fixes schema's not correctly reading tablePrefixes.
...
Fixes #290
2009-11-13 00:43:40 -05:00
nate
1c8a2f232b
Changes Model::find() to allow modification of DataSource connection during callbacks.
2009-11-12 14:48:03 -05:00
mark_story
38f578199d
Changing new Model() for ClassRegistry::init(). Fixes issues when baking admin and non-admin methods for a controller that uses bound translations + TranslateBehavior. Fixes #245
2009-11-12 09:32:45 -05:00
mark_story
61d56cd275
Changing order of text in project task.
...
Making ProjectTask::getPrefix silent when interactive = false.
Making ProjectTask silent from View task if all or a controller name is provided.
2009-11-11 09:56:35 -05:00
ceeram
db526ddfb7
Fixing docblock in bootstrap.php, adding missing quote.
...
refs #280
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-10 09:24:56 -05:00
mark_story
0d37beca75
Removing duplicate variable assignment.
2009-11-10 09:23:43 -05:00
mark_story
b39b38aac9
Adding missing variable.
...
Adding Test case for previous commit.
2009-11-10 09:17:54 -05:00
mark_story
2af5318e7a
Moving import in ModelTask to fix issue running bake model all.
2009-11-09 23:54:59 -05:00
mark_story
f0628d100b
Fixing issues with getting values from habtm data after form posting and validation has failed.
...
Tests added.
Refs #279
2009-11-09 21:00:19 -05:00
mark_story
adaa2b689c
Adding test case for previous commit.
...
Fixing function for non-windows paths.
2009-11-09 20:10:24 -05:00
ceeram
c810b3cde4
Making ProjectTask bake constants with DS instead of hardcoded / or \.
...
Makes developing/deploying to mixed systems easier.
refs #278
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-09 18:58:21 -05:00
ceeram
d251a1d5ca
Adding config() call to ensure that DATABASE_CONFIG has been
...
loaded before attempting to use it.
refs #277
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-09 18:55:37 -05:00
mark_story
fa1b7f617f
Fixing issues caused by merge with 1.2.
2009-11-09 14:07:19 -05:00
mark_story
c4b493c934
Manually merging changes from ModelTask in 1.2 to FixtureTask
...
Adding test cases for FixtureTask.
2009-11-08 22:22:08 -05:00
mark_story
6b5c247162
Merge commit 'origin/1.2' into mergers
...
Conflicts:
cake/bootstrap.php
cake/console/cake.php
cake/console/libs/tasks/model.php
cake/libs/configure.php
cake/libs/view/helpers/cache.php
cake/libs/view/helpers/paginator.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/libs/view/helpers/cache.test.php
2009-11-08 22:21:21 -05:00
mark_story
7981b44db4
Merge branch '1.3-misc' into mergers
2009-11-08 21:39:55 -05:00
mark_story
a7a6dc8c43
Fixing issue where SecurityComponent::_validatePost could generate notices if elements were removed from _Token array.
...
Tests Added
Fixed #228
2009-11-08 14:12:18 -05:00
mark_story
6b79c8d375
Adding checks for parent classname when converting error method names. Fixes #273
2009-11-08 14:07:25 -05:00
mark_story
95cafc7138
Adding missing help text.
2009-11-08 13:46:45 -05:00
mark_story
82a2b1a019
Changing import of Dispatcher to direct require.
...
Modifying order of operations in Configure::__loadBootstrap()
moving inclusion of app/config/bootstrap.php after the creation of core cache configs. This allows App::import() to be used in the bootstrap file with cached paths.
2009-11-07 17:53:14 -05:00
mark_story
6db91b0f49
Fixing issues in ContainableBehavior that could leave models unbound when 'fields' was used as part of containment conditions. Fixes #253
2009-11-07 17:43:18 -05:00
ceeram
dd0c4a64c5
Test to prove ticket #253
2009-11-07 11:02:43 -05:00
mark_story
30dc0cfe56
Removing unused $view property from CacheHelper.
...
Fixes #272
2009-11-07 10:44:14 -05:00
mark_story
4a08bd120d
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-07 10:41:12 -05:00
mark_story
4704a8cd00
Removing unused $view property from CacheHelper.
...
Fixes #272
2009-11-07 10:40:48 -05:00
ADmad
002a01a9d8
passedArgs from current request are auto merged with url options of paginator helper
...
Signed-off-by: Florian Krämer <florian.kraemer@cakedc.com>
2009-11-06 18:31:42 +01:00
mark_story
4deaf27cc0
Removing deprecated code in Html::css()
...
Minor refactoring in HtmlHelper methods.
Fixes #268
2009-11-06 09:31:57 -05:00
mark_story
ab76cb1217
Merge branch '1.3' into 1.3-misc
2009-11-06 09:25:11 -05:00
mark_story
e7c2fe2b7e
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-06 09:24:55 -05:00
SkieDr
ce15cc61d9
Fix order of keys in l10n catalog list
2009-11-06 15:46:54 +03:00
predominant
884490f1a1
Removing leftover SVN tags.
2009-11-06 18:35:14 +11:00
predominant
167c6e26c0
Removing more @filesource lines.
2009-11-06 18:12:27 +11:00
predominant
90248af9a4
Removing SVN lines.
2009-11-06 18:11:17 +11:00
predominant
62810fb4f4
Updating more Copyright dates.
2009-11-06 18:04:38 +11:00