Commit graph

137 commits

Author SHA1 Message Date
mark_story
daffe3adb2 Making baked code throw 404 errors when you try to edit, delete, or view records that do not exist. Updated tests. 2010-12-12 12:37:02 -05:00
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
ad80609841 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-12-04 23:55:49 -05:00
Juan Basso
c52d5320c8 Replaced the *printf with i18n aliases by i18n aliases with params. 2010-12-04 23:37:13 -02:00
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
mark_story
18bb5f6b8b Removing =& operators for construction of objects. 2010-11-12 23:05:44 -05:00
José Lorenzo Rodríguez
f93a759220 Merge remote branch 'origin/2.0' into feature/2.0/pdo 2010-11-08 21:30:38 -04:30
mark_story
af303f01c7 Fixing baked actions to use request object.
Fixes #1091
2010-11-07 01:08:58 -04: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
Juan Basso
b0a600f925 Merge branch '2.0-post-method' into 2.0 2010-11-03 01:42:06 -02: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
e380b76e16 Created an exception to error 405 (Method Not Allowed) and changed the delete action in bake to use it. 2010-10-30 23:13:54 -02:00
Juan Basso
a040c9a218 Changed the cake bake to use postLink for delete actions. 2010-10-30 21:58:42 -02: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
José Lorenzo Rodríguez
34813ab35c Merge remote branch 'origin/2.0' into feature/2.0/pdo 2010-10-24 19:55:02 -04:30
mark_story
c6c3295c5c Making default bake templates escape HTML. Fixes #1186 2010-10-24 19:34:57 -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
999a878d68 Removing closing ?> on bake templates so they match the rest of CakePHP. 2010-07-01 18:19:37 -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
6d092552e5 Updating bake templates and Scaffold to use less sprintf() and more complete sentences in i18n strings. This should make translations easier to do in a gender correct way. Fixes #210 2010-04-28 23:56:07 -04:00