mark_story
|
c0d897b45c
|
Merge branch '2.x' into 2.8
|
2016-02-06 20:55:08 -05:00 |
|
Edgaras Janušauskas
|
f389231058
|
Improve ExtractTask when CakePHP installed via Composer
|
2016-02-03 14:52:15 +02:00 |
|
mark_story
|
3b5a71df37
|
Merge branch '2.7' into 2.8
|
2016-01-28 21:51:59 -05:00 |
|
Edgaras Janušauskas
|
fde1d08b43
|
Fix PHPDoc @return by replacing $this to self
|
2016-01-28 23:10:42 +02:00 |
|
mark_story
|
91109c33b2
|
Merge branch '2.7' into 2.8
|
2016-01-19 21:15:08 -05:00 |
|
mscherer
|
c06bde34d6
|
Backport CODE_ERROR constant and return as per expectation.
|
2016-01-19 16:53:23 +01:00 |
|
Larry E. Masters
|
0aa8847762
|
Merge pull request #7840 from cakephp/2.8-PHP7
2.8 PHP7 compatibility
|
2015-12-29 00:27:33 -05:00 |
|
mark_story
|
b5e64bbad5
|
Merge branch '2.7' into 2.8
|
2015-12-24 16:20:27 -05:00 |
|
Mark S
|
fd021909ba
|
Remove an empty line output
|
2015-12-22 17:10:42 +01:00 |
|
mark_story
|
8343f6c81d
|
Merge branch '2.8' of github.com:cakephp/cakephp into 2.8
|
2015-12-21 12:41:52 -05:00 |
|
mark_story
|
37fe25909f
|
Merge branch '2.7' into 2.8
|
2015-12-20 21:59:43 -05:00 |
|
Edgaras Janušauskas
|
c6fdcea3aa
|
Clear model cache after schema update.
|
2015-12-17 22:38:35 +02:00 |
|
Gareth Ellis
|
e640420dd9
|
Re-order code in Shell::helper() to return slightly earlier
|
2015-12-14 09:48:36 +00:00 |
|
Gareth Ellis
|
75cabfe78b
|
Rename ShellHelper to BaseShellHelper to avoid potential naming conflicts with existing apps
|
2015-12-14 09:47:22 +00:00 |
|
Gareth Ellis
|
7ba19c717e
|
Update docblock for ConsoleOutput::overwrite() $size param
|
2015-12-01 17:09:42 +00:00 |
|
Gareth Ellis
|
031ae3d105
|
Use traditional array syntax
|
2015-12-01 15:37:06 +00:00 |
|
Gareth Ellis
|
d84b6a2c22
|
Use traditional array syntax
|
2015-12-01 15:32:54 +00:00 |
|
Gareth Ellis
|
56cfe8492a
|
Use traditional array syntax
|
2015-12-01 15:32:06 +00:00 |
|
Gareth Ellis
|
3f992695b2
|
Use traditional array syntax
|
2015-12-01 15:16:54 +00:00 |
|
Gareth Ellis
|
eafee25d13
|
PHPCS fixes
|
2015-12-01 14:26:22 +00:00 |
|
Gareth Ellis
|
6b6a90e5c1
|
Add table shell helper
|
2015-12-01 13:29:08 +00:00 |
|
Gareth Ellis
|
53b9dc83f6
|
Add helper method to shell class for loading/fetching helper instances
|
2015-12-01 13:07:56 +00:00 |
|
Gareth Ellis
|
2854940693
|
Renamed progress helper files to include Shell to avoid conflicts with existing view helpers
|
2015-12-01 13:07:32 +00:00 |
|
Gareth Ellis
|
788c57dd4b
|
Add progress helper
|
2015-12-01 12:03:09 +00:00 |
|
Gareth Ellis
|
e580ad813e
|
Add overwrite method to ConsoleOutput class
|
2015-12-01 12:01:39 +00:00 |
|
Mark Scherer
|
8c5f78bc58
|
Remove another type hint
|
2015-11-10 00:32:48 +01:00 |
|
mark_story
|
707915e693
|
Merge branch '2.7' into 2.8
|
2015-10-15 22:10:56 -04:00 |
|
Marc Würth
|
86da57d2be
|
Minor improvements to the front controller
|
2015-10-04 15:38:48 +02:00 |
|
mark_story
|
a6a699b4b9
|
Merge branch '2.7' into 2.8
|
2015-09-28 21:17:45 -04:00 |
|
Marc Würth
|
26a05a4e87
|
Update another link to DebugKit 2.2 branch
|
2015-09-28 12:51:30 +02:00 |
|
Marc Würth
|
2d82a120af
|
CS
|
2015-09-28 12:47:25 +02:00 |
|
Marc Würth
|
f1160b7401
|
Update link to DebugKit 2.2 branch
Refs https://github.com/cakephp/debug_kit/issues/372
|
2015-09-28 12:47:14 +02:00 |
|
mark_story
|
ae83e197dc
|
Merge branch '2.8' of github.com:cakephp/cakephp into 2.8
|
2015-09-27 11:13:12 -04:00 |
|
mark_story
|
8a57d78dba
|
Merge branch '2.7' into 2.8
|
2015-09-27 11:12:55 -04:00 |
|
Mark Story
|
0da9c4976d
|
Merge pull request #7448 from ravage84/2.7-tests-improved
Various improvements to the CakePHP test files
|
2015-09-25 18:00:14 -04:00 |
|
Mark Story
|
3aec527fad
|
Merge pull request #7449 from ravage84/2.7-app-skel-sync
App & skel folder sync + some improvements
|
2015-09-25 12:49:20 -04:00 |
|
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
|
5eedc0f2bb
|
Fix broken test
|
2015-09-25 17:55:01 +02:00 |
|
Marc Würth
|
dbfd2c44e9
|
App & skel folder sync + some improvements
Mostly CS, doc blocks and some CSS
|
2015-09-25 17:25:35 +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 |
|
Marc Würth
|
5b41a9b52d
|
Swallow the "--quiet" shell parameter before calling PHPUnit.
PHPUnit does not provide a silent or quiet mode, so we cannot pass it along:
https://phpunit.de/manual/3.7/en/phpunit-book.html#textui.clioptions
Resolves #7432
|
2015-09-22 14:25:53 +02:00 |
|
Mark Scherer
|
450a544eb4
|
Backport 3.x limit of fixture data generation.
|
2015-09-13 13:12:53 +02:00 |
|
Jose Lorenzo Rodriguez
|
40d628530a
|
Merge branch '2.7' into 2.8
|
2015-08-21 10:54:30 +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_story
|
ca19b63a32
|
Merge branch '2.7' into 2.8
|
2015-08-07 22:04:46 -04: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 |
|