mark_story
f847080cbf
Changing more php version strings.
2010-10-03 12:46:03 -04:00
mark_story
f21161ef46
Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
...
differences upon merging.
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/libs/cache/file.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/i18n.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
mark_story
e91fa68f8e
Making the set() functions use + instead of array_merge() so that numeric indices are properly preserved across multiple method calls. Fixes #1105
2010-09-18 00:13:03 -04:00
mark_story
929bb5769e
Merge branch '1.3' into 2.0
...
Conflicts:
app/webroot/index.php
cake/console/templates/skel/webroot/index.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/controller/scaffold.php
cake/libs/model/datasources/dbo/dbo_oracle.php
cake/libs/model/model_behavior.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/acl.test.php
cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
mark_story
8d8fce4429
Fixing template task path replacements under windows. Fixes #771
2010-05-31 21:26:55 -04:00
predominant
6a18b2bc1d
Merge remote branch 'origin/1.3' into 2.0
...
Conflicts:
cake/basics.php
cake/console/libs/shell.php
cake/console/libs/tasks/controller.php
cake/libs/controller/components/request_handler.php
cake/libs/model/model.php
cake/libs/model/model_behavior.php
cake/libs/overloadable.php
cake/libs/overloadable_php4.php
cake/libs/overloadable_php5.php
cake/libs/sanitize.php
cake/libs/validation.php
cake/libs/view/helpers/ajax.php
cake/libs/view/helpers/javascript.php
cake/libs/view/pages/home.ctp
cake/tests/cases/console/libs/tasks/controller.test.php
cake/tests/cases/libs/overloadable.test.php
cake/tests/cases/libs/validation.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
cake/tests/test_app/libs/cache/test_app_cache.php
cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
mark_story
cd5aee1bfa
Applying patch from 'franiglesias'. Fixes issues where str_replace would greedily replace too many occurences of 'libs/'. Fixes #724
2010-05-16 23:50:17 -04:00
predominant
8f880731c6
Removing closing PHP tags.
2010-05-11 08:27:28 +10:00
predominant
1ec220dac2
Removing closing PHP tags.
2010-05-11 08:07:49 +10:00
Mark Story
02c56ba8c1
Updating visibility in the various bake tasks.
2010-04-23 21:57:59 -04:00
predominant
1e425907b2
Change Cake Console files to new use of shortcut for translations.
2010-04-16 01:43:39 +10:00
predominant
850ca02bb6
Changed all public 'var' declarations to be 'public $var'
2010-04-04 17:14:00 +10:00
Mark Story
cdd87849cc
Fixing @link tags to ease merging.
2010-01-26 17:03:03 -05:00
predominant
0977b3fe15
Standardising docblock endings throughout.
2009-11-14 23:19:25 +11:00
mark_story
8ae8a086dd
Fixing template path detection for plugins.
2009-07-28 22:14:33 -04:00
AD7six
5a5a4d86f5
Preventing a missing template from halting the bake console
...
Restructuring the view task to be lest nested
allowing anything_add and anything_edit to map to anything_form
2009-07-28 23:49:04 +02:00
AD7six
c629d2c820
allow overriding the default templates
...
Allow templates to be distributed as plugins
Prevent any folder named skel or something_skel, or not containing any of the folders
that bake is expecting, from being considered a theme.
2009-07-28 09:02:29 +02:00
mark_story
b4f4aeeec7
Moving shell templates dirs.
...
Updating TemplateTask to reflect changes in directories.
Updating test cases to use App::build()/App::path()
2009-07-26 01:29:08 -04:00
AD7six
b2142df2bc
adding a newline before all comment blocks
2009-07-24 21:18:37 +02:00
mark_story
ad3e5f43e0
Removing newlines in files.
...
Adding and update bake.test to bake group test.
Fixing doc blocks.
2009-07-16 23:55:41 -04:00
mark_story
dc98184086
Updating Shell and Bake tasks to use App::path() instead of Configure::read().
2009-07-06 23:11:57 -04:00
mark_story
1a7965fde0
Adding output to getThemePath()
...
Adding param setting to getThemePath() as well so template choice is saved between file generations in the same session. Test cases added.
2009-07-01 23:49:50 -04:00
mark_story
544188197d
Fixing use of TemplateTask in other Tasks. Updating bake.group.
2009-07-01 00:50:38 -04:00
mark_story
ad98139e35
Moving bake templates into templates/default.
...
Adding 'console template themes' to TemplateTask.
Adding test cases for console themes.
Moving files around.
2009-07-01 00:24:20 -04:00
mark_story
a7f0071c61
Forcing templatePaths to exist.
2009-05-13 23:35:41 -04:00
mark_story
15fb1a711a
Updating TemplateTask adding test case and test object file.
2009-05-12 22:00:30 -04:00
mark_story
dff90e892e
Adding Template Task, removing CodeGenerator.
2009-05-12 21:19:15 -04:00
