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
|
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 |
|
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
|
b1c89496c5
|
Fixing typo in Cache doc block.
Updating formatting in Xcache doc block.
Fixing Xcache test case so it passes when username and password are not user & password.
|
2009-11-21 15:19:11 -05:00 |
|
Juan Basso
|
71df8dbbba
|
Replace function sizeof (alias) by count.
Signed-off-by: Mark Story <mark@mark-story.com>
|
2009-11-21 13:50:57 -05:00 |
|
burzum
|
67cea6d21c
|
Fixing a problem with setting Paginator::sort() defaults directon to desc
|
2009-11-17 02:11:23 +01:00 |
|
Jippi
|
e6801c22e1
|
Merge branch '1.3' of code.cakephp.org:cakephp into 1.3
|
2009-11-16 23:19:11 +00:00 |
|
Jippi
|
2cb0c3acb3
|
Changed SessionHelper::flash to return message instead of echoing it
|
2009-11-16 23:15:24 +00:00 |
|
mark_story
|
aa97daeea9
|
Updating test due to merge conflicts.
|
2009-11-15 20:09:35 -05:00 |
|
mark_story
|
acd2c15690
|
Merge branch '1.3-misc' into 1.3-merger
Conflicts:
cake/tests/cases/libs/configure.test.php
|
2009-11-15 20:09:12 -05:00 |
|
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
|
0783176238
|
Replacing duplicated code with pluginSplit().
Updating test case.
|
2009-11-15 19:55:20 -05:00 |
|
ceeram
|
7a4793a20c
|
refactoring Configure::load() to load config files from plugins, tests and config files added
Signed-off-by: Mark Story <mark@mark-story.com>
|
2009-11-15 17:56:49 -05:00 |
|
mark_story
|
31102ad412
|
Adding tests for App::pluginPath that were omitted before.
|
2009-11-15 16:38:02 -05:00 |
|
mark_story
|
0b2fc5b35f
|
Adding tests for phone() pass through to localized class.
|
2009-11-14 20:52:11 -05:00 |
|
mark_story
|
fa14f9cebc
|
Merge branch '1.3-validation' into 1.3-misc
|
2009-11-14 20:46:48 -05:00 |
|
mark_story
|
b452e8367f
|
Adding tests for CakeLog::drop()
|
2009-11-14 20:44:42 -05:00 |
|
mark_story
|
be9f0ec4c7
|
Renaming method so they match those in Cache.
Removing method that was missed during previous refactor.
Updating tests.
|
2009-11-14 20:42:57 -05:00 |
|
mark_story
|
b7e7eff738
|
Fixing doc blocks.
|
2009-11-14 20:24:18 -05:00 |
|
mark_story
|
70820e2e96
|
Renaming unconfig to drop.
|
2009-11-14 20:18:58 -05:00 |
|
mark_story
|
caedbdf98a
|
Adding Cache::configured() and Cache::unconfig(). configured() allows introspection on the currently configured settings. unconfig() allows for the removal of cache configs.
Tests added.
|
2009-11-14 20:10:40 -05:00 |
|
mark_story
|
b6978ab25f
|
Adding the ability to load cache engine classes from plugins and app libs.
Also enabled the ability for App cache classes to override core ones.
Test cases added.
Removed unnecessary subclassing of Object.
|
2009-11-14 20:10:40 -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 |
|
predominant
|
0977b3fe15
|
Standardising docblock endings throughout.
|
2009-11-14 23:19:25 +11: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
|
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
|
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
|
63ee8f0fcd
|
Starting pass through validation handling.
Implemented phone, and postal pass throughs.
Adding tests.
|
2009-11-10 21:20:39 -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
|
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
|
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
|
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
|
4a08bd120d
|
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
|
2009-11-07 10:41:12 -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
|
ab76cb1217
|
Merge branch '1.3' into 1.3-misc
|
2009-11-06 09:25:11 -05:00 |
|
predominant
|
884490f1a1
|
Removing leftover SVN tags.
|
2009-11-06 18:35:14 +11:00 |
|
predominant
|
62810fb4f4
|
Updating more Copyright dates.
|
2009-11-06 18:04:38 +11:00 |
|
predominant
|
1185681549
|
Removing newline caused by Subversion line removal.
|
2009-11-06 18:01:22 +11:00 |
|
predominant
|
384bb7a0e0
|
Update license lines throughout.
|
2009-11-06 17:51:51 +11:00 |
|
predominant
|
d7b604c8ed
|
Fixing links throughout
|
2009-11-06 17:46:59 +11:00 |
|
predominant
|
8ff6505fe8
|
Removing excess whitespace
|
2009-11-06 17:08:23 +11:00 |
|
predominant
|
6782cb019c
|
Update CakePHP Project link.
|
2009-11-06 17:00:11 +11:00 |
|