Mark Story
|
127b906fdb
|
Merge pull request #883 from andraskende/2.3
formatting changes..
|
2012-10-01 09:30:08 -07:00 |
|
ADmad
|
ce9ad1f2ed
|
Fix failing tests
|
2012-10-01 20:22:41 +05:30 |
|
ADmad
|
8efc641036
|
Merge pull request #866 from dereuromark/2.3-folder-reset
making messages() and errors() reset themselves by default
|
2012-10-01 06:51:43 -07:00 |
|
euromark
|
7383298410
|
making messages() and errors() reset themselves by default
|
2012-10-01 14:20:53 +02:00 |
|
Andras Kende
|
fa5d2c1941
|
removed 2 empty lines
|
2012-10-01 04:19:36 -07:00 |
|
Andras Kende
|
f5be83d452
|
formatting changes..
|
2012-10-01 02:58:30 -07:00 |
|
mark_story
|
c94886a988
|
Add missing import that causes tests to fail in isolation.
|
2012-09-30 22:51:19 -04:00 |
|
mark_story
|
affb3192ad
|
Fix issue where including elements + extending views fails.
If you include an element before calling extend(), the parent view
will be assumed to be an element instead of a view/layout.
Fixes #3248
|
2012-09-30 22:44:27 -04:00 |
|
dogmatic69
|
408e619c9f
|
Merge branch '2.3' into type-checks
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
|
2012-10-01 02:08:00 +01:00 |
|
mark_story
|
739b3b70f7
|
Update text in routes.php to clarify when to remove core routes.
|
2012-09-30 20:17:50 -04:00 |
|
Mark Story
|
9ed901bc12
|
Merge pull request #882 from dogmatic69/test-error
fixing a error in the tests
|
2012-09-30 16:55:36 -07:00 |
|
dogmatic69
|
095e8df995
|
fixing a error in the tests
|
2012-10-01 00:49:39 +01:00 |
|
Mark Story
|
e1a0ce7752
|
Merge pull request #878 from ADmad/2.3-bake-template
Replace Model::read() with Model::find('first') in baked controller
|
2012-09-30 13:02:36 -07:00 |
|
ADmad
|
89ab0a2d06
|
Fix docblock
|
2012-09-30 23:44:32 +05:30 |
|
ADmad
|
035f727686
|
Replace Model::read() with Model::find('first') in baked controller
Removed references to Ajax and Javascript helpers
|
2012-09-30 14:41:37 +05:30 |
|
mark_story
|
80c355baa5
|
Make minutes/hours wrap around correctly.
Also account for times around midnight that roll over days/months/years.
Fixes #3242
|
2012-09-28 22:50:46 -04:00 |
|
mark_story
|
59e948fb1b
|
Merge branch 'master' into 2.3
|
2012-09-28 21:20:24 -04:00 |
|
mark_story
|
853d866c35
|
Remove port numbers from Message-id domains.
Fixes #3244
|
2012-09-28 21:20:14 -04:00 |
|
Mark Story
|
51245ce41d
|
Merge pull request #874 from dereuromark/2.3-languages
after correcting nld the iso standard should be enforced for all langs
|
2012-09-28 17:55:02 -07:00 |
|
Mark Story
|
87fc86133c
|
Merge pull request #873 from dereuromark/coding-standards
correcting coding-standards
|
2012-09-28 17:49:32 -07:00 |
|
James Michael DuPont
|
2d46fc60be
|
Fixing undefined variable usage
Squash of pull request #872
|
2012-09-28 20:46:25 -04:00 |
|
euromark
|
a33b187a09
|
doc block correction
|
2012-09-28 14:51:51 +02:00 |
|
euromark
|
032704346a
|
after correcting nld the iso standard should be enforced for all languages
|
2012-09-28 14:46:29 +02:00 |
|
euromark
|
b7f1740d2b
|
correcting coding-standards
|
2012-09-28 13:49:51 +02:00 |
|
mark_story
|
e5503326ac
|
Fix coding standard error.
|
2012-09-27 21:44:19 -04:00 |
|
mark_story
|
eed59a95ad
|
Fix whitespace.
|
2012-09-27 21:42:15 -04:00 |
|
mark_story
|
393849a9ba
|
Make exception rendererer more resiliant
Exceptions in beforeRender() should render correct error pages.
Fixes #3235
|
2012-09-27 21:39:22 -04:00 |
|
mark_story
|
99edef0abc
|
Re-order assertions.
Group the true/false assertions.
|
2012-09-27 21:39:14 -04:00 |
|
Mark Story
|
9c78aae87e
|
Merge pull request #871 from dereuromark/2.3-dispatch
move charset/App.encoding into CakeResponse
|
2012-09-27 17:38:58 -07:00 |
|
Mark Story
|
f55160e83b
|
Merge pull request #869 from dereuromark/2.3-nld
Correcting iso standard for nld (dutch) - making dut the alias
Fixes #795
|
2012-09-27 17:16:12 -07:00 |
|
euromark
|
b47e3a7d92
|
move charset/App.encoding into CakeResponse
|
2012-09-27 20:28:19 +02:00 |
|
euromark
|
c87b53a7d8
|
correcting iso standard for nld (dutch) - making dut the alias
|
2012-09-27 10:10:40 +02:00 |
|
mark_story
|
76d21c6d56
|
Try to fix another test failure caused by blowfish.
travis ci seems to have wonky hashing with blowfish on the 5.2 boxes.
Skip tests when we know blowfish is messed up.
|
2012-09-26 22:25:05 -04:00 |
|
mark_story
|
ea784f68dc
|
Try skipping blowfish tests if hashes are wrong.
Another attempt at fixing failing tests on travisci.
|
2012-09-26 22:00:52 -04:00 |
|
mark_story
|
8bbb1f166c
|
Revert "Attempting to get passing builds on travisci"
This reverts commit 61d6f716bc.
|
2012-09-26 21:58:14 -04:00 |
|
mark_story
|
61d6f716bc
|
Attempting to get passing builds on travisci
Currently the 5.2 builds fail due to the length checks on blowfish
hashes. Try a shorter wall to see if those builds will pass.
|
2012-09-26 21:48:05 -04:00 |
|
mark_story
|
0fc9a2c29c
|
Update query building in TranslateBehavior.
* Reduce duplicate checks for Alias.*.
* Allow both the quoted and non quoted version of Alias.*
Fixes #3210
|
2012-09-25 21:01:19 -04:00 |
|
Jose Lorenzo Rodriguez
|
c870044262
|
Fixed typo
|
2012-09-25 17:05:41 +02:00 |
|
Jose Lorenzo Rodriguez
|
047ffd1530
|
Removing variable from dump test as it does not exist anymore
|
2012-09-25 17:01:06 +02:00 |
|
Jose Lorenzo Rodriguez
|
d5c9d97dc1
|
Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
|
2012-09-25 16:36:03 +02:00 |
|
Jose Lorenzo Rodriguez
|
6818d69fc3
|
Fixed issue in CakeTime that it would apply userOffset twice when using
the format() function
|
2012-09-25 15:23:46 +02:00 |
|
Jose Lorenzo Rodriguez
|
b0822d2246
|
Introducing failing test case to prove issue in CakeTime
|
2012-09-25 15:23:19 +02:00 |
|
Ceeram
|
e4542827c8
|
avoid pass by reference error on 5.4
|
2012-09-24 18:26:25 +02:00 |
|
Renan Gonçalves
|
fe5b49e6eb
|
Fixing variable name used to set error handlers.
|
2012-09-24 13:41:56 +02:00 |
|
José Lorenzo Rodríguez
|
a355a8413c
|
Merge pull request #867 from ceeram/2.3-assetfilter
refactoring asset dispatcher filter
|
2012-09-24 01:26:29 -07:00 |
|
Ceeram
|
3665a95996
|
refactoring asset dispatcher filter
|
2012-09-24 10:06:45 +02:00 |
|
dogmatic69
|
1b36853355
|
undo the change to avoid change in behavior
|
2012-09-21 23:49:24 +01:00 |
|
dogmatic69
|
cd99b7d6ff
|
fixing error pointed out by dereuromark with recursive https://github.com/cakephp/cakephp/pull/846#commitcomment-1884073
|
2012-09-21 23:40:21 +01:00 |
|
dogmatic69
|
36314e6d37
|
converting if ($foo != "") to if ($foo)
|
2012-09-21 23:34:37 +01:00 |
|
dogmatic69
|
8dc4de5de8
|
converting if ($foo != false) to if ($foo)
|
2012-09-21 23:32:52 +01:00 |
|