Jose Lorenzo Rodriguez
|
bf0f5ab118
|
Merge remote-tracking branch 'origin/2.1' into 2.2
|
2012-04-29 20:05:39 -04:30 |
|
Tigran Gabrielyan
|
77f6d88a9e
|
Fixed bug in model validation translate
|
2012-04-26 21:24:22 -07:00 |
|
Kyle Robinson Young
|
b8488b8dfe
|
Update 1.x @link in docblocks
|
2012-04-26 19:49:18 -07:00 |
|
Juan Basso
|
333ea29805
|
Renamed variable name from nested transaction
|
2012-04-26 20:58:25 -04:00 |
|
Juan Basso
|
37537faac0
|
Renamed method to check if the driver supports nested transaction.
|
2012-04-26 20:58:25 -04:00 |
|
Juan Basso
|
f6288a491a
|
Disabled the default nested configuration. MySQL use MyISAM as default and it can affect many applications.
|
2012-04-24 21:42:32 -04:00 |
|
Ceeram
|
74ee75b0ef
|
Merge branch '2.1' into 2.2
|
2012-04-23 10:34:04 +02:00 |
|
Juan Basso
|
7fe333ce4e
|
Merge branch '2.2-nested-transaction' into 2.2
|
2012-04-22 23:04:32 -04:00 |
|
ADmad
|
b1e7164d1a
|
Implemented translation of validation rule arguments in validation error messages. Closes #2816
|
2012-04-22 23:25:07 +05:30 |
|
Ceeram
|
f0bd7386e2
|
created, modified and updated fields now use static timestamp in testcases
|
2012-04-21 17:38:49 +02:00 |
|
mark_story
|
21ba5bf04a
|
Merge branch '2.1' into 2.2
|
2012-04-17 21:47:24 -04:00 |
|
Ceeram
|
388b20dd9d
|
fix error in previous commit
|
2012-04-17 00:22:13 +02:00 |
|
Ceeram
|
a84597784d
|
avoid warning when saveAll() data has empty hasMany data, fixes #2792
|
2012-04-16 22:46:58 +02:00 |
|
Ceeram
|
9556ff714d
|
Avoid running validation again, when saveAll() is called with 'validate' => 'first'
|
2012-04-16 09:45:44 +02:00 |
|
mark_story
|
d136fac219
|
Correct docs to match code.
Fixes #2790
|
2012-04-15 20:33:43 -04:00 |
|
Juan Basso
|
7be5349b0c
|
Added configuration to disable nested transaction, even if the db supports it.
|
2012-04-14 16:43:24 -04:00 |
|
Juan Basso
|
a512d46679
|
Sqlite is failing in PHP 5.2, re-adding the check for driver support.
|
2012-04-14 16:23:51 -04:00 |
|
Juan Basso
|
2c1cf29aa3
|
Added real support to nested transactions for Mysql, Postgres, Sqlite.
|
2012-04-14 16:21:42 -04:00 |
|
Juan Basso
|
2c9399a78a
|
Removed unused attribute and moved getVersion to be reused in all PDO drivers.
|
2012-04-14 16:21:41 -04:00 |
|
Mark Story
|
6167529d4d
|
Merge pull request #605 from shama/patch-datasource-test
Add checks for startQuote & endQuote.
Fixes #2769
|
2012-04-14 08:08:05 -07:00 |
|
mark_story
|
b9389c9da1
|
Fix comment's reference to version numbers.
|
2012-04-14 10:50:31 -04:00 |
|
mark_story
|
2fd15b6c7e
|
Revert removal of session_cache_limiter()
It was removed in [4a6159c9af ].
The session_cache_limiter() is required for IE8 to correctly
hold onto sessions.
Fixes #2781
|
2012-04-14 10:04:56 -04:00 |
|
Kyle Robinson Young
|
6cf73c763c
|
Tests for a generic custom datasource
Default startQuote and endQuote to avoid error with non-database datasources
|
2012-04-11 10:08:45 -07:00 |
|
mark_story
|
9f9feec222
|
Merge branch '2.2-hash' into 2.2
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
lib/Cake/View/Helper/FormHelper.php
|
2012-04-10 21:32:37 -04:00 |
|
mark_story
|
2333c8f33f
|
Re-factor duplicated code.
|
2012-04-10 21:05:42 -04:00 |
|
mark_story
|
f8966a64f2
|
Merge branch '2.1' into 2.2
Conflicts:
lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
|
2012-04-09 21:55:02 -04:00 |
|
Mark Story
|
da9cbcf7bb
|
Merge pull request #603 from luisarmando/queryCacheDoc
Fix doc of DboSource->$_queryCache.
|
2012-04-09 14:35:57 -07:00 |
|
Luís Armando
|
bb2286bc43
|
Fix doc of DboSource->$_queryCache.
|
2012-04-09 13:30:58 -03:00 |
|
mark_story
|
8d1b5c3f24
|
Fix notice errors with postgres.
|
2012-04-07 17:22:27 -04:00 |
|
mark_story
|
15c94dee4d
|
Fix whitespace and remove duplicate method calls.
|
2012-04-07 14:42:25 -04:00 |
|
mark_story
|
a24aca6ffc
|
Fix a few code standards errors.
|
2012-04-06 22:56:01 -04:00 |
|
Ceeram
|
c2a8fca00c
|
Merge branch '2.1' into 2.2
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
|
2012-04-05 23:27:21 +02:00 |
|
Ceeram
|
30268f6a08
|
Only check for existing method expresion() when it actually will be called.
Datasources that use calculate() should not be forced to implement expression() as well
|
2012-04-05 23:15:18 +02:00 |
|
mark_story
|
5c590aad09
|
Add missing ClassRegistry import.
Fixes #2757
|
2012-04-05 08:33:12 -04:00 |
|
Ceeram
|
2b7fe21ee0
|
remove all Set::extract() from core and tests
|
2012-04-05 01:33:57 +02:00 |
|
ADmad
|
1cc5206442
|
Merge branch '2.1-dbosource' into 2.1
|
2012-04-04 19:58:48 +05:30 |
|
ADmad
|
93639a7c43
|
Fixed bug where associated model's afterfind was not triggered in particular case
|
2012-04-04 19:48:37 +05:30 |
|
Ceeram
|
d2098828c6
|
Fix fullTablename(), ensure prefix prepending is only skipped when not on position 0 in tablename. Fixes #2750
|
2012-04-04 15:07:45 +02:00 |
|
ADmad
|
7ed90c72ae
|
Updating API docblock for Model::query()
|
2012-04-03 19:06:41 +05:30 |
|
mark_story
|
72cb96b727
|
Fix a few more coding standards errors.
|
2012-04-02 23:23:53 -04:00 |
|
Ceeram
|
34a730dfd8
|
ensure buildJoinStatement() does not add schemaname when table value is a subquery, fixes #2709
|
2012-04-02 18:48:02 +02:00 |
|
mark_story
|
4e67698506
|
Fix issues with SQLServer + boolean columns.
SQLServer should not have lengths applied to BIT column types.
Remove any length that could have been provided.
Fixes #2439
|
2012-04-01 22:10:05 -04:00 |
|
mark_story
|
475a1596b7
|
Merge branch '2.1' into 2.2
|
2012-04-01 15:37:21 -04:00 |
|
Kyle Robinson Young
|
e2a46f76c7
|
substr() optimizations
|
2012-03-28 13:07:26 -07:00 |
|
mark_story
|
a76a926ac1
|
Fix more uses of Set -> Hash
|
2012-03-26 22:32:57 -04:00 |
|
mark_story
|
17bfbbb9df
|
Port over Set to Hash usage.
|
2012-03-26 22:32:55 -04:00 |
|
mark_story
|
19e0d8d946
|
Switch usage to Hash where possible.
|
2012-03-26 22:32:53 -04:00 |
|
mark_story
|
29048b3bb7
|
Update to use Hash.
Update CakeSession & Configure to use Hash.
|
2012-03-26 22:25:41 -04:00 |
|
Jose Lorenzo Rodriguez
|
b373309ba9
|
Merge branch '2.1' into 2.2
Conflicts:
lib/Cake/VERSION.txt
|
2012-03-25 21:18:58 -04:30 |
|
Thomas Ploch
|
fda065101b
|
Fixed test cases for successful being built on travis.
|
2012-03-24 21:32:31 +01:00 |
|