15341 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
mark_story	a140b30435	Add a test for Hash::sort() ... Closes #3956	2013-08-17 17:16:33 -04:00
Mark Story	005699eb49	Merge pull request #1533 from dereuromark/master-null-checks ... unify null checks - avoid method call in favor of strict check	2013-08-17 12:05:52 -07:00
joostdekeijzer	7fe2395be3	RedirectRoute class does not honor persist as array with custom route elements. ... Custom route elements like '/:lang/etc' should be persisted by redirect routes as they are in standard routes. Refs #GH-1531	2013-08-17 14:51:12 -04:00
euromark	6a14f37b74	a few more orders in test case corrected	2013-08-16 20:55:17 +02:00
euromark	47e8e0c57a	simplyfy test and correct some test param orders	2013-08-16 20:51:11 +02:00
euromark	6cf147e8c8	unify null checks - avoid method call in favor of strict check	2013-08-16 20:12:49 +02:00
ADmad	8428928fd6	Merge pull request #1528 from mvdriel/caketime-fix ... Added workaround for strtotime("0000-00-00 00:00:00") returning -6216995...	2013-08-15 10:55:03 -07:00
Mark Story	7c29aa5155	Merge pull request #1508 from fuga/feature/email-config ... making the config method of email-transport-classes mergable	2013-08-15 08:26:11 -07:00
Mark van Driel	97aaa89b3f	Refactored the fix	2013-08-15 17:13:31 +02:00
Christian Winther	0f2122e4f8	Merge pull request #1529 from styxit/master ... Minor Sanitize::escape() update	2013-08-15 03:28:08 -07:00
Floris	85313e84af	Minor Sanitize::escape() update ... If the Datasource is not going to be used, do access it.	2013-08-15 12:15:09 +02:00
Mark van Driel	1595287290	Added workaround for strtotime("0000-00-00 00:00:00") returning -62169955200 on a 64 bit system	2013-08-15 08:58:05 +02:00
Mark Story	c040bb0cdc	Merge pull request #1523 from tersmitten/improved-tests-that-use-setlocale ... Makes the locale test not always pass, be verbose when it is skipped.	2013-08-14 16:54:50 -07:00
Frank de Graaf	33f7de0072	Merge pull request #1520 from mvdriel/cakenumber-fix ... Cakenumber fix	2013-08-14 13:41:53 -07:00
Mischa ter Smitten	0e49a23065	Makes the locale test not always pass, be verbose when it is skipped.	2013-08-14 22:32:04 +02:00
Mark van Driel	559fb5805b	Fix formatting with locales using , as decimal separator ... No double number formatting for readable size Fixed testPrecisionLocalized for travis (when locale is missing?) Switched locale to nl_NL and fixed test Skip test when locale is not available	2013-08-14 22:19:38 +02:00
Christian Winther	05ecc7bba3	Merge pull request #1521 from Phally/master-locale ... Properly test locale settings	2013-08-14 12:42:58 -07:00
Phally	1459e176ac	Adds German locale for Travis.	2013-08-14 21:08:25 +02:00
Phally	6f74e1958b	Makes the locale test not always pass, be verbose when it is skipped.	2013-08-14 21:00:31 +02:00
Mark Story	cd96ef9fc9	Merge pull request #1519 from andraskende/master ... removed $i variable, it not being used...	2013-08-14 08:17:50 -07:00
Andras Kende	d84a2d9419	removed $i variable, it not being used... ... removed $i variable, it not being used...	2013-08-14 02:16:46 -07:00
José Lorenzo Rodríguez	3e1f97509a	Merge pull request #1518 from andraskende/master ... removed not used $i variable	2013-08-14 01:11:02 -07:00
Andras Kende	3f58be260e	removed not used $i variable ... removed not used $i variable	2013-08-13 22:06:00 -07:00
mark_story	cb6ea82fea	Allow CakeEmail::template() to disable layout rendering. ... Fix the code to act as documented. Sending template('view', null) should disable layout rendering. Fixes #3983	2013-08-13 14:01:33 -04:00
mark_story	3bdcf7b440	Use inner join instead of a left join. ... In some database servers an INNER join performs better than a LEFT join. Fixes #3979	2013-08-13 13:40:59 -04:00
fuga	245611424f	Apply ADmad's patch and update testConfig method according to a new specification.	2013-08-13 17:42:52 +09:00
mark_story	6ce10b28c9	Update doc blocks.	2013-08-12 14:37:43 -04:00
Mark Story	2f5963e2d3	Merge pull request #1496 from ravage84/else-clause-after-redirect ... Removed else clauses after redirects and added return before redirect() ...	2013-08-12 11:05:39 -07:00
Frank de Graaf	a64c205c58	Merge pull request #1506 from oldskool/master ... View file conventions. Fixes #3949.	2013-08-12 10:20:46 -07:00
Christian Winther	af1c2a1c51	Merge pull request #1511 from ankr/caketime_accuracy_about ... Making CakeTime display 'about X ago' when time passed is lower than acc...	2013-08-12 09:23:46 -07:00
ankr	1cb41294b8	Making CakeTime display 'about X ago' when time passed is lower than accuracy ... Removing unnecessary else Also support 'about' times for future times Make 'about' times translateable in all languages	2013-08-12 10:01:38 -04:00
ADmad	b44e12b984	Merge pull request #1509 from ravage84/prepend-salt ... Fixed statement about Security:hash's salt parameter	2013-08-12 04:48:54 -07:00
Marc Würth	7d4f229310	Fixed statement about Security:hash's salt parameter ... Just nitpicking, but it prepends the salt, not appends it: https://github.com/cakephp/cakephp/blob/master/lib/Cake/Utility/Security.php#L120	2013-08-12 12:52:34 +02:00
fuga	303261e231	making the config method of email-transport-classes mergable into the current config value.	2013-08-12 10:28:17 +09:00
Jose Lorenzo Rodriguez	1bdcc58e31	Update version number to 2.3.9	2013-08-12 00:37:35 +02:00
José Lorenzo Rodríguez	3355544ab7	Merge pull request #1507 from ADmad/2.3-console-constants ... Allow setting path constants in app/Console/cake.php as you can in webro...	2013-08-11 12:28:49 -07:00
ADmad	8150b89aba	Allow setting path constants in app/Console/cake.php as you can in webroot/index.php	2013-08-12 00:54:50 +05:30
Jan Dorsman	39a1d76d08	Updating some View files to follow convention	2013-08-11 11:46:35 +02:00
Mark Story	f63aa922f6	Merge pull request #1497 from hiromi2424/fix-unlink-windows ... Fix unlink() for CacheEngine::clear() failed on windows. Refs #3930	2013-08-09 19:55:15 -07:00
mark_story	86dcebf28b	Update bakeshell so bake all gets the correct connection name. ... Fixes #3972	2013-08-09 10:08:01 -04:00
hiromi2424	29314e0fcc	Fixing some errors related to unlink() on windows	2013-08-09 21:33:21 +09:00
hiromi2424	dc381dd4d3	Fix unlink() for CacheEngine::clear() failed on windows.	2013-08-09 21:32:57 +09:00
Marc Würth	4c13a39f3e	Removed else clauses after redirects and added return before redirect() and flash() calls	2013-08-08 21:10:41 +02:00
Mark Story	49d66af12e	Merge pull request #1491 from ravage84/sql_dump ... Improved code readability	2013-08-08 11:45:39 -07:00
Marc Würth	14f876fbc9	Improved code readability ... Changed table echo to printf for more readable code Wrapped sql_dump error message in __d(), as discussed here: 4c4fdc6f70 (commitcomment-3155723) and here: https://github.com/cakephp/cakephp/pull/1491/files#r5646701	2013-08-08 15:43:37 +02:00
Mark Story	8ccdf629bb	Merge pull request #1492 from dereuromark/master-phpcs ... coding standards according to new sniffer rules	2013-08-07 18:42:19 -07:00
euromark	e7e5f46916	prevent rtrim to remove whitespace from test	2013-08-08 01:14:31 +02:00
euromark	1339a9dfe1	coding standards according to new sniffer rules	2013-08-08 01:03:21 +02:00
Mark Story	19b4021276	Merge pull request #1486 from dmromanov/translation-title ... Do not translate "CakePHP"	2013-08-07 13:52:19 -07:00
D. Romanov	4d3c049f25	Do not translate "CakePHP"	2013-08-07 22:54:19 +04:00