mark_story
aa8965d3f3
Merge branch 'merger' into 2.0
2011-10-01 22:38:39 -04:00
mark_story
c9bd97309f
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/configure.php
cake/libs/controller/components/email.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/email.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ViewTask.php
lib/Cake/Model/Datasource/DboSource.php
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Utility/InflectorTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Utility/Inflector.php
lib/Cake/Utility/Validation.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper.php
lib/Cake/View/Helper/FormHelper.php
2011-10-01 22:38:20 -04:00
Graham Weldon
f69fc937cb
Fixed missing string append operator for baked homepage to include banner.
2011-10-02 11:58:11 +11:00
mark_story
f4b2e03295
Errors should be output on stderr.
2011-09-30 21:56:57 -04:00
Jose Lorenzo Rodriguez
5a181d8705
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-09-30 01:56:19 -04:30
Jose Lorenzo Rodriguez
fff42e92ed
Adding a few class loading related changes to make the ApiGenerator plugin happy
2011-09-30 01:55:33 -04:30
Ceeram
22029a1199
fixing email.php.default, from should have email as key
2011-09-29 14:59:27 +02:00
mark_story
dffcf048d9
Fix incorrect documentation.
2011-09-24 12:06:44 -04:00
mark_story
8272758eb9
Adding block to home page for PHP version.
...
Fixes #2010
2011-09-24 10:41:22 -04:00
Renan Gonçalves
0bcb8d0dfa
Improving the regex and moving more files around.
...
- Making the regex case insensitive so it can also matches capital C in class (ie. Class).
- Adding a new protected method to move view files, the directory will be camelized.
2011-09-22 15:03:42 +02:00
Renan Gonçalves
1b2b191212
Updating cake.generic.css to its newest version from app directory.
2011-09-20 20:29:55 +02:00
Gordon Pettey (petteyg)
744558de90
Add validation guess for Postgress inet field
2011-09-20 17:45:35 +00:00
ADmad
7c87e9abc1
For MySQL you can now specify the socket to use using unix_socket key in the config array. Closes #1994
2011-09-16 13:40:04 +05:30
Graham Weldon
9d1e3cbb05
Fix comment for ife() Upgrade. Thanks SkieDr.
2011-09-16 00:38:26 +10:00
Graham Weldon
d8468c1a38
Fixed incorrect ife() conversion. Thanks SkieDr.
2011-09-16 00:34:39 +10:00
Renan Gonçalves
cd6c370dd9
Adding tests method to Upgrade shell, fixing FooTestCase to FooTest.
...
Also making sure the preg_match matches the right class and not move the file to other directory rather than tests.
The method `tests` need to be run before `locations` to work properly.
2011-09-14 13:33:01 +02:00
ADmad
97a975c6c4
Refactoring Model::invalidFields() a bit.
2011-09-12 05:10:34 +05:30
mark_story
3cb3424b4f
Add App::uses to baked controllers.
...
Controllers should load their dependencies.
Bake should help with the best practice.
Fixes #1971
2011-09-09 20:43:04 -04:00
mark_story
7c08c966b0
Adding App::uses() call to model baking.
...
Models should always include their parent classes to be safe.
Bake should reflect the best practice.
Refs #1971
2011-09-09 20:43:04 -04:00
mark_story
3d44489b0c
Deprecating the %page% style placeholders in PaginatorHelper.
...
Updating scaffold and bake templates to not use deprecated placeholders.
2011-09-06 02:37:43 +01:00
Jose Lorenzo Rodriguez
74ba030e7c
More postgres tests passing again
2011-09-03 18:34:11 -04:30
Jose Lorenzo Rodriguez
2bca1435ab
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-09-03 07:05:48 -04:30
Jose Lorenzo Rodriguez
89b1e54071
Removing Oracle driver, it will not make it to stable release. Revert this commit to bring it back for next version
2011-09-03 06:50:19 -04:30
mark_story
8c75488979
More changes to the CSS, and updating the bake templates and scaffolds.
2011-09-03 10:06:01 +01:00
mark_story
efbeab6199
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/controller/components/email.php
cake/tests/cases/console/libs/tasks/fixture.test.php
lib/Cake/Console/Command/Task/DbConfigTask.php
2011-09-03 00:48:09 +01:00
Renan Gonçalves
bc3828179b
Not using Folder if its a git repository.
2011-09-02 00:19:37 +02:00
Renan Gonçalves
65956ab863
Adding __d(...) to the upgrade shell messages. Althought there is no 'real' need for it its good to be aligned to the others shells.
2011-09-01 22:10:42 +02:00
Renan Gonçalves
81c46a76b7
Not running 'git mv ...' if its dry-run.
2011-09-01 22:10:42 +02:00
Renan Gonçalves
265c094f2f
Fixing the path to tests on upgrade shell and also fixing the option for git, it needs to be boolean.
2011-09-01 22:10:42 +02:00
Renan Gonçalves
7ae89c3679
Checking if short options exist, fixed an warning caused by not checking it.
2011-09-01 22:10:42 +02:00
Renan Gonçalves
edbe60e965
Overriding the files array, so it will not try to perform actions on files that no longer exists.
2011-09-01 19:31:32 +02:00
Jose Lorenzo Rodriguez
a8b38beb9d
Fixing bug in SchemaShell where it would always force a read on all tables
2011-08-30 00:07:57 -04:30
Mark Story
59c6b419e5
Merge branch '1.3' into merger
...
Conflicts:
cake/console/libs/bake.php
cake/libs/configure.php
cake/libs/controller/components/request_handler.php
cake/tests/cases/console/libs/tasks/fixture.test.php
cake/tests/cases/libs/controller/components/request_handler.test.php
lib/Cake/Cache/Engine/FileEngine.php
lib/Cake/Test/Case/Controller/ScaffoldTest.php
lib/Cake/Utility/Validation.php
2011-08-28 22:08:49 -04:00
Juan Basso
7d0250ff47
Merge branch '2.0-api-doc' into 2.0
2011-08-26 20:22:26 -04:00
mark_story
f060fdafb7
Adding the --debug flag that later versions of PHPUnit support.
2011-08-22 22:29:32 -04:00
ADmad
34d3d6fe9e
Fixing doc block related to session configuration. Closes #1927
2011-08-23 04:07:08 +05:30
Juan Basso
689c7ffd45
Fixed some problems caused by the visibility changes.
2011-08-21 01:04:55 -04:00
Juan Basso
61833294f0
Changed the visibility to methods that not affect others classes.
2011-08-20 01:39:30 -04:00
Juan Basso
f5a54d00dd
Changed methods and attributes from private to protected.
2011-08-20 00:43:34 -04:00
Juan Basso
40654df5ab
Fixing more documentations.
2011-08-18 22:31:00 -04:00
Juan Basso
0575e92833
Added visibility in some methods and attributes.
2011-08-18 22:30:28 -04:00
Juan Basso
16ef234180
Removing trailing spaces.
2011-08-15 23:55:08 -04:00
Juan Basso
620a65b2fc
Merge branch '2.0' into 2.0-api-doc
...
Conflicts:
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00
mark_story
d93c8cb200
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/controller/components/security.php
cake/libs/view/pages/home.ctp
cake/libs/view/view.php
lib/Cake/Cache/Engine/FileEngine.php
lib/Cake/Config/config.php
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Utility/SanitizeTest.php
lib/Cake/Test/Case/Utility/SetTest.php
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/CacheHelper.php
2011-08-14 14:39:49 -04:00
Majna
826001adc7
Added doc blocks for WincacheEngine. Fixed Memcache doc block.
2011-08-10 16:55:05 +02:00
mark_story
95f3eb48f9
Fixing plugin option + locations subcommand.
2011-08-07 18:17:14 -04:00
mark_story
be262f30f0
Fixing notice errors caused by undefined property.
2011-08-06 21:12:48 -04:00
Mark Story
2f079b33dd
Fixing issues output xml help.
2011-08-06 16:26:58 -04:00
Mark Story
5d3c470871
Fixing issues where option values started with '-'.
2011-08-06 15:43:41 -04:00
Mark Story
b7391274fb
Adding an exception when a short option is longer than one
...
character. Having long short options breaks parsing, and
doesn't make sense with how short options are used.
2011-08-06 15:21:42 -04:00
