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
|
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 |
|
predominant
|
0977b3fe15
|
Standardising docblock endings throughout.
|
2009-11-14 23:19:25 +11:00 |
|
mark_story
|
d302ed1bfa
|
Fixing comment block formatting.
|
2009-11-13 09:44:51 -05:00 |
|
nate
|
1c8a2f232b
|
Changes Model::find() to allow modification of DataSource connection during callbacks.
|
2009-11-12 14:48:03 -05:00 |
|
predominant
|
d7b604c8ed
|
Fixing links throughout
|
2009-11-06 17:46:59 +11:00 |
|
predominant
|
8f75ff58c7
|
Removing @filesource
|
2009-11-06 15:24:02 +11: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
|
d1f5acd0e0
|
Merge commit 'origin/1.2' into 1.2-merge-in
Conflicts:
cake/console/libs/shell.php
cake/libs/model/connection_manager.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/javascript.php
cake/tests/cases/libs/i18n.test.php
cake/tests/cases/libs/model/connection_manager.test.php
cake/tests/cases/libs/model/model_read.test.php
cake/tests/cases/libs/view/helpers/html.test.php
cake/tests/groups/database.group.php
|
2009-10-14 00:51:55 -04:00 |
|
mark_story
|
3bf94e6a28
|
Updating documentation for Model methods to improve api parsing.
Removing redundant include.
|
2009-10-05 20:42:37 -04:00 |
|
mark_story
|
ace784aab5
|
Adding conditional check for errors only generated in PHP5.3
|
2009-10-04 22:22:39 -04:00 |
|
mark_story
|
0ba93bd579
|
Updating file headers, reformatting comments.
|
2009-10-04 22:12:13 -04:00 |
|
nate
|
fd6538fc72
|
Changes Model::find() to allow modification of DataSource connection during callbacks.
|
2009-09-10 09:28:55 -04:00 |
|
mark_story
|
3dc12cb6da
|
Updating model tests to reflect deprecation of Model::bind() and Model::delete() aliases.
|
2009-08-31 23:40:47 -04:00 |
|
AD7six
|
b9987e1712
|
whitespace normalization
|
2009-08-02 16:09:39 -07:00 |
|
gwoo
|
15ed658a27
|
Revert "Merge branch '1.3-newlines' into 1.3"
This reverts commit c088131cd8e9f53396852e8a320e2b0396807d20, reversing
changes made to 9341a2bb5eda1db208019aa8a9171224fb76fc6b.
|
2009-08-02 15:59:54 -07:00 |
|
AD7six
|
f64f4cbddc
|
whitespace normalization
|
2009-07-26 11:59:51 +02:00 |
|
gwoo
|
062f471b7f
|
updating App::import usage. ran each test and everything seems ok.
|
2009-07-25 18:27:02 -07:00 |
|
jperras
|
9d7b560817
|
Splitting model tests into separate files to allow more fine-grained test running.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8255 3807eeeb-6ff5-0310-8944-8be069107fe0
|
2009-07-24 22:17:14 +00:00 |
|