euromark
47e8e0c57a
simplyfy test and correct some test param orders
2013-08-16 20:51:11 +02:00
mark_story
4e74b93106
Start the 2.5.x branch.
2013-08-16 14:47:44 -04:00
mark_story
3244b9e3d7
Merge branch 'master' into 2.4
2013-08-16 14:47:01 -04:00
euromark
6cf147e8c8
unify null checks - avoid method call in favor of strict check
2013-08-16 20:12:49 +02:00
Mark Story
e189dfa1f0
Merge pull request #1532 from dmromanov/2.4-translations
...
Optimize translations
2013-08-16 08:38:11 -07:00
dmromanov
7989bad5b7
Corrected codestyle
2013-08-16 14:12:27 +04:00
dmromanov
b4092e374d
Corrected spelling
2013-08-16 14:06:36 +04:00
dmromanov
56ef44f495
Excluded method names from several tanslation strings
...
Removed unnecessary sprintfs
2013-08-16 13:42:28 +04:00
k-halaburda
391d997c27
Fixed some formatting
2013-08-16 10:02:50 +02:00
k-halaburda
180ecb7929
Fixed some formatting
2013-08-16 10:02:11 +02:00
k-halaburda
f5daf1c8aa
Fixed some formatting
2013-08-16 09:51:01 +02:00
k-halaburda
d7dab3282f
Remove added fixtures and use existing. Updated one old test to add data from afterFind callback
2013-08-16 09:28:32 +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 Story
c5a306b33c
Merge pull request #1530 from ravage84/long-trigger_error
...
Shortened line length of trigger_error calls and improved @param of write()
2013-08-15 08:21:38 -07:00
Mark van Driel
97aaa89b3f
Refactored the fix
2013-08-15 17:13:31 +02:00
Marc Würth
64f4adf626
Shortened line length of trigger_error calls and improved @param of write()
...
http://www.phpdoc.org/docs/latest/for-users/phpdoc/tags/param.html
> The @param tag MAY have a multi-line description and does not need explicit delimiting.
2013-08-15 17:09:24 +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
6bec7a36a4
Merge pull request #1525 from dmromanov/2.4-bugfix3986
...
Bugfix #3986
2013-08-14 16:57:04 -07: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
Mark Story
35bbd55819
Merge pull request #1526 from dmromanov/2.4-translations
...
Prevent accidently translating "%score" as "score"
2013-08-14 16:53:52 -07:00
dmromanov
ff01c28735
Prevent accidently translating "%score" as "score"
2013-08-15 03:27:26 +04:00
dmromanov
aa7c912c15
Removed concatenations in gettext $msg param. Closes #3986 .
2013-08-15 03:15:35 +04:00
Christian Winther
bcfa07700b
Merge pull request #1524 from dmromanov/2.4-translations
...
Removed trailing space in a translation string
2013-08-14 14:45:53 -07:00
dmromanov
a0b9d5fe8b
Removed trailing space
2013-08-15 01:36:51 +04: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
6c22faa372
Merge pull request #1512 from aleho/2.4
...
Correctly encode confirm handlers
2013-08-13 20:08:40 -07:00
Mark Story
7fce97709a
Merge pull request #1516 from dmromanov/2.4-translations
...
Corrected translation string
2013-08-13 11:10:41 -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
dmromanov
64251b6bd6
Corrected translation string
2013-08-13 21:31:40 +04:00
k-halaburda
bb7ff48b01
Formatting issues
2013-08-13 14:03:20 +02:00
k-halaburda
8a8db72b7c
Formatting issues
2013-08-13 13:03:19 +02:00
k-halaburda
b5a8a6f946
Formatting issues
2013-08-13 13:02:33 +02:00
k-halaburda
1d9bce34d4
Formatting issues
2013-08-13 13:01:38 +02:00
k-halaburda
2235a0e677
Formatting issues
2013-08-13 13:00:12 +02:00
k-halaburda
50cf070727
Formatting issues
2013-08-13 12:59:30 +02:00
k-halaburda
a6efcae625
Deleted rows in ModelReadTest
2013-08-13 12:32:36 +02:00
euromark
759c24e660
correct doc blocks as per cs
2013-08-13 12:29:20 +02:00
