mark_story
|
5a394c379a
|
Merge branch 'master' into 2.5
|
2013-10-14 22:57:50 -04:00 |
|
Mark Story
|
ce74153389
|
Merge pull request #1691 from uzyn/2.5-decimal
Add support for decimal type in Schema.
Fixes #3171
|
2013-10-14 08:36:15 -07:00 |
|
euromark
|
1cb24ae537
|
CS fixes using phpcs-fixer auto-correction.
|
2013-10-12 01:27:00 +02:00 |
|
Jose Lorenzo Rodriguez
|
df549898ad
|
Merge remote-tracking branch 'origin/2.5' into k-halaburda-master
|
2013-10-12 01:05:02 +02:00 |
|
Jose Lorenzo Rodriguez
|
9673048c30
|
Merge branch 'master' of github.com:k-halaburda/cakephp into k-halaburda-master
|
2013-10-12 01:03:20 +02:00 |
|
Jose Lorenzo Rodriguez
|
63b65e2f69
|
Fixing CS
|
2013-10-12 00:58:14 +02:00 |
|
José Lorenzo Rodríguez
|
8cdbafd312
|
Merge pull request #1631 from ovidiupruteanu/patch-2
flushMethodCache not working if called before cacheMethod
|
2013-10-11 15:56:19 -07:00 |
|
Bryan Crowe
|
81c2e9db84
|
Capitalize UUID acronym
|
2013-10-08 21:46:30 -04:00 |
|
euromark
|
b5bd087bc5
|
Replace deprecated methods.
|
2013-10-08 20:23:57 +02:00 |
|
Bryan Crowe
|
c1dd0e4393
|
Changed url to URL where appropriate
|
2013-10-07 23:17:58 -04:00 |
|
euromark
|
381a8c1216
|
Simplify test.
|
2013-10-08 00:47:47 +02:00 |
|
euromark
|
35ca40635e
|
Add doc block
|
2013-10-08 00:32:11 +02:00 |
|
euromark
|
c621985f69
|
Fix whitelist to be modifiable from behaviors to work with validate.
|
2013-10-07 23:45:27 +02:00 |
|
euromark
|
7b57df5554
|
Correct method names and missing parent calls.
|
2013-10-07 20:24:28 +02:00 |
|
ovidiupruteanu
|
dd3b1e41bc
|
Test case for DboSource::flushMethodCache
|
2013-10-01 21:34:40 +03:00 |
|
U-Zyn Chua
|
e527506c39
|
MySQL: Numeric data type now supported under decimal column. #3171
|
2013-09-28 23:05:53 +08:00 |
|
U-Zyn Chua
|
c74c8d49a1
|
Decimal support for SQLite. #3171
|
2013-09-28 14:36:55 +08:00 |
|
U-Zyn Chua
|
e0eb8f8e18
|
Added decimal CakeSchema test case and DatatypeFixture. #3171
|
2013-09-28 14:29:39 +08:00 |
|
U-Zyn Chua
|
a1a3e70039
|
Decimal support for PostgreSQL. #3171
|
2013-09-28 14:07:00 +08:00 |
|
mark_story
|
5e9b22271a
|
Merge branch 'master' into 2.5
|
2013-09-27 22:26:33 -04:00 |
|
U-Zyn Chua
|
7fb51ab50f
|
Decimal support for MySQL. #3171
|
2013-09-28 09:23:46 +08:00 |
|
euromark
|
9a86f7e883
|
correct spelling mistake
|
2013-09-27 20:28:03 +02:00 |
|
Frank de Graaf
|
41a7739b69
|
Merge pull request #1686 from andydhobbs/ticket-4108
Fixes bad merge of #1683.
Refs #4108.
|
2013-09-27 05:53:10 -07:00 |
|
Andy Hobbs
|
56f1c9b8b5
|
Ticket 4108
- updated DboSourceTest::testFieldsCacheKeyWithSchemanameChange() to skip for Postgres and Sqlserver
|
2013-09-27 13:03:32 +01:00 |
|
Renan Gonçalves
|
bd1c0b18ff
|
Merge pull request #1679 from dereuromark/master-cleanup-tests
Don't use comp. wrappers anymore.
|
2013-09-27 04:10:39 -07:00 |
|
mark_story
|
cc5795c67d
|
Merge branch 'master' into 2.5
|
2013-09-26 10:07:10 -04:00 |
|
Andy Hobbs
|
0f7d6a90a1
|
Ticket 4108
- Added schemaName to DboSource::fields() method cache key to fix bug with changing schema name
|
2013-09-26 11:56:14 +01:00 |
|
euromark
|
9844da8e99
|
Don't use comp. wrappers anymore.
|
2013-09-25 20:58:29 +02:00 |
|
mark_story
|
d2577fac60
|
Merge branch 'master' into 2.5
|
2013-09-21 20:01:50 -04:00 |
|
euromark
|
f62f46562c
|
add missing create() for creating a new record.
|
2013-09-19 00:23:56 +02:00 |
|
euromark
|
17bd465cae
|
simplify tests
|
2013-09-19 00:17:21 +02:00 |
|
ADmad
|
1d89ee1c6d
|
Fixed TreeBehavior::recover() when using scope. Fixes #4062.
|
2013-09-19 00:39:19 +05:30 |
|
mark_story
|
a7a6fcae8a
|
Merge branch 'master' into 2.5
Conflicts:
lib/Cake/VERSION.txt
|
2013-09-17 10:11:24 -04:00 |
|
euromark
|
e3a3946e89
|
address casting cs
|
2013-09-17 15:15:25 +02:00 |
|
euromark
|
382f75dbfc
|
cs corrections, bool to boolean and int to integer.
|
2013-09-17 14:44:34 +02:00 |
|
mark_story
|
a2bd91638e
|
Merge branch 'master' into 2.5
|
2013-09-12 19:47:13 -04:00 |
|
euromark
|
beff12d8a5
|
add missing params for parent call
|
2013-09-10 21:19:30 +02:00 |
|
Ber Clausen
|
0a52061d86
|
Update afterFind() callback signature to be PHP5.4+ compliant.
|
2013-09-10 14:15:01 -03:00 |
|
Ber Clausen
|
867d4b312d
|
Update afterSave() callback signature to be PHP5.4+ compliant.
|
2013-09-09 21:34:11 -03:00 |
|
Ber Clausen
|
98a32c334a
|
Fix CS.
|
2013-09-09 21:25:22 -03:00 |
|
mark_story
|
5210f831c8
|
Add test for insertMulti with id in the last spot.
Both tests work, so there are no changes to the implementation.
Closes #4048
|
2013-09-09 19:43:15 -04:00 |
|
mark_story
|
2fc3222322
|
Fix whitespace.
|
2013-09-09 12:20:54 -04:00 |
|
ovidiupruteanu
|
7019c79b81
|
Quoting test for null value and string column
|
2013-09-09 17:14:09 +03:00 |
|
ADmad
|
c27aa99af9
|
Merge branch 'master' into 2.5
|
2013-09-08 20:36:40 +05:30 |
|
Mark Story
|
66394f2201
|
Merge pull request #1610 from bar/php54-callback-signatures
Update Model/Behaviors callback signature to be PHP5.4+ compliant.
This may require updates to userland behaviours.
|
2013-09-05 11:11:15 -07:00 |
|
mark_story
|
6a6371b2d4
|
Fix CROSS JOINs
While seldomly used, CROSS joins should not generate invalid SQL.
Fixes #4050
|
2013-09-05 12:45:48 -04:00 |
|
Ber Clausen
|
c524645738
|
Update Model/Behaviors callback signature to be PHP5.4+ compliant.
|
2013-09-05 11:17:02 -03:00 |
|
mark_story
|
59bb05b433
|
Merge branch 'master' into 2.5
Conflicts:
lib/Cake/VERSION.txt
|
2013-09-02 11:35:09 -04:00 |
|
euromark
|
eb71eeeac5
|
add scope for generateTreeList - resolves ticket 4028
|
2013-09-01 01:02:26 -07:00 |
|
mark_story
|
130ccf4714
|
Merge branch '2.4' into 2.5
|
2013-08-28 12:35:17 -04:00 |
|