Commit graph

9530 commits

Author SHA1 Message Date
mark_story
122dc65427 Merge branch 'merger' into 2.0 2011-01-08 23:51:03 -05:00
mark_story
443f6d1c5b Merge branch '1.3' into merger
Conflicts:
	cake/console/shells/tasks/test.php
	cake/libs/cake_log.php
	cake/libs/controller/components/email.php
	cake/libs/set.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/libs/view/helpers/time.php
	cake/libs/view/view.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/console/shells/tasks/test.test.php
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/db_acl.test.php
	cake/tests/cases/libs/set.test.php
2011-01-08 23:49:19 -05:00
AD7six
e024b6b43b only check the default template path is correct
this prevents a misleading error if you've more than one bake template installed
2011-01-08 14:08:28 +01:00
mark_story
8754d11aed Adding EmailComponent::_getSocket() so EmailComponent + smtp is easier to test.
Fixing issue where hosts with portnames could cause smtp emails to fail.
Added tests, fixed an existing test to not depend on a local mailserver.
Fixes #1433
2011-01-06 23:10:01 -05:00
mark_story
f45f2e4096 Making niceShort() compare the original dateString and userOffset. This fixes issues where timezone differences would cause the incorrect short form to be displayed. Fixes #1331 2011-01-05 22:53:56 -05:00
mark_story
6e2ffafe54 Fixing Set::filter() not predictably filtering in a recursive fashion. While a minor change in behavior, more predictable and uniform behavior is worth it.
Fixes #1431
2011-01-05 22:48:09 -05:00
Jeremy Harris
37b98ff1a6 Merge remote branch 'upstream/2.0' into 2.0 2011-01-05 19:07:25 -08:00
Jeremy Harris
a8ac288d1c Added $format option to TimeHelper::nice(). Fixes #433, #638, #291, #801 2011-01-05 19:06:52 -08:00
José Lorenzo Rodríguez
2b9c6b8609 optimizing sqlite driver to look for the "From" keyword in reverse order on the sql string 2011-01-04 17:44:33 -04:30
José Lorenzo Rodríguez
4948280ba8 Fixing typo in sqlite driver 2011-01-04 17:25:23 -04:30
José Lorenzo Rodríguez
665e560310 Checking for null values before converting to boolean 2011-01-04 17:00:10 -04:30
mark_story
de6eda964e Removing silent errors in PDO dbo's when a connection exception is created.
Adding the host param for mysql.
Adding a test for mysql missing the host param.
Fixes #1427
2011-01-03 23:34:22 -05:00
mark_story
d3d009588d Fixing failing tests because of incorrect types. 2011-01-03 23:06:48 -05:00
Jeremy Harris
4d2fdcd15e Added support for using plugin syntax in App::objects(). Fixes #1366 2011-01-03 19:27:21 -08:00
mark_story
c58f835d9b Fixing tests that were passing by accident. The mockObjects array wasn't being appended to so tests were passing when they shouldn't have.
Fixing more failing tests.
2011-01-03 16:07:49 -05:00
mark_story
09d357cc43 Removing empty fixtures array. 2011-01-02 22:33:49 -05:00
Jeremy Harris
733f4f395e Reordered PaginatorHelper::sort() key and title to be more consistent.
Fixes #1000
2011-01-02 18:44:41 -05:00
José Lorenzo Rodríguez
5a75d1d91a Adding boolean casts for sqlite 2011-01-02 01:26:57 -04:30
José Lorenzo Rodríguez
fe18e31b79 Changes to make sqlite recognize boolean columns declared as "boolean", so they can be casted to native php type 2011-01-01 22:11:28 -04:30
José Lorenzo Rodríguez
1d530db39b Changing a bit how postgres driver treats booleans so it correcty casts them 2011-01-01 22:09:22 -04:30
José Lorenzo Rodríguez
da152e0e82 Changes to make mysql cast boolean vaules to the native php boolean datatype 2011-01-01 22:07:27 -04:30
mark_story
04c602e3d0 Fixing issues with isThisWeek() when the year ends midweek. 2010-12-31 16:37:16 -05:00
mark_story
1f6fba9d9e Fixing failing test caused by missing space. 2010-12-31 16:36:14 -05:00
mark_story
5768bfe5c7 Fixing failing test caused by missing space. 2010-12-31 16:35:44 -05:00
mark_story
a7061510c1 Applying patch from 'rynop'. Fixing FixtureTask so it includes the datasource if its not the default one.
Updating tests.
Fixes #1419
2010-12-31 13:05:04 -05:00
mark_story
a9a1994a7e Merge branch '2.0-pagination' into 2.0 2010-12-31 12:37:53 -05:00
mark_story
2e0f2c75f4 Fixing issue where ClassRegistry would not be loaded when using Models
in shells.  Fixes #1417
2010-12-29 10:44:15 -05:00
mark_story
7dd1eea285 Updating documentation for paginator helper, and component. 2010-12-28 22:26:33 -05:00
mark_story
ab552c22a1 Adding a usage sample to Paginator->numbers() 2010-12-28 00:09:47 -05:00
mark_story
eb38b8b60c Fixing more boundary issues with first() and last(). When you entered a first/last range a wonky page link would be generated. Tests added. 2010-12-27 23:40:10 -05:00
mark_story
85baa180d9 Adding usage and expanding doc blocks for PaginatorHelper. 2010-12-27 23:30:10 -05:00
mark_story
b6b4f4a3df Fixing deprecated access to $this->data. 2010-12-27 15:34:56 -05:00
mark_story
5092013304 Making EmailComponent register and un-register its view object, when rendering email templates. This allows helpers to use the view to do additional processing. Fixes #442 2010-12-27 15:12:27 -05:00
mark_story
e003bd6ea9 Adding rel attributes for first and last links. These attribute values are part of the html5 spec, and fit with the intention of #370 2010-12-27 10:48:38 -05:00
mark_story
c5c638e8f5 Fixing option documentation. 2010-12-27 10:40:50 -05:00
mark_story
fd88d57513 Fixing option documentation. 2010-12-27 10:40:21 -05:00
mark_story
af608f68ef Updating test cases for the addition of rel attributes to links generated by PaginatorHelper. Also removed rel attributes for disabled elements, as they are probably not link tags. Fixes #370 2010-12-27 10:38:30 -05:00
Dieter Plaetinck
65394604a7 Give PaginatorHelper's next/prev links the correct 'rel' attribute
It's a good idea to give links such as next/prev the 'rel' attribute.
See the following pages for more information:
http://www.w3.org/TR/html4/struct/links.html#edef-A
http://www.w3.org/TR/html4/types.html#type-links

