mark_story
|
8209097bc3
|
Merge branch 'master' into 2.4
|
2013-03-09 12:40:59 -05:00 |
|
Adam Taylor
|
433dd09ec4
|
Fix typos
|
2013-03-05 00:05:14 -07:00 |
|
mark_story
|
cfc10a7c68
|
Fix failing test and unskip tests in SchemaShell::create()
The tests were accidentally skipped when tests for --exclude were added
& fixed. Restore the gist of the previous tests.
|
2013-03-04 22:37:48 -05:00 |
|
mark_story
|
4a0df83783
|
Fix failing tests.
When the app did not have the correct models, tests would fail.
|
2013-03-04 22:13:45 -05:00 |
|
mark_story
|
4b13e0a5f2
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/VERSION.txt
|
2013-03-04 21:55:29 -05:00 |
|
Alexander Hofbauer
|
c920209f58
|
SchemaShell: Implement "exclude" parameter
Allows for passing a list of tables to ignore when generating schemas.
Closes #3652.
|
2013-03-04 22:37:44 +01:00 |
|
Kyle Robinson Young
|
85862bbb9f
|
Lazy load models in shells.
|
2013-02-28 20:30:06 -08:00 |
|
mark_story
|
1d529c1dd2
|
Add type hints in SchemaShell.
I'm trying to figure out what's going on in the failing travis builds.
|
2013-02-28 22:54:31 -05:00 |
|
ADmad
|
431e610317
|
Fix broken tests
|
2013-02-08 19:04:41 +05:30 |
|
Graham Weldon
|
26a08c6780
|
Updated copyright
|
2013-02-08 21:28:17 +09:00 |
|
Graham Weldon
|
66d856d883
|
Added extra line for referencing license file for copyright
|
2013-02-08 21:22:51 +09:00 |
|
Graham Weldon
|
7b860debe4
|
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
|
2013-02-08 20:59:49 +09:00 |
|
ADmad
|
bb767408d3
|
Fix cs errors
|
2013-01-27 23:03:06 +05:30 |
|
mark_story
|
4af6039107
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Model/Model.php
|
2013-01-26 21:16:26 -05:00 |
|
Ceeram
|
16be9d4990
|
remove unused local vars
|
2013-01-23 17:22:06 +01:00 |
|
mark_story
|
95ed471c41
|
Reduce duplication in code.
This will result in all tests being skipped when any of the required
models pre-exists.
|
2013-01-16 12:59:13 -05:00 |
|
mark_story
|
5a6a45d0d1
|
Add support for --admin to bake controller all.
I missed this when originally implementing bake controller all.
Fixes #3536
|
2013-01-16 12:57:18 -05:00 |
|
euromark
|
11a88042bd
|
fix doc block endings
|
2013-01-11 15:06:54 +01:00 |
|
euromark
|
b811afbc44
|
double spaces to single ones
|
2012-12-22 23:48:15 +01:00 |
|
José Lorenzo Rodríguez
|
a8bd7c6678
|
Merge pull request #961 from dereuromark/2.3-unify-object-collection
2.3 unify object collection
|
2012-12-22 14:24:26 -08:00 |
|
mark_story
|
6f5ff4d7dd
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Model/CakeSchema.php
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
|
2012-12-13 20:20:42 -05:00 |
|
mark_story
|
b20f6e132d
|
Add test for options with 0 value.
|
2012-12-10 22:10:00 -05:00 |
|
euromark
|
881127ef4d
|
unify new lines at the end of the file
|
2012-12-05 15:00:24 +01:00 |
|
Ceeram
|
eadc3a75e5
|
fix coding standards
|
2012-11-21 15:39:03 +01:00 |
|
mark_story
|
27d7e2865e
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
|
2012-11-20 23:02:33 -05:00 |
|
mark_story
|
587c7071b4
|
Fix incorrect order of arguments when added out of sequence.
Fixes #3385
|
2012-11-20 22:42:44 -05:00 |
|
euromark
|
8acdb129b2
|
unify object load/unload and loaded methods
|
2012-11-16 12:14:28 +01:00 |
|
mark_story
|
c24bec679b
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/View/Helper/FormHelper.php
|
2012-10-27 21:13:53 -04:00 |
|
Ber Clausen
|
a7d9422c09
|
Test all empty array with assertSame() because assertEquals() does not check the type.
|
2012-10-26 19:21:51 -03:00 |
|
Ceeram
|
870d77c89e
|
Make the test more accurate on type of result
|
2012-10-26 20:49:04 +02:00 |
|
Ceeram
|
39dcb80b45
|
Fix failing test, find('first') now returns empty array when no record was found
|
2012-10-26 16:32:15 +02:00 |
|
euromark
|
cc436146be
|
making tests pass on windows again
|
2012-10-25 17:37:35 +02:00 |
|
Adam Taylor
|
4090c2e932
|
Remove trailing whitespace from comments
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
|
2012-10-15 18:19:37 -06:00 |
|
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 |
|
euromark
|
b7f1740d2b
|
correcting coding-standards
|
2012-09-28 13:49:51 +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 |
|
Mark Story
|
07c5102de5
|
Merge pull request #850 from ceeram/2.2-filesize
Add CakeNumber::fromReadableSize() and Validation::filesize()
|
2012-09-17 17:55:23 -07:00 |
|
Renan Gonçalves
|
d33f676ddd
|
Handling a fatal error on console should call Shell::_stop(1).
Just like we do on web, any exception or fatal error will result into a InternalErrorException/FatalErrorException.
|
2012-09-14 14:17:07 +02:00 |
|
mark_story
|
571c8bc08c
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Console/Command/Task/TestTask.php
|
2012-09-01 13:51:40 +01:00 |
|
mark_story
|
894fc1256a
|
Add test cases for strings containing quotes.
Show that both double and single quoted strings are
handled correctly by ExtractTask.
Closes #3155
|
2012-08-30 23:48:32 +01:00 |
|
Ceeram
|
abe74adf8a
|
partial remove onlyAllow from baked code, only keep in delete to be rfc compliant
|
2012-08-26 15:00:49 +02:00 |
|
Ceeram
|
27d83eedfe
|
use new onlyAllow() method in baked code, to ensure 405 responses have required Allow header included
|
2012-08-25 09:38:40 +02:00 |
|
Tigran Gabrielyan
|
0441c9f6c3
|
Added tests for bake shell cache prefix generation
|
2012-08-24 22:52:02 -04:00 |
|
mark_story
|
11227f5490
|
Fix coding standards.
|
2012-08-10 21:50:37 -04:00 |
|
euromark
|
5190b9f2c9
|
asserting that under_scored names result in valid ClassNames
|
2012-08-08 16:35:59 +02:00 |
|
euromark
|
62dee78ca5
|
adding models for schema generate
|
2012-08-08 14:15:28 +02:00 |
|
mark_story
|
d94cdc67fe
|
Merge branch 'master' into 2.3
|
2012-07-27 22:38:24 -04:00 |
|
mark_story
|
6e0cf0dab7
|
Fix failing test.
|
2012-07-26 21:19:20 -04:00 |
|
Kyle Robinson Young
|
cbf5328b33
|
Fix failing test with controller task listAll
|
2012-07-25 22:12:55 -07:00 |
|
mark_story
|
35bf3097cd
|
Fixing missing imports in generated tests.
Fixes #3059
|
2012-07-23 21:25:55 -04:00 |
|