Commit graph

6081 commits

Author SHA1 Message Date
predominant
490e76460f Changing quotes and adding spaces. Standarization cleanup. 2009-11-06 13:46:49 +11:00
mark_story
1e70119232 Adding basics to lib group, it wasn't part of any group before. 2009-11-05 19:20:35 -05:00
mark_story
afdcd36687 Fixing test broken by merge. 2009-11-05 19:18:38 -05:00
burzum
f0d0959992 Refs #261 2009-11-06 00:08:56 +01:00
predominant
2669b6179f Fix committed merge conflict for home page. 2009-11-05 14:30:56 +11:00
mark_story
380b49a446 Fixing Helper::value() and extraction of habtm data. Refs #256 2009-11-04 14:05:12 -05:00
mark_story
b974127562 Adding tests for habtm data selection. Refs #256 2009-11-04 13:56:44 -05:00
mark_story
5f1d090bf0 Adding import()s to DbConfigTask and ModelTask to fix missing class errors, when methods are run in certain orders. 2009-11-04 13:21:05 -05:00
mark_story
f81d3da175 Moving import to fix issue where cakeschema would not be found when baking models. 2009-11-04 12:59:32 -05:00
mark_story
dc07a05fca Merge branch '1.3' into 1.3-misc 2009-11-04 09:20:21 -05:00
tPl0ch
f5ca3ace1f Modified Model::find() to make Model::findQueryType available in Model callbacks. Fixes https://trac.cakephp.org/ticket/5847. Tests added
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-04 09:16:04 -05:00
mark_story
5a6a6e5364 Fixing doc block for APPLIBS 2009-11-04 09:10:57 -05:00
mark_story
3eeb6eaad2 Removing duplicate block 2009-11-04 09:09:41 -05:00
predominant
59c62426c9 Merge branch '1.3-misc' of code.cakephp.org:cakephp into 1.3-misc 2009-11-04 16:11:35 +11:00
predominant
cf42c8dd7f Updating default views and baking templates to use $this->Helper syntax for helpers. 2009-11-04 15:52:56 +11:00
mark_story
12c7203c71 Merge branch '1.3-alpha' into 1.3
Conflicts:
	cake/libs/view/pages/home.ctp
2009-11-03 23:19:01 -05:00
mark_story
5da3becc18 Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3 2009-11-03 23:16:40 -05:00
phpnut
2bf630f209 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-03 22:03:09 -06:00
phpnut
a1ce9e662c Fixing real issue for Ticket #137
Reverted changes replacing [ and ] with .
2009-11-03 22:02:26 -06:00
mark_story
1d22adbc1a Merge branch '1.3-misc' into 1.3 2009-11-03 22:50:11 -05:00
mark_story
adb4dcf1c4 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-03 22:47:22 -05:00
predominant
7383e97115 Adding datasources array to Configure. 2009-11-04 14:45:44 +11:00
mark_story
0aecb9de2d Applying patch from 'dogmatic' to update home.ctp to use helper methods, and i18n. 2009-11-03 22:40:36 -05:00
mark_story
bc8d920c0f Updating changelog link on home.ctp 2009-11-03 19:53:59 -05:00
mark_story
4965ab5bdc Updating version numbers for 1.3.0-alpha 2009-11-03 19:52:03 -05:00
mark_story
d17c526dc3 Fixing String::insert() when $data is an empty array. Which was happening in the dbo source tests. 2009-11-03 18:21:01 -05:00
mark_story
4632402a25 Fixing controller test to run when app/views/posts/index.ctp is present. 2009-11-03 17:42:42 -05:00
mark_story
3b3ceddfdb Fixing Email test to account for whitespace changes done on view files. 2009-11-03 17:39:59 -05:00
mark_story
df4cd12d0f Fixing RequestHandler test case when app/views/posts/index.ctp is available. 2009-11-03 17:19:02 -05:00
mark_story
055b5c66aa Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-02 23:59:25 -05:00
renan.saddam
5ebdc88223 Fixing declaration of @access property. 2009-11-02 21:54:03 -02:00
mark_story
fc9cecc24e Converting spaces to tabs. 2009-11-02 13:51:46 -05:00
renan.saddam
91b9e1d50b Updating docblock for FormHelper::dateTime method. 2009-11-02 13:57:05 -02:00
renan.saddam
034b5c435c Allowing FormHelper::month() to use a $monthNames array as values. 2009-11-02 13:51:16 -02:00
ceeram
988ab2d29f fixes Ticket #6300
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-02 00:19:44 -05:00
ceeram
a3775937a4 Tests updated for new output of FormHelper::input
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-02 00:19:01 -05:00
mark_story
b39df8ce2b Removing reference to deprecated method. 2009-11-01 12:58:09 -05:00
mark_story
f033516fcc Moving inflector test around, fixes group test fails. 2009-11-01 12:53:47 -05:00
mark_story
d77761e03b Fixing merged test from 1.2 2009-11-01 12:31:57 -05:00
mark_story
d956378d48 Improving console group test suite.
Still getting intermittant fails from controller task.
2009-11-01 12:31:41 -05:00
mark_story
ac97dfd70d Fixing api shell test case. 2009-11-01 12:25:40 -05:00
mark_story
35fa099f6a Updating ajax helper test to reflect changes in FormHelper parameter usage. 2009-11-01 12:20:37 -05:00
mark_story
a3bb77c4f3 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/acl.php
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/db_config.php
	cake/console/libs/tasks/model.php
	cake/console/libs/templates/skel/views/layouts/xml/default.ctp
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/validation.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/basics.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/no_database.group.php
2009-11-01 12:11:49 -05:00
mark_story
44d7742b85 Minor refactoring and removal of duplicate test. 2009-10-31 16:28:43 -04:00
tPl0ch
2331cfde60 Added 'before' and 'after' options to FormHelper::submit(). Test cases updated.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-10-31 16:21:53 -04:00
mark_story
a855a6aa41 Renaming variable. 2009-10-31 16:16:58 -04:00
mark_story
cab64b780c Refactoring switch in Scaffold. 2009-10-31 16:16:25 -04:00
mark_story
3a59bf5ed6 Updating Scaffold to work with any single prefix. You can set $scaffold = to any prefix defined in Routing.prefixes.
Tests added.
2009-10-31 16:06:20 -04:00
mark_story
873760aae4 Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2 2009-10-31 15:05:51 -04:00
mark_story
51244907d1 Updating merge vars test to skip itself if run in a group context.
Updating controller group.
2009-10-31 14:55:04 -04:00