mark_story
5e9b22271a
Merge branch 'master' into 2.5
2013-09-27 22:26:33 -04:00
Bryan Crowe
bb65765d70
Updated additional references of Cake to CakePHP
2013-09-27 21:31:35 -04:00
euromark
c23531e806
Assert own tasks are loaded before trying to access taskNames.
2013-09-27 12:53:18 +02:00
mark_story
cc5795c67d
Merge branch 'master' into 2.5
2013-09-26 10:07:10 -04:00
Bryan Crowe
915b51b239
Updated JavaScript casing and JsHelper references in doc blocks
2013-09-25 22:46:38 -04:00
euromark
0ae69aace9
App::import to App::uses
2013-09-25 19:40:14 +02:00
euromark
653aed7701
is_a() to instance of - completes PR 1669
2013-09-24 22:57:51 +02:00
mark_story
d2577fac60
Merge branch 'master' into 2.5
2013-09-21 20:01:50 -04:00
euromark
58f38f1667
Fix casing of validation rules in bake
2013-09-18 18:31:55 +02:00
mark_story
a7a6fcae8a
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-09-17 10:11:24 -04:00
euromark
12f2f729c8
more cs
2013-09-17 14:53:07 +02:00
euromark
382f75dbfc
cs corrections, bool to boolean and int to integer.
2013-09-17 14:44:34 +02:00
mark_story
a2bd91638e
Merge branch 'master' into 2.5
2013-09-12 19:47:13 -04:00
euromark
a796b26f13
fix renderLayout and update deprecated and outdated code
2013-09-13 00:09:31 +02:00
ADmad
c27aa99af9
Merge branch 'master' into 2.5
2013-09-08 20:36:40 +05:30
mark_story
f22c4cf90b
Merge branch 'master' into 2.5
2013-09-05 10:21:41 -04:00
ADmad
29d0e26710
Dropping 'Log' suffix from log configs as per change in cb24dbb084.
...
Reverts regressive change done in 7e28636a72
2013-09-05 19:37:41 +05:30
Hadrien Collongues
7e28636a72
Fix log classname in skeleton
...
Fixes "logger class File does not implement a write method."
It probably tries to use the utility File class instead of the logger
2013-09-05 11:20:39 +02:00
Marc Würth
84a669aa7a
Shortened the if clause line length by doing it the @markstory style ;-)
...
Also shortened the line length of some arrays
2013-09-02 20:38:31 +02:00
mark_story
59bb05b433
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-09-02 11:35:09 -04:00
Matt Reishus
bb98ac761f
ConsoleInput::_canReadLine change from private -> protected
2013-09-01 17:15:51 -05:00
Matt Reishus
3b057cb82b
Correct style
2013-09-01 16:58:23 -05:00
Matt Reishus
916d992162
Use readline in console when supported
...
$this->stdin->read(); will use readline if the system is detected to
support it. In linux, you will be able to use the left and right arrow
keys to edit the current line, use the up and down keys to navigate
history, press ^U to delete the entire line, etc.
Before this, using arrow keys in linux will just spam characters like
^[[C^[[A^[[D^[[C^[[A^. Useful for "Console/cake console"
2013-09-01 16:20:29 -05:00
mark_story
4f237e6a93
Merge branch '2.4' making 2.4 into the master branch.
...
Conflicts:
lib/Cake/VERSION.txt
2013-08-30 16:02:42 -04:00
Mark Story
824a6f700b
Merge pull request #1563 from mvdriel/fix-i18n-extract
...
Extract category strings to separate .po files
2013-08-30 12:19:17 -07:00
Mark van Driel
256e1f6532
Removed unused variable
2013-08-29 10:49:23 +02:00
Gilles Wittenberg
a54e8f238e
Add y/yes option to schema create and update subcommands
2013-08-29 09:13:54 +02:00
Mark van Driel
cce1fafd80
Fixed typo in comments
2013-08-28 18:49:34 +02:00
mark_story
f18d354f55
Merge branch 'master' into 2.4
2013-08-28 12:35:07 -04:00
Mark van Driel
ed10c3332d
Fixed typos in text and comments
2013-08-27 21:12:03 +02:00
Andras Kende
17f9661961
Added mask to File cache docblock
2013-08-27 10:02:48 -04:00
Mark van Driel
c4ec8bedd0
Fixed category constant values: constants in Cake don't use the same values as PHP (Linux)
2013-08-27 12:30:39 +02:00
Mark van Driel
1fd936f3cc
Fixed cross-platform issue: LC_* constants have different values on windows
2013-08-27 10:51:00 +02:00
Mark van Driel
88d7fbeb53
Extract category strings to separate .po files
2013-08-25 23:04:05 +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
53d265cfba
Merge branch 'master' into 2.4
2013-08-23 12:56:43 -04: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
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
mark_story
67855896ef
Remove invalid code.
...
Fixes #4002
2013-08-20 11:34:30 -04:00
euromark
5ed9e5d691
sync and correct generic css
2013-08-19 21:51:04 +02: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
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
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
Andras Kende
3f58be260e
removed not used $i variable
...
removed not used $i variable
2013-08-13 22:06:00 -07:00
euromark
759c24e660
correct doc blocks as per cs
2013-08-13 12:29:20 +02:00
