José Lorenzo Rodríguez
|
b1ec3043bc
|
Replacing App::import in favor of App::uses where possible
|
2010-12-03 18:37:21 -04:30 |
|
mark_story
|
845edf38e1
|
Removing core classes using App::import() with an array(). This usage incurs an additional call to App::import().
Removing Set from core class imports, as Set is required as part of the framework bootstrapping.
|
2010-11-25 22:51:30 -05:00 |
|
mark_story
|
18bb5f6b8b
|
Removing =& operators for construction of objects.
|
2010-11-12 23:05:44 -05:00 |
|
Mark Story
|
08e7bcb7ab
|
Merge branch '1.3' into integration
Conflicts:
app/config/core.php
cake/console/libs/acl.php
cake/console/templates/skel/config/core.php
cake/console/templates/skel/webroot/test.php
cake/dispatcher.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/log/file_log.test.php
cake/tests/cases/libs/model/cake_schema.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/lib/reporter/cake_cli_reporter.php
|
2010-10-31 21:56:59 -04:00 |
|
mark_story
|
498417203b
|
Making DboSource::fields() use cacheMethod() so it respects $cacheMethods.
Test added.
Fixes #1211
|
2010-10-20 22:28:31 -04:00 |
|
mark_story
|
f19e3d501c
|
Merge branch '1.3' into integration
Conflicts:
cake/libs/model/cake_schema.php
cake/libs/model/datasources/dbo_source.php
cake/libs/model/model.php
cake/libs/view/helpers/form.php
cake/libs/view/view.php
cake/libs/xml.php
cake/tests/cases/libs/model/model_delete.test.php
cake/tests/cases/libs/view/view.test.php
cake/tests/cases/libs/xml.test.php
|
2010-10-13 22:30:40 -04:00 |
|
mark_story
|
d56416456c
|
Applying patch from 'Justas Butkus' to DboSource
Fixes issues where reconnect could issue warnings related to
array_merge. Fixes #1182
|
2010-10-11 21:52:10 -04:00 |
|
mark_story
|
f847080cbf
|
Changing more php version strings.
|
2010-10-03 12:46:03 -04:00 |
|
mark_story
|
f21161ef46
|
Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
differences upon merging.
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/libs/cache/file.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/i18n.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/model/model_write.test.php
|
2010-09-24 23:27:22 -04:00 |
|
mark_story
|
729a45703b
|
Fixing issue where table names with spaces would not be quoted by name(). Fixes #1121
|
2010-09-21 20:34:27 -04:00 |
|
mark_story
|
d113d7d612
|
Removing dead code from DboSource::fields()
Updating fields() to use implode, so complex virtual fields are better handled. Fixes #1079
|
2010-09-18 00:04:36 -04:00 |
|
mark_story
|
5a8648cca0
|
Fixing issue in DboSource::_matchRecords() where unqualified conditions would result in 1=1 conditions. Fixing incorrect test case. Fixes #930
|
2010-09-16 00:17:09 -04:00 |
|
mark_story
|
730e373afe
|
Merge branch '1.3' into 2.0
Conflicts:
cake/libs/cake_session.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/cake_session.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/fixtures/data_test_fixture.php
|
2010-09-12 13:35:46 -04:00 |
|
Mark Story
|
e15069769d
|
Adding tests for #1079 and fixing some formatting.
|
2010-09-07 00:09:06 -04:00 |
|
Mark Story
|
d88da3d579
|
Merge branch '1.3' into 2.0
Conflicts:
cake/libs/configure.php
cake/libs/model/connection_manager.php
cake/libs/model/model.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
cake/tests/cases/libs/view/helpers/text.test.php
|
2010-09-06 16:53:04 -04:00 |
|
ADmad
|
bfaaa6b8ba
|
Fixing unnecessary extra calls to 'afterFind' callback of 'hasMany' associated models. Closes #995
|
2010-09-05 23:53:24 +05:30 |
|
mark_story
|
ea9e30890f
|
Adding a workaround to DboSource::showLog() to work around fix added in [da9c0da626 ].
Also adding explanation message when logs are not generated.
|
2010-08-26 21:24:09 -04:00 |
|
mark_story
|
d38857095a
|
Merge branch '1.3' into 2.0
Conflicts:
cake/libs/model/model.php
cake/libs/validation.php
cake/libs/view/helpers/ajax.php
cake/tests/cases/libs/controller/components/session.test.php
|
2010-07-24 22:34:42 -04:00 |
|
mark_story
|
4c27c24a72
|
Fixing issue in DboSource where COUNT() was hardcoded, omitting any other aggregate functions. Replaced with a regexp that accepts only letters. Test case added. Fixes #878
|
2010-07-15 23:17:38 -04:00 |
|
mark_story
|
65efd675c1
|
Fixing fatal error caused by associated models using a datasource that is not a subclass of dbo_source. Test added. Fixes #873
|
2010-07-11 13:06:33 -04:00 |
|
mark_story
|
02e25f7557
|
Changing Configure::read() to not have a default value, and instead return all values in configure when no param is supplied. Test cases updated. Fixes #503
|
2010-07-05 21:50:36 -04:00 |
|
mark_story
|
2020675078
|
Merge branch '1.3' into 2.0
Conflicts:
cake/dispatcher.php
cake/tests/cases/libs/controller/components/request_handler.test.php
|
2010-06-30 22:47:27 -04:00 |
|
mark_story
|
e023350af5
|
Updating API docs related to DboSource::$cacheMethods. Fixes #870
|
2010-06-30 08:52:39 -04:00 |
|
mark_story
|
cd8dff362d
|
Merge branch '2.0-phpunit' into 2.0
Conflicts:
cake/libs/controller/components/email.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/controller/components/email.test.php
|
2010-06-28 22:31:35 -04:00 |
|
mark_story
|
929bb5769e
|
Merge branch '1.3' into 2.0
Conflicts:
app/webroot/index.php
cake/console/templates/skel/webroot/index.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/controller/scaffold.php
cake/libs/model/datasources/dbo/dbo_oracle.php
cake/libs/model/model_behavior.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/acl.test.php
cake/tests/cases/libs/file.test.php
|
2010-06-26 12:29:20 -04:00 |
|
José Lorenzo Rodríguez
|
c23fe5d72e
|
Migrating ModelReadTest to PHPUnit
|
2010-06-04 23:07:29 -04:30 |
|
mark_story
|
7ed67e5959
|
Fixing virtualFields used in order clauses where virtualField was supplied with model alias. Tests added. Refs #768
|
2010-05-30 20:30:58 -04:00 |
|
predominant
|
8decc683ac
|
Numerous 'shoer description' documentation entries updated to contain useful comments.
|
2010-05-30 01:20:28 +10:00 |
|
Martin Radosta
|
64adfacd3e
|
Making DboSource::order() accept an expression object. Fixes issues with
sql parsing over quoting special SQL syntax. Tests added. Fixes #747
Signed-off-by: mark_story <mark@mark-story.com>
|
2010-05-25 23:07:29 -04:00 |
|
Juan Basso
|
2d44929598
|
Optimization on dbo datasource to not repeat ids in find. Fixes #601
Signed-off-by: mark_story <mark@mark-story.com>
|
2010-05-23 17:22:55 -04:00 |
|
mark_story
|
29f2223c6d
|
Removing hardcoded '__' for virtualField separators. Making it an instance property instead. This allows the customization of the separator if needed. Tests added for DboMysql. Refs #655, #730
|
2010-05-22 00:58:54 -04:00 |
|
predominant
|
8f880731c6
|
Removing closing PHP tags.
|
2010-05-11 08:27:28 +10:00 |
|
predominant
|
1ec220dac2
|
Removing closing PHP tags.
|
2010-05-11 08:07:49 +10:00 |
|
predominant
|
c7fcaf995f
|
Convert getMictime() php4 hack to microtime(true)
|
2010-04-16 02:58:28 +10:00 |
|
predominant
|
6bd9f0f05b
|
Convert models, datasources and file/folders to new version of translation shortcut function.
|
2010-04-16 02:00:25 +10:00 |
|
predominant
|
a4cf737947
|
Fixing access specified on DboSource.
|
2010-04-11 15:25:18 +10:00 |
|
predominant
|
e4d292bfa4
|
Merge remote branch 'origin/1.3' into 2.0
Conflicts:
cake/console/libs/shell.php
cake/libs/controller/components/acl.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/email.php
cake/libs/controller/components/security.php
cake/libs/controller/components/session.php
cake/libs/view/helper.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/number.php
cake/libs/view/helpers/session.php
cake/libs/view/helpers/text.php
cake/libs/view/helpers/time.php
cake/libs/view/helpers/xml.php
|
2010-04-06 12:19:34 +10:00 |
|
predominant
|
50a547167b
|
Changing protected methods to specify protected access.
|
2010-04-05 13:21:28 +10:00 |
|
predominant
|
1497ec3910
|
Changed all public methods to specify public access.
|
2010-04-05 13:19:38 +10:00 |
|
José Lorenzo Rodríguez
|
45ccba5d94
|
Improving virtual fields fetching when the field wildcard selector * in present on the fields array, closes #524
|
2010-04-04 13:24:39 -04:30 |
|
predominant
|
3c2e7a091d
|
Changed access to private __associations on Model to associations() calls.
|
2010-04-04 18:17:43 +10:00 |
|
predominant
|
850ca02bb6
|
Changed all public 'var' declarations to be 'public $var'
|
2010-04-04 17:14:00 +10:00 |
|
predominant
|
329a13fe5f
|
Changed all $_ declared variables to protected.
|
2010-04-04 16:36:12 +10:00 |
|
predominant
|
29dc12dbc2
|
Changed all $__ declared variables to private.
|
2010-04-04 16:33:39 +10:00 |
|
José Lorenzo Rodríguez
|
1f1324f500
|
Qouting fields inside postgres functions when prepended a DISTINCT, closes #512
|
2010-03-25 16:05:45 -04:30 |
|
ADmad
|
e2113e4aa2
|
Minor optimization in DboSource::__scrubQueryData(), removing unneded isset() check.
|
2010-03-18 03:02:58 +05:30 |
|
José Lorenzo Rodríguez
|
c1f74c28ae
|
Fixing postgres self join error
|
2010-03-16 16:49:57 -04:30 |
|
Mark Story
|
4861da66ed
|
Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
|
2010-03-15 23:26:24 -04:00 |
|
Mark Story
|
ea64588a81
|
Adding tests from 'Stephen Cuppert' to test incorrectly generate DELETE queries for habtm join tables that do not have a primary key when using PostgreSQL. Updating DboSource::_matchRecords() to only query the table if the supplied conditions are actually multi-table conditions. Fixes #459
|
2010-03-15 22:55:14 -04:00 |
|
Mark Story
|
5e665b32f2
|
Removing useless condition in DboSource::cacheMethod()
|
2010-03-15 00:41:44 -04:00 |
|