ADmad
|
4ded269549
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
lib/Cake/VERSION.txt
|
2013-07-07 12:22:12 +05:30 |
|
Rachman Chavik
|
4bb0a1228a
|
Fix I18n to extract plugin model validation messages
|
2013-07-07 11:20:14 +07:00 |
|
euromark
|
8141dd2d5d
|
unify other log types as well
|
2013-06-21 16:43:01 +02:00 |
|
mark_story
|
cd3c54bb9d
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/VERSION.txt
|
2013-06-10 22:12:10 -04:00 |
|
euromark
|
4518624187
|
more whitespace coding standard corrections
|
2013-06-09 17:39:48 +02:00 |
|
ADmad
|
636cc8c103
|
Merge branch 'master' into 2.4
|
2013-06-09 18:08:32 +05:30 |
|
euromark
|
394bf1054d
|
remove name attribute where not necessary, clean up doc blocks
|
2013-06-08 04:29:08 +02:00 |
|
ADmad
|
3303a2cda1
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
|
2013-06-02 18:03:59 +05:30 |
|
mark_story
|
be2a252345
|
Fix coding standards.
|
2013-05-31 10:37:20 -04:00 |
|
Marc Würth
|
4c9f0414cb
|
Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
|
2013-05-31 00:11:19 +02:00 |
|
Marc Würth
|
2bbd391972
|
Synced PHP version annotations
CakePHP seems to be just "PHP 5" as opposed to the PEAR header comment standard "PHP version 5"
http://pear.php.net/manual/en/standards.header.php
|
2013-05-29 20:19:14 +02:00 |
|
Mark Story
|
293ba4cdb9
|
Merge pull request #1261 from dereuromark/2.4-bake-fixtures
add schema param and skip interactive prompts if unnecessary
|
2013-05-07 18:59:42 -07:00 |
|
ADmad
|
a10275fb8b
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
|
2013-05-05 14:36:46 +05:30 |
|
Angel S. Moreno
|
2c4e9dc8f6
|
Added Aliasing of Tasks in the TaskCollection() class and added tests
|
2013-05-03 01:53:37 -04:00 |
|
euromark
|
0959c7008f
|
add schema param and skip interactive prompts if unnecessary
|
2013-05-02 00:19:46 +02:00 |
|
euromark
|
5b298c1306
|
remove copyright noise from test files to unify with new newer files which don't contain it anymore anyway
|
2013-04-29 17:16:53 +02:00 |
|
ADmad
|
431ab2aebd
|
Fix CS errors
|
2013-04-04 17:37:51 +05:30 |
|
Rémi Dewitte
|
c70a3868a9
|
schema update CREATEs non-existing tables instead of ALTER
|
2013-04-03 17:37:09 +02:00 |
|
euromark
|
dab0c5e753
|
Allow behaviors to be added to bake templates and improve doc blocks
|
2013-03-15 12:14:06 +01:00 |
|
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 |
|