Signed-off-by: mark_story <mark@mark-story.com>
2010-12-27 10:25:19 -05:00
mark_story
b82ad15c5e Fixing issue in console when baking a new project, from outside the
installation directory you would get an error because database.php could
not be found.  Fixes #1406
2010-12-27 00:19:59 -05:00
mark_story
3d966be1e8 Fixing fatal error caused by Debugger not being loaded when viewing the default home page. 2010-12-27 00:07:47 -05:00
mark_story
5ce66d3031 Changing how PaginatorComponent::paginate()'s $whitelist param works. It now serves as the whitelist for fields ordering can be done on. It previously allowed you to whitelist things you passed into paginate(), which was kind of useless.
Updated tests.
Fixes #430
2010-12-26 21:30:43 -05:00
mark_story
9615370b72 Merge branch '2.0' into 2.0-pagination
Conflicts:
	cake/libs/http_socket.php
2010-12-26 21:02:04 -05:00
mark_story
be963385dc Updating version numbers for 2.0.0-dev 2010-12-26 20:16:48 -05:00
mark_story
6f1eca79ac Fixing calltime pass by reference deprecation warnings. 2010-12-26 20:11:17 -05:00
mark_story
f62a067d7c Making it possible for behaviors to define paginate and paginateCount. Updated test to ensure the component calls the correct methods.
Fixes #1373
2010-12-26 17:40:34 -05:00
mark_story
fd3b4b2cd5 Adding Model::hasMethod() and tests. 2010-12-26 17:35:22 -05:00
mark_story
c5fa93b0fb Removing test that is testing methods covered in ObjectCollection test case. 2010-12-26 17:26:18 -05:00
mark_story
3022e2d785 Adding documentation. 2010-12-26 17:21:49 -05:00
mark_story
ad5a1ca6b7 Making __methods and __mappedMethods protected instead of private. 2010-12-26 17:10:16 -05:00
mark_story
0c4b665ad0 Adding ability for BehaviorCollection::hasMethod() to return the callback.
Re-factored BehaviorCollection::dispatchMethod to be simpler and faster.
Changing now BehaviorCollection stores callbacks so they look like normal php callback arrays.
2010-12-26 17:09:20 -05:00