ADmad
4ded269549
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
lib/Cake/VERSION.txt
2013-07-07 12:22:12 +05:30
euromark
af455b4121
correct return types in doc blocks
2013-07-05 17:19:22 +02:00
euromark
ba02678693
doc block corrections
2013-07-05 16:17:23 +02:00
euromark
e7f380d2b7
doublespace to single space
2013-07-05 14:36:40 +02:00
mark_story
c597855fe4
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/Network/CakeRequestTest.php
2013-07-03 14:21:09 -04:00
euromark
a90cb29c0f
simplify else cases
2013-07-03 01:14:41 +02:00
euromark
7cb19b97db
coding standards and simplification of else cases as well as some minor fixes
2013-07-03 00:52:48 +02:00
mark_story
f09693f6e8
Merge branch 'master' into 2.4
2013-06-29 23:26:26 -04:00
Marc Würth
9591f55394
Annotated testReconnect
2013-06-27 17:15:56 +02:00
Marc Würth
2609016dfe
Changed http links to lighthouse, groups.google and github to https
...
Because they get redirected anyway and we should follow good practices.
Also in many cases similar URLs were already using https
2013-06-25 22:58:30 +02:00
Juan Basso
19c94d0211
Fixed default datestyle for postgres tests
2013-06-25 00:15:03 -04:00
Juan Basso
accc98f55d
Resetting the datestyle to not affect other tests
2013-06-24 23:36:40 -04:00
mark_story
dcf7df39d2
Merge branch 'master' into 2.4
2013-06-21 17:47:37 -04:00
mark_story
94815a74f1
Add ordering to prevent occasional pgsql failures.
2013-06-21 17:47:08 -04:00
ADmad
12da3b1f27
Merge branch 'master' into 2.4
2013-06-16 13:07:44 +05:30
mark_story
1c358c0f53
Add tests for Model::clear()
2013-06-14 09:21:20 -04:00
Rik van der Heijden
e7d2892e81
Fixed unit-test locales
2013-06-11 20:18:40 +02:00
mark_story
cd3c54bb9d
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-06-10 22:12:10 -04:00
euromark
42777b7809
incorrect tab to space - whitespace coding standards
2013-06-09 21:01:01 +02:00
euromark
4518624187
more whitespace coding standard corrections
2013-06-09 17:39:48 +02:00
ADmad
636cc8c103
Merge branch 'master' into 2.4
2013-06-09 18:08:32 +05:30
euromark
394bf1054d
remove name attribute where not necessary, clean up doc blocks
2013-06-08 04:29:08 +02:00
Jose Lorenzo Rodriguez
f14c55916f
Repeating previous change for SQLite, so it passes on PHP 5.5
2013-06-06 18:12:07 +02:00
Jose Lorenzo Rodriguez
04a6bfbda6
Fixing postgres test for PHP 5.5
2013-06-06 17:55:55 +02:00
Jose Lorenzo Rodriguez
51af8800f2
Rewriting assertion to account for the actual case and not breaking in
...
PHP 5.5
2013-06-06 17:45:52 +02:00
mark_story
cbf3228c34
Fix inconsistent name/alias usage.
...
TranslateBehavior should always use name instead of alias when
creating/updating/saving new translate records. It already uses name
when finding translations and the mismatch was causing translations to
not be found when saved from an aliased model.
Thanks to Joost de Keijzer for providing the initial patch.
Fixes #3865
2013-06-02 13:50:23 -04:00
ADmad
3303a2cda1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
Marc Würth
4c9f0414cb
Improved the DocBlocks and other code cleanup
...
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
Christian Winther
ef8603e1a7
Add unit test
2013-05-28 12:02:58 +00:00
ADmad
fb86859585
Merge branch 'master' into 2.4
2013-05-19 14:37:41 +05:30
euromark
97c2cb367d
CS fixes
2013-05-17 10:36:17 +02:00
ADmad
a10275fb8b
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
2013-05-05 14:36:46 +05:30
Rik van der Heijden
dddf8aafb9
Fixed curly brackets at a few class definitions
2013-05-04 13:23:58 +02:00
ADmad
db26e24cb7
Remove error setting when reading/deleting non-existent key.
...
Fixes #3813
2013-05-04 03:16:33 +05:30
mark_story
d4036310e4
Update limit() for Postgres
...
It should work like the parent class.
2013-05-02 23:27:26 -04:00
mark_story
00569ea405
Update limit() for Sqlite.
...
It should behave as the parent class does.
2013-05-02 23:25:13 -04:00
mark_story
2096d3f632
Clamp limit values to be unsigned integers.
...
This solves large page numbers potentially turning into scientific
notation when being formatted into queries. It also further safeguards
against SQL manipulation.
Refs #GH-1263
2013-05-02 22:36:50 -04:00
ADmad
19f8274a95
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-04-25 03:06:04 +05:30
euromark
48fa358260
Remove leftover param that is now wrongly triggering "strict"
2013-04-22 11:36:17 +02:00
ADmad
06a5c509c0
Merge branch 'master' into 2.4
2013-04-21 19:15:55 +05:30
Ceeram
842b1802d9
add assert that habtm save does not return false
2013-04-19 19:37:23 +02:00
mark_story
0f3d28c6ea
Fix condition parsing in mysql specific cases.
...
When using collation + array values the incorrect operator would be
used. IN should be used over =.
Fixes #3772
2013-04-18 21:52:22 -04:00
Rémi Dewitte
c70a3868a9
schema update CREATEs non-existing tables instead of ALTER
2013-04-03 17:37:09 +02:00
mark_story
041c2d289f
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Shell.php
2013-03-26 20:31:54 -04:00
mark_story
729ef8fe58
Fix default null not being reflected by SqlServer
...
Apply patch from 'Josh Rehm' to fix null default values from being
stomped on when reflecting table schema.
Fixes #3615
2013-03-19 21:02:27 -04:00
mark_story
81dc4c1e85
Merge branch 'master' into 2.4
2013-03-13 20:30:25 -04:00
Ceeram
8374eb92cc
fix failing tests. test and mocked sources would cause exceptions
2013-03-13 22:31:23 +01:00
Rémi Dewitte
ab510d1700
Add settings array to connection parameters that executes SET statements once connected
2013-03-07 23:45:42 +01:00
mark_story
4b13e0a5f2
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-03-04 21:55:29 -05:00
mark_story
33bd7a571a
Restore whitelist when save fails.
...
Fixes whitelist not being restored when save fails due to no data.
Fixes #3646
2013-02-25 20:57:56 -05:00
