José Lorenzo Rodríguez
|
c559b9c22d
|
Merge remote branch 'origin/2.0' into 2.0
Conflicts:
cake/console/templates/skel/config/database.php.default
cake/libs/model/datasources/dbo/dbo_sqlite.php
|
2010-12-05 20:51:37 -04:30 |
|
mark_story
|
af768c0b6f
|
Removing non-existant databases from comments.
|
2010-12-04 15:04:21 -05:00 |
|
José Lorenzo Rodríguez
|
7c4ab886e6
|
Merge remote branch 'origin/2.0' into feature/2.0/pdo
|
2010-12-03 14:08:03 -04:30 |
|
mark_story
|
7bfdbff377
|
Adding more documentation to core.php.
|
2010-11-27 19:39:55 -05:00 |
|
mark_story
|
f08fa52a60
|
Syncing skel/config/core.php
|
2010-11-27 14:36:34 -05:00 |
|
José Lorenzo Rodríguez
|
f2b707ac0b
|
Merge remote branch 'origin/2.0' into feature/2.0/pdo
Conflicts:
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
|
2010-11-16 21:54:42 -04:30 |
|
mark_story
|
b91566d35f
|
Removing ini_set() in project root.
Fixing notice errors that would happen when mod_rewrite wasn't enabled.
|
2010-11-14 14:45:09 -05:00 |
|
mark_story
|
8e29595b63
|
Updating test.php to bootstrap like index.php
Updating skel file to match app one.
|
2010-11-14 12:50:28 -05:00 |
|
José Lorenzo Rodríguez
|
eedd823fd8
|
Merge remote branch 'origin/2.0' into feature/2.0/pdo
|
2010-11-03 00:23:18 -04:30 |
|
mark_story
|
bff711e2dc
|
Merge branch '2.0-console' into 2.0
Conflicts:
cake/console/shells/acl.php
cake/tests/cases/console/libs/tasks/plugin.test.php
|
2010-11-02 23:49:19 -04:00 |
|
Mark Story
|
08e7bcb7ab
|
Merge branch '1.3' into integration
Conflicts:
app/config/core.php
cake/console/libs/acl.php
cake/console/templates/skel/config/core.php
cake/console/templates/skel/webroot/test.php
cake/dispatcher.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/log/file_log.test.php
cake/tests/cases/libs/model/cake_schema.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/lib/reporter/cake_cli_reporter.php
|
2010-10-31 21:56:59 -04:00 |
|
Juan Basso
|
5674ac4cf8
|
Added the require to dispatcher in skel to cake bake.
|
2010-10-30 01:29:26 -02:00 |
|
mark_story
|
18bffe8600
|
Applying doc block changes from 'teknoid'. Fixes #1239
|
2010-10-29 00:15:48 -04:00 |
|
Graham Weldon
|
d3e0ddbb0e
|
Update copyright years.
|
2010-10-25 07:58:22 +11:00 |
|
Victor Castell
|
141b05e588
|
Updated copyright years in skel aplication template
|
2010-10-25 07:57:15 +11:00 |
|
mark_story
|
9ebd015739
|
Adding omitted return statements.
|
2010-10-17 22:43:06 -04:00 |
|
mark_story
|
561067e797
|
Making the skel tmp dirs world writable.
|
2010-10-17 22:36:59 -04:00 |
|
mark_story
|
53a1663b96
|
Adding console dir to skel.
Updating project task to test for directories and files in a more readable way.
|
2010-10-17 19:01:44 -04:00 |
|
José Lorenzo Rodríguez
|
cbdfb3f76e
|
Removing all references to mysqli
|
2010-10-17 11:49:17 -04:30 |
|
mark_story
|
f847080cbf
|
Changing more php version strings.
|
2010-10-03 12:46:03 -04:00 |
|
mark_story
|
9e4c890082
|
Updating the schema command in the core.php files to reflect the correct command needed for 1.3. Fixes #1031
|
2010-09-23 23:12:20 -04:00 |
|
Mark Story
|
b491414a51
|
Changing gif to png, so baked apps have the correct icon. Fixes #1081
|
2010-09-06 01:39:39 -04:00 |
|
Mark Story
|
2e46d2f5ca
|
Changing gif to png, so baked apps have the correct icon. Fixes #1081
|
2010-09-06 01:38:31 -04:00 |
|
mark_story
|
4622ec44c2
|
Updating the skel and app test.php's to not make a global variable for the dispatcher. This dramatically improves the performance of the web test runner.
|
2010-08-16 23:33:07 -04:00 |
|
mark_story
|
f5bf4c5552
|
Changing config value name to more accurately represent what it does.
|
2010-07-27 22:27:43 -04:00 |
|
mark_story
|
5673ceb816
|
Updating core.php files with new session configuration.
|
2010-07-27 22:27:42 -04:00 |
|
mark_story
|
2020675078
|
Merge branch '1.3' into 2.0
Conflicts:
cake/dispatcher.php
cake/tests/cases/libs/controller/components/request_handler.test.php
|
2010-06-30 22:47:27 -04:00 |
|
mark_story
|
35d232f08f
|
Updating documentation in app/core.php to match historical values.
Updating skel/core.php to reflect current core.php.
|
2010-06-27 12:50: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 |
|
predominant
|
8decc683ac
|
Numerous 'shoer description' documentation entries updated to contain useful comments.
|
2010-05-30 01:20:28 +10:00 |
|
predominant
|
f06f0dae8b
|
Numerous "Enter description here" block comments updated to have meaningful descriptions.
|
2010-05-30 01:10:48 +10:00 |
|
mark_story
|
78653347b2
|
Removing request time output from index.php. Makes non sgml requests like json easier to do. Fixes #720
|
2010-05-20 23:13:45 -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 |
|
Juan Basso
|
a94b9ee95b
|
Update various links. Closes #392
|
2010-05-18 22:15:13 -03: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
|
adf604a966
|
Merge branch '1.3' into 2.0
Conflicts:
cake/console/templates/default/actions/controller_actions.ctp
cake/console/templates/default/views/form.ctp
cake/console/templates/default/views/index.ctp
cake/console/templates/default/views/view.ctp
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/view/pages/home.ctp
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/model/cake_schema.test.php
|
2010-05-02 17:53:42 -04:00 |
|
Mark Story
|
afa0e6b8f9
|
Adding cake.icon.png to the skel dir. Fixes the wrong asset being included when new projects are generated. Fixes. #637
|
2010-04-27 23:19:55 -04:00 |
|
predominant
|
015872445b
|
Merge remote branch 'origin/1.3' into 2.0
Conflicts:
cake/console/libs/acl.php
cake/tests/cases/libs/view/helpers/form.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
|
2010-04-23 12:52:56 +10:00 |
|
Mark Story
|
120fdd9045
|
Removing other uses of Routing.admin as it has been removed from Router.
|
2010-04-20 23:43:51 -04:00 |
|
Mark Story
|
9053291fe4
|
Fixing incorrectly named variable. Refs #567
|
2010-04-20 22:18:17 -04:00 |
|
Mark Story
|
2f0255ec1a
|
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
|
2010-04-18 22:19:57 -04:00 |
|
Juan Basso
|
4654c85937
|
Fixing name of cake icon on skel. Fixes #600
Signed-off-by: Mark Story <mark@mark-story.com>
|
2010-04-18 22:19:17 -04:00 |
|
predominant
|
a121e0b628
|
Fix missing quotation mark.
|
2010-04-19 12:08:04 +10:00 |
|
ADmad
|
9495aa2348
|
Fixing incorrect function name in comments in bootstap.php of console's template 'skel'. Closes #593
|
2010-04-18 00:12:34 +05:30 |
|
predominant
|
92215e1795
|
Merge remote branch 'origin/1.3' into 2.0
Conflicts:
cake/libs/inflector.php
cake/libs/view/helpers/text.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/view/helpers/time.test.php
|
2010-04-16 23:43:28 +10:00 |
|
predominant
|
c7fcaf995f
|
Convert getMictime() php4 hack to microtime(true)
|
2010-04-16 02:58:28 +10:00 |
|
predominant
|
1e425907b2
|
Change Cake Console files to new use of shortcut for translations.
|
2010-04-16 01:43:39 +10:00 |
|
Mark Story
|
540157bbfd
|
Fixing title_for_layout not being set in apps made with bake. Fixes #567
|
2010-04-11 11:18:13 -04:00 |
|
predominant
|
850ca02bb6
|
Changed all public 'var' declarations to be 'public $var'
|
2010-04-04 17:14:00 +10:00 |
|