mark_story
|
9ff0739504
|
Improving test generation.
Class construction can be a bit more complicated now.
|
2012-01-27 20:59:03 -05:00 |
|
Ceeram
|
7eda0affe3
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/View/ThemeView.php
|
2012-01-26 21:40:18 +01:00 |
|
ADmad
|
00649cbdde
|
Updating minimum PHP version requirement to 5.2.8 due to PHP bugs #44251 and #45748. Closes #2509
|
2012-01-26 17:56:42 +05:30 |
|
Ceeram
|
4f1be12046
|
Merge branch '2.1-appshell' into 2.1
|
2012-01-23 15:29:03 +01:00 |
|
Graham Weldon
|
64d4387c82
|
Added default prefix to cache configurations.
|
2012-01-23 10:43:21 +11:00 |
|
Jose Lorenzo Rodriguez
|
b9ad469a65
|
Merge remote-tracking branch 'origin/2.0' into 2.1
|
2012-01-22 15:52:54 -04:30 |
|
Yusuke Ando
|
b8d67e581a
|
Set encoding in CSS file.
Signed-off-by: mark_story <mark@mark-story.com>
|
2012-01-22 11:34:16 -05:00 |
|
mark_story
|
70bb839de9
|
Add validation guess for not null + text types.
Fixes #2493
|
2012-01-21 13:10:30 -05:00 |
|
mark_story
|
df5d9ac3d1
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
|
2012-01-20 20:28:15 -05:00 |
|
mark_story
|
5e495ad90c
|
Simplify how options are checked.
|
2012-01-17 21:57:22 -05:00 |
|
Mark Story
|
e080bb27b9
|
Merge pull request #411 from fitorec/2.0
Check the logic in the Shell::in($prompt, $options = null, $default = null)
|
2012-01-17 18:53:00 -08:00 |
|
Mark Story
|
8608caa8a2
|
Merge pull request #298 from vitorpc/2.0
Property 'name' removed of PagesController.
|
2012-01-17 18:52:26 -08:00 |
|
Ceeram
|
828117583f
|
fix that argument with 0 as value will stop parsing args, tests added
|
2012-01-17 20:01:40 +01:00 |
|
Scott Harwell
|
153b9f9ee2
|
Updated to use camelize rather than classify
|
2012-01-16 20:52:05 -05:00 |
|
Scott Harwell
|
33dc57e667
|
Added check for duplicate methods to prevent fatal php error
|
2012-01-16 14:45:12 -05:00 |
|
Fitorec
|
ddbaa66997
|
Reviewing the logic in the Shell::in($prompt, $options = null, $default = null)
|
2012-01-15 21:16:45 -06:00 |
|
Mark Story
|
533feea2b1
|
Merge pull request #403 from rintaun/patch-2
$action in AclShell::_getParams() should default to '*', not NULL
|
2012-01-12 19:08:42 -08:00 |
|
mark_story
|
b6040aec5a
|
Update UpgradeShell for App classes.
Correctly move AppController and AppModel.
Fixes #2472
|
2012-01-12 21:37:34 -05:00 |
|
Ceeram
|
9f40e6de79
|
move AppShell to app/Console/Command directory
|
2012-01-12 11:55:10 +01:00 |
|
Matthew Lanigan
|
0e607bf880
|
$action in AclShell::_getParams() defaults to '*', not NULL
|
2012-01-11 21:59:58 -05:00 |
|
mark_story
|
79564fb7d4
|
Remove incorrect constant.
|
2012-01-07 20:10:14 -05:00 |
|
mark_story
|
72b9eb540e
|
Update core cake.php to match other versions.
This makes the pear package install play nice as well.
|
2012-01-07 20:05:11 -05:00 |
|
mark_story
|
15c7493e39
|
Merge branch '2.0' into 2.1
|
2012-01-06 23:02:16 -05:00 |
|
Simon Males
|
adc6846145
|
schema update fails with -f flag, although it's supported.
|
2012-01-05 16:54:02 +11:00 |
|
ADmad
|
389072708a
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Utility/Debugger.php
|
2011-12-22 03:15:04 +05:30 |
|
mark_story
|
0b0a69de1e
|
Update default layouts to use blocks.
|
2011-12-17 22:23:37 -05:00 |
|
Kyle Robinson Young
|
51f9837db4
|
Code standards formatting
|
2011-12-15 22:52:07 -08:00 |
|
Graham Weldon
|
d83115927d
|
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
|
2011-12-14 16:04:40 +11:00 |
|
mark_story
|
07a2a60468
|
Merge branch '2.0' into 2.1
|
2011-12-13 22:03:40 -05:00 |
|
mark_story
|
b61e3e0378
|
Fix lies in Shell::createFile()
It could lie if the file was not writable.
Fixes #2371
|
2011-12-13 21:59:58 -05:00 |
|
mark_story
|
dd335cb183
|
Fix error in FixtureTask
The options are always set, use empty() instead.
Fixes #2373
|
2011-12-13 20:40:30 -05:00 |
|
Rachman Chavik
|
90af608489
|
keep existing data in unique HABTM closes LH 275
ported to 2.0 branch from cakephp/cakephp#93
|
2011-12-12 18:09:02 +07:00 |
|
mark_story
|
2e8498e166
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
|
2011-12-11 22:51:40 -05:00 |
|
mark_story
|
205bfb506f
|
Add Shell::$plugin and update getOptionParser()
Adding a plugin property allows the correct
usage/help information to be generated.
Fixes #2359
|
2011-12-10 21:31:21 -05:00 |
|
Kyle Robinson Young
|
c836ba08a3
|
Add/move docblocks to make text available in the API docs
|
2011-12-08 07:35:02 -08:00 |
|
Kyle Robinson Young
|
1e1c7a036d
|
Code consistency formatting tweaks
|
2011-12-06 12:52:48 -08:00 |
|
mark_story
|
e7a7e57ba6
|
Fix bare require() to use App::uses()
Fixes #2346
|
2011-12-06 20:09:05 -05:00 |
|
Ceeram
|
e4e26a852b
|
Making non-interactive behave same as interactive with odd table names
|
2011-12-05 17:00:48 +01:00 |
|
mark_story
|
545f4d2811
|
Fix bad merge.
|
2011-12-03 13:56:55 -05:00 |
|
mark_story
|
6d269ce25d
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Command/TestsuiteShell.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Model/Datasource/Database/Sqlite.php
lib/Cake/Test/Case/Model/ModelTestBase.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
|
2011-12-03 13:45:28 -05:00 |
|
Mark Story
|
d4fd1b3743
|
Merge pull request #348 from petteyg/apptheme
Make TemplateTask prioritize App templates over Core templates
|
2011-12-02 17:28:01 -08:00 |
|
Kyle Robinson Young
|
8197f87dbc
|
Spelling and grammar fixes
|
2011-12-01 21:58:09 -08:00 |
|
Gordon Pettey (petteyg)
|
a800dcbbca
|
Merge branch 'master' into apptheme
|
2011-12-02 02:29:43 +00:00 |
|
mark_story
|
0f71254fe1
|
Fix double inflection in bake all <foo>
ViewTask re-pluralizes the model name. Sometimes this leads to
things like Menuses which is totally wrong.
Fixes #2318
|
2011-12-01 20:41:17 -05:00 |
|
Ceeram
|
faddfbe2d0
|
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
|
2011-12-01 20:30:45 +01:00 |
|
Ceeram
|
0a1772c929
|
adding default name, for dbs that dont expose a PK
|
2011-12-01 20:30:36 +01:00 |
|
Kyle Robinson Young
|
94e119fe67
|
Adhere to code formatting standard
|
2011-11-30 23:21:31 -08:00 |
|
Majna
|
87a3937def
|
Add visibility keyword for 'helpers' property in controller template.
|
2011-11-30 20:06:07 +01:00 |
|
Kyle Robinson Young
|
5876744709
|
Adhering to coding standards
|
2011-11-30 07:44:11 -08:00 |
|
Graham Weldon
|
af2e7c1e9b
|
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
|
2011-11-29 23:00:47 +11:00 |
|