euromark
80d55feda6
also remove app ones
2013-08-25 21:42:03 +02:00
euromark
1aba204ec7
remove $name where not necessary to unify this in 2.x
2013-08-25 21:19:55 +02:00
mark_story
499212a86e
Merge branch '2.4' into 2.5
2013-08-24 21:51:51 -04:00
mark_story
42feb8dff6
Fix failing test.
...
Quote encoding in confirm handlers has changed in 2.4. Update the
relevant test.
2013-08-24 21:51:42 -04:00
mark_story
ceb35ac39a
Merge branch 'master' into 2.4
2013-08-24 21:50:02 -04:00
mark_story
f655e8a7bc
Minor simplification.
2013-08-24 21:49:17 -04:00
Mark Story
074fced586
Merge pull request #1549 from hencohen/ticket-4011
...
Ticket 4011 - Add support for matchers in Hash::remove() and Hash::insert()
2013-08-24 18:45:15 -07:00
Mark Story
f750c7d943
Merge pull request #1553 from zoghal/cache-fileengin
...
convert forbidden character in filename(on Windows) with underline
2013-08-24 16:39:04 -07:00
Saleh Souzanchi
d606bcb7fd
convert forbidden character in filename(Windows) with underline
2013-08-25 02:24:37 +04:30
Saleh Souzanchi
e157d8a7e6
convert forbidden character in filename(Windows) with underline
2013-08-25 02:09:13 +04:30
Chen Cohen
a0014e7a30
Ticket 4011 - Adding matchers support for Hash::remove() and Hash::insert()
2013-08-24 02:02:01 +03:00
mark_story
6d45953525
Merge branch '2.4' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-08-23 12:57:08 -04:00
mark_story
53d265cfba
Merge branch 'master' into 2.4
2013-08-23 12:56:43 -04:00
mark_story
59cef53ffe
Update docs to reflect the routes that are actually connected.
...
Refs #GH-1413
2013-08-22 17:54:05 -04:00
Mark Story
cd06edcf1d
Merge pull request #1502 from renansaddam/feature/2.3-baked_files
...
Adding files to be compared against bake generated files, fixing bake templates in the meantime.
2013-08-21 16:14:45 -07:00
Renan Gonçalves
703d9881e9
Adding files to be compared against bake generated files, fixing bake templates in the meantime.
...
Writing assertContains() or assertRegExp for generated code is a pain and making the test cover most part of it is very difficult.
Things like:
```
} else {
}
```
Are very easy to happen (which was the case) and was not being covered by the test.
2013-08-21 23:44:07 +02:00
mark_story
faa2cbd3c3
Remove session.auto_start configuration.
...
It now fails in PHP >= 5.5.2 . Also it never did anything in earlier
versions as the session would have already been started if auto_start
was true.
Fixes #4010
2013-08-21 13:18:44 -04:00
mark_story
24123e2374
Add test for postLink with escape false + confirm option.
...
Closes #4008
2013-08-21 13:09:47 -04:00
José Lorenzo Rodríguez
8e21e255dc
Merge pull request #1543 from dereuromark/2.4-translations
...
remove code, class names and paths from translation strings.
2013-08-20 15:33:42 -07:00
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
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
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
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