Mark Story
12f5aee5a2
Merge pull request #7447 from ravage84/2.7-lib-improvements
...
Various improvements to the CakePHP lib files
2015-09-25 12:14:00 -04:00
Marc Würth
1267586f23
Re-add closing tags to ctp files
...
Refs https://github.com/cakephp/cakephp/pull/7447#discussion_r40444715
2015-09-25 18:10:18 +02:00
Marc Würth
e690662f0e
Various improvments to the CakePH Plib files
...
Mostly CS, doc blocks and explicit returning nulls.
2015-09-25 17:11:20 +02:00
Mark Scherer
450a544eb4
Backport 3.x limit of fixture data generation.
2015-09-13 13:12:53 +02:00
mattmemmesheimer
d3cf879195
Updating deprecated SessionComponent::setFlash calls to FlashComponent magic calls.
2015-08-16 18:01:23 -05:00
mattmemmesheimer
604cb0e48b
Including the FlashComponent by default in the controller when baking.
2015-08-16 17:58:41 -05:00
Mark Scherer
3f15c8a199
fix templates
2015-08-05 11:45:27 +02:00
Mark Story
58bede76d1
Merge pull request #7103 from ravage84/2.7-fixture-import-record-aware
...
Make fixture import from table aware of records found
2015-08-03 16:01:35 -04:00
Marc Würth
27c88a872b
Use tabs and single spaces in all .htaccess files
2015-08-01 00:39:10 +02:00
Mark Scherer
a239324a0d
use constant PHP_SAPI
2015-07-26 15:35:03 +02:00
Mark Story
de4b44a37b
Merge pull request #7077 from dereuromark/2.7-static
...
Replacing self with static due to PHP5.3+. Following #7040 .
2015-07-23 22:27:37 -04:00
Marc Würth
b412b405f9
Make fixture import from table aware of records found
2015-07-23 18:03:42 +02:00
Marc Würth
71e4ed91af
Slightly improve the bake templates
2015-07-23 17:29:47 +02:00
antograssiot
94b2ea29a6
enable colors for windows ConEmu user
...
backport of #7090
2015-07-23 05:49:15 +02:00
Mark Scherer
52e79987a2
Replacing self with static due to PHP5.3+. Following #7040 .
2015-07-21 10:22:53 +02:00
mark_story
47378427e3
Merge branch '2.6' into 2.7
2015-07-11 21:25:26 -04:00
Marc Würth
4a131bdcbf
Capitalize Windows, the OS
2015-07-09 15:54:03 +02:00
mark_story
cbd45f702d
Make FlashComponent/FlashHelper more backwards compatible.
...
Merge branch 'issue-6874' into 2.7.
Make AuthComponent use FlashComponent, and make FlashHelper more
compatible with SessionHelper::setFlash().
2015-06-26 22:05:32 -04:00
mark_story
ae2ea1ea6c
Merge branch '2.6' into 2.7
2015-06-25 21:50:47 -04:00
Mark Scherer
1c56c723f5
Backport param() access.
2015-06-25 00:52:33 +02:00
Highstrike
8257100f54
How about this?
2015-06-24 15:46:48 +03:00
Humberto Pereira
26630991a6
CakeShells should not print html in case of a error
2015-06-20 22:19:07 -04:00
mark_story
d7d8b90986
Merge branch '2.6' into 2.7
2015-05-28 19:34:59 -04:00
mark_story
9626f0e726
Exclude deprecated validators from bake.
...
Don't include deprecated validators in bake.
Refs #6581
2015-05-22 22:03:32 -04:00
Mark Scherer
f742fa51fe
Dont include deprecated options for bake
2015-05-17 23:24:23 +02:00
Mark Scherer
4f3602ad5f
Adjust bake, docblocks and tests for notBlank.
2015-05-17 22:27:16 +02:00
ovidiupruteanu
a55685c278
Replace preg_replace with basename in SchemaShell
2015-05-11 14:52:31 +03:00
ovidiupruteanu
4b3386c16f
Replace rtrim with preg_replace in SchemaShell
...
The second parameter of rtrim is a character mask, not a string to be replaced. It was breaking file names ending in one or more 'p' or 'h' characters.
2015-05-11 14:35:20 +03:00
mark_story
3151c53255
Merge branch '2.6' into 2.7
2015-03-23 22:50:09 -04:00
mark_story
5a6a74e2f8
Fix failing tests.
...
The test was taking the wrong index when creating mock path choices.
Refs #6125
2015-03-20 20:35:43 -04:00
Edgaras Janušauskas
b444fe7b81
Do not warn about i18n functions definitions on extract task
2015-03-16 23:16:50 +02:00
Jonas
5f40161e24
2.6.2: cake bake / ModelTask should respect decimal
...
PR for https://github.com/cakephp/cakephp/issues/6066
2015-03-13 21:35:12 +01:00
mark_story
63769ae4a6
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/VERSION.txt
2015-02-26 12:50:35 -05:00
AD7six
5066bc33b4
Fix whitespace for paginator counter call
2015-02-23 16:46:43 +00:00
AD7six
5342605d92
The parentheses were unbalanced
2015-02-23 15:21:39 +00:00
mark_story
831fe53f79
Ignore LC_TIME category when extracting messages.
...
Given that we use the specific LC_TIME file format, it doesn't make much
sense to extract translated strings into a PO file that cannot be used
later on.
Refs #5933
2015-02-22 22:39:38 -05:00
Michael Houghton
4f2ed15612
fix for confirm message on the bake templates
2015-02-21 10:21:37 +00:00
ADmad
18246daf17
Merge branch 'master' into 2.7
2015-02-15 21:15:02 +05:30
Markus Fischer
546941a79b
i18n: Remove POT-Creation-Date
...
Prevent app locale files getting marked as modified in VCS even if the actual
content didn't change.
Fixes #5887
2015-02-15 12:38:48 +01:00
mark_story
eb85a875c0
Merge branch 'master' into 2.7
2015-02-10 23:00:43 -05:00
Emil Møller
3f715c4262
Load ClassRegistry Once
2015-02-04 21:29:16 +01:00
Rachman Chavik
acd32b71fe
Fix: "bake plugin" generates incorrect directory for View/Layouts
2015-02-04 15:47:01 +07:00
Mark Story
35e0dc2bbd
Merge pull request #5760 from cakephp/master
...
Merge master into 2.7
2015-01-27 20:48:15 -05:00
mark_story
a8ae12a700
Fix warnings when php://output is used with ConsoleOutput.
...
The php://output stream is not compatible with posix functions.
Refs #4901
2015-01-25 22:24:24 -05:00
Robert
f4933b29a8
CS fix
2015-01-19 08:51:57 +01:00
Robert
dedb2e4191
Added short plugin alias in shells
2015-01-19 08:51:57 +01:00
mark_story
ac9a212d44
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/Utility/String.php
2015-01-11 15:25:18 -05:00
antograssiot
c2f298a8b7
Replace our custom code fence with markdown standard fence
2015-01-09 13:47:25 +01:00
euromark
52ecccb1a2
App::uses and usage replacements for String => CakeText.
2015-01-05 01:00:57 +01:00
Edgaras Janušauskas
3ae61e9e16
Fix Extract task to correctly extract messages with context
2014-12-25 14:28:44 +02:00
