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 |
|