euromark
361980fade
remove code, class names and paths from translation strings.
2013-08-21 00:05:53 +02:00
mark_story
6d80d6a3cb
Add missing return.
2013-08-20 18:03:52 -04:00
euromark
036954b52d
remove duplicate newlines according to CS
2013-08-20 20:27:06 +02:00
Renan Gonçalves
8ca92a1af0
Breaking trigger_error() to multiple lines to shorten the line length.
...
As proposed in https://github.com/cakephp/cakephp/pull/1525/files#r5779374
2013-08-20 17:48:56 +02:00
mark_story
67855896ef
Remove invalid code.
...
Fixes #4002
2013-08-20 11:34:30 -04:00
Mark Story
e78549de41
Merge pull request #1541 from dereuromark/master-css
...
sync and correct generic css
2013-08-19 13:08:13 -07:00
euromark
5ed9e5d691
sync and correct generic css
2013-08-19 21:51:04 +02:00
mark_story
b711d38bf3
Update version number to 2.4.0-RC2
2013-08-19 10:49:03 -04:00
mark_story
9ea2926bf3
Merge branch 'master' into 2.4
2013-08-19 10:40:29 -04:00
mark_story
f7a81a9aee
Conditionally define constants in the CLI environment.
...
Only define constants if they don't already exist. Users can modify
`app/Console/cake.php` and define constants before this code executes.
Fixes #4000
2013-08-19 10:40:09 -04:00
José Lorenzo Rodríguez
a09fca579a
Merge pull request #1539 from cakephp/feature/2.4-mock-components-with-config
...
BugFix: 2.4 mock components with config
2013-08-19 04:31:52 -07:00
AD7six
09cf69c452
Pass Controller:$components config to mocked components
...
Otherwise there can be significant differences in behavior between using
an unmodifiedcomponent in testAction and using a mock as the config will not be
propogated from the controller
2013-08-19 10:33:16 +00:00
k-halaburda
9ad75e078a
Successfully :)
2013-08-19 08:29:39 +02:00
k-halaburda
9536b3cacd
Successfully
2013-08-19 08:11:45 +02:00
mark_story
0f2d59d987
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Network/CakeResponse.php
lib/Cake/TestSuite/CakeTestCase.php
2013-08-18 23:10:08 -04:00
mark_story
675f828e16
Remove insertQuery and deleteQuery.
...
These properties were never implemented and are misleading when people
try to use them.
Closes #3997
2013-08-18 21:37:37 -04:00
k-halaburda
2166b397bc
Successfully
2013-08-18 17:43:26 +02:00
k-halaburda
39f9d40be4
Fixed formaiing and Successfully
2013-08-18 17:41:43 +02:00
k-halaburda
2a27b37a43
New line on end
2013-08-18 17:37:34 +02:00
ADmad
ad5fbd9514
Merge pull request #1537 from Phally/master-cs
...
Makes PHPCS pass again.
2013-08-18 07:25:38 -07:00
Phally
524aaf3449
Makes PHPCS pass again.
2013-08-18 16:12:23 +02:00
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
Mark Story
c5621becf3
Merge pull request #1536 from rchavik/2.5-map-resources
...
Accept 'connectOptions' in Router::mapResources()
2013-08-17 12:01:20 -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
Rachman Chavik
8e5a9cd7da
Accept 'connectOptions' in Router::mapResources()
2013-08-17 19:28:18 +07: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
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
