mark_story
|
827465fa30
|
Merge branch 'postgres_altercolum_error' into master
Merge changes from #5512 into master. This fixes changing columns in
postgres to integer from string types.
|
2015-03-14 22:23:43 -04:00 |
|
mark_story
|
c32e5559bb
|
Add test to ensure column was converted to integer.
Refs #5512
|
2015-03-14 22:23:17 -04:00 |
|
mark_story
|
8cadb553d7
|
Merge branch 'master' into 2.7
|
2015-03-14 22:08:53 -04:00 |
|
Marc Würth
|
4f9d764fc2
|
Fixed link to cookbook
|
2015-03-11 11:27:30 +01:00 |
|
mark_story
|
0b916cedbb
|
Merge branch 'master' into 2.7
|
2015-03-09 21:55:20 -04:00 |
|
mark_story
|
a9519d39f7
|
Fix whitelist being empty during afterSave.
whitelist should only be reset after afterSave event.
Refs #6028
|
2015-03-08 13:51:46 -04:00 |
|
ADmad
|
7173f21dc8
|
Type hint model param
|
2015-03-04 21:15:24 +05:30 |
|
ADmad
|
a1286e9e7d
|
Prefix fields with model alias
|
2015-03-04 21:11:18 +05:30 |
|
ADmad
|
6ad68ae1e2
|
Allow setting level (depth) of tree nodes on save.
Backported from 3.0.
|
2015-02-15 22:29:19 +05:30 |
|
ADmad
|
18246daf17
|
Merge branch 'master' into 2.7
|
2015-02-15 21:15:02 +05:30 |
|
ADmad
|
bdc6a1f010
|
Fix CS error
|
2015-02-15 19:22:44 +05:30 |
|
ADmad
|
0750a63ed4
|
Make code DRYer.
|
2015-02-15 18:36:30 +05:30 |
|
ADmad
|
844b4beaa6
|
Reduced code nesting.
|
2015-02-15 16:30:43 +05:30 |
|
ADmad
|
54fe7ed204
|
Add method to get depth of tree's node.
Backported from 3.0.
|
2015-02-01 17:27:46 +05:30 |
|
Mark Scherer
|
611889235a
|
Fix clear(). Add test cases.
|
2015-01-28 23:54:32 +01:00 |
|
Mark Story
|
35e0dc2bbd
|
Merge pull request #5760 from cakephp/master
Merge master into 2.7
|
2015-01-27 20:48:15 -05:00 |
|
AD7six
|
5e89e893f2
|
Ignore counter cache also
|
2015-01-23 08:30:34 +00:00 |
|
AD7six
|
c0ee49fe88
|
Remove callbacks to speed up saving
|
2015-01-23 08:30:26 +00:00 |
|
AD7six
|
838d23300b
|
Remove some exists checks by not validating
|
2015-01-23 08:29:59 +00:00 |
|
AD7six
|
51bd1d0a2b
|
If a PDOException is thrown, try again.
This can occur if the exists check returns no rows, but before this
request inserts into the database a _different_ thread inserts a
session record.
|
2015-01-23 08:28:08 +00:00 |
|
Ceeram
|
9ce75e6fd6
|
No need to get the datasource if column is defined in schema. Fixes #5712
|
2015-01-22 00:46:55 +01:00 |
|
mark_story
|
511ee1f776
|
Fix strict error with 2.6 code.
|
2015-01-19 21:43:14 -05:00 |
|
mark_story
|
3078a1eb52
|
Merge branch 'master' into 2.7
Conflicts:
lib/Cake/VERSION.txt
|
2015-01-16 22:22:26 -05:00 |
|
Mark Story
|
2a9f2d4b58
|
Merge pull request #5668 from cakephp/issue-5649
Fix numeric values not being quoted for MySQL set columns.
|
2015-01-15 21:29:57 -05:00 |
|
mark_story
|
d4a6d3f6c0
|
Fix numeric values not being quoted for MySQL set columns.
Set columns should always have their values quoted. Not quoting values
makes MySQL do bad things.
Refs #5649
|
2015-01-15 21:10:33 -05:00 |
|
David Steinsland
|
687d0b44f5
|
Backport of https://github.com/cakephp/cakephp/issues/5667
|
2015-01-15 11:00:27 +01:00 |
|
mark_story
|
ac9a212d44
|
Merge branch 'master' into 2.7
Conflicts:
lib/Cake/Utility/String.php
|
2015-01-11 15:25:18 -05:00 |
|
antograssiot
|
c2f298a8b7
|
Replace our custom code fence with markdown standard fence
|
2015-01-09 13:47:25 +01:00 |
|
Mark Story
|
c4f9727720
|
Merge pull request #5576 from istvanp/2.7
Prevent NULL value on NOT NULL column when value is an empty string
|
2015-01-06 21:23:53 -05:00 |
|
Istvan Pusztai
|
22b0275a58
|
Prevent NULL value on NOT NULL column when value is an empty string (MySQL)
|
2015-01-05 12:04:24 -05:00 |
|
euromark
|
52ecccb1a2
|
App::uses and usage replacements for String => CakeText.
|
2015-01-05 01:00:57 +01:00 |
|
euromark
|
394da88d23
|
Stay 100% BC for 2.7
|
2015-01-04 10:52:18 +01:00 |
|
euromark
|
39e0ce415d
|
Backport of 3.0 Session API hardening and clear().
|
2015-01-04 01:40:09 +01:00 |
|
mark_story
|
4cd2c8fdcb
|
Merge branch 'master' into 2.7
|
2015-01-03 14:34:55 -05:00 |
|
Mark Story
|
0a4cffc603
|
Merge pull request #5501 from cakephp/2.6-hotfix-session-tmp-dir
Also autocreate session folder in debug mode
|
2015-01-02 11:36:53 -05:00 |
|
Kaz Watanabe
|
e5fc1858f9
|
fix error at change type of text field to integer in PostgreSQL
|
2014-12-30 09:27:46 +09:00 |
|
mark_story
|
ec57fb4579
|
Fix length reflection in SQLServer
Don't reflect TEXT column lengths in SQLServer. Because SQLServer text
columns hold ~2GB of data there is no meaningful length to them.
Refs #5506
|
2014-12-29 16:47:50 -05:00 |
|
euromark
|
5aff618109
|
Also autocreate session folder in debug mode
|
2014-12-27 20:34:47 +01:00 |
|
Mark Story
|
7bbc3dfd90
|
Merge pull request #5470 from cakephp/2.7-session
Backport Session consume() to 2.x
|
2014-12-26 12:22:20 -05:00 |
|
euromark
|
813925abee
|
Backport Session consume()
|
2014-12-23 03:39:05 +01:00 |
|
mark_story
|
c540e2b798
|
Merge branch 'master' into 2.6
|
2014-12-22 21:38:58 -05:00 |
|
Mark Story
|
484b114e9b
|
Merge pull request #5384 from okinaka/fix-mysql-describe
2.5: Fixing Mysql::describe() for timestamp.
|
2014-12-21 21:27:27 -05:00 |
|
Rachman Chavik
|
45be270a7b
|
Enable use of Containable with TreeBehaviors
This patch allows Containable use with:
- TreeBehavior::getParentNode()
- TreeBehavior::children()
- TreeBehavior::getPath()
|
2014-12-20 16:32:20 +07:00 |
|
mark_story
|
4d6611b328
|
Merge branch 'master' into 2.6
Conflicts:
lib/Cake/VERSION.txt
|
2014-12-17 21:38:32 -05:00 |
|
OKINAKA Kenshin
|
8c008ad97d
|
Update.
|
2014-12-11 13:55:41 +09:00 |
|
mark_story
|
cf108dbff3
|
Remove duplicate order key.
This was a mistake made in 4b6dba0 .
Fixes #5376
|
2014-12-10 22:32:59 -05:00 |
|
OKINAKA Kenshin
|
5cff6aa746
|
Fixing Mysql::describe() for timestamp.
|
2014-12-11 10:31:19 +09:00 |
|
euromark
|
e1c128bb99
|
Consolidate with conditions sniff.
|
2014-12-09 03:17:35 +01:00 |
|
mark_story
|
ad2d6edda9
|
Merge branch 'master' into 2.6
|
2014-12-06 21:28:59 -05:00 |
|
Guy Warner
|
327fcb4846
|
Fix some missed doc block issues
|
2014-11-30 14:50:11 -07:00 |
|