Commit graph

282 commits

Author SHA1 Message Date
predominant
8c3a5ab27f Removing "Long description for file" from app/ tree. 2009-12-08 20:16:16 +11:00
mark_story
7259a1b920 Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/helpers/text.php
	cake/libs/view/theme.php
2009-12-06 21:43:53 -05:00
mark_story
d758dbc343 Updating cake.generic.css to let .altrow class to apply to dd and dt elements. Fixes #361 2009-11-24 19:57:20 -05:00
mark_story
4d37e75f18 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/controller/components/cookie.php
	cake/libs/debugger.php
	cake/libs/flay.php
	cake/libs/http_socket.php
	cake/libs/inflector.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
mark_story
5d25780b9b fixing typo. 2009-11-21 16:25:39 -05:00
mark_story
9dcac18b87 Adding commented Asset.timestamp block to core.php 2009-11-21 13:26:33 -05:00
mark_story
acd2c15690 Merge branch '1.3-misc' into 1.3-merger
Conflicts:
	cake/tests/cases/libs/configure.test.php
2009-11-15 20:09:12 -05:00
mark_story
e2c7cda5d5 Adding deleted empty file back in. 2009-11-15 20:07:02 -05:00
mark_story
ffbd6f5dc8 Removing duplicated section. 2009-11-13 10:26:57 -05:00
slunicko
2ea6047c80 Fixing deprecated Routing.admin usage in config/core.php 2009-11-12 05:03:57 +01:00
ceeram
db526ddfb7 Fixing docblock in bootstrap.php, adding missing quote.
refs #280

Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-10 09:24:56 -05:00
mark_story
2af5318e7a Moving import in ModelTask to fix issue running bake model all. 2009-11-09 23:54:59 -05:00
mark_story
ab76cb1217 Merge branch '1.3' into 1.3-misc 2009-11-06 09:25:11 -05:00
predominant
384bb7a0e0 Update license lines throughout. 2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed Fixing links throughout 2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8 Removing excess whitespace 2009-11-06 17:08:23 +11:00
predominant
6782cb019c Update CakePHP Project link. 2009-11-06 17:00:11 +11:00
predominant
5dfe1777af Removing Subversion file headers. 2009-11-06 16:51:09 +11:00
predominant
ceee56013c Remove Subversion $Date$ lines. 2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe Remove Subversion $LastChangedBy$ lines. 2009-11-06 16:11:16 +11:00
predominant
42f3f16d60 Remove subversion $Revision$ lines. 2009-11-06 16:08:02 +11:00
predominant
1b9b0aae5e Updating Copyright date to include 2009. 2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11:00
burzum
f0d0959992 Refs #261 2009-11-06 00:08:56 +01:00
jperras
88023e065e Adding empty folder structure to app/views/elements for email/{html,text}. Implements #261. 2009-11-04 19:03:29 -05:00
mark_story
3eeb6eaad2 Removing duplicate block 2009-11-04 09:09:41 -05:00
mark_story
6f2ec8d8d2 Adding app/libs dir. app/libs is for storing 1st party libraries that are not technically vendor files, as they do not originate from vendor sources. 2009-10-28 09:16:09 -04:00
José Lorenzo Rodríguez
50ec80ff50 Continuing work on Helper::setEntity and associated methods 2009-10-22 00:17:14 -04:00
José Lorenzo Rodríguez
2941e89da3 Making Helper::viewEntity accept any number of levels 2009-10-22 00:16:37 -04:00
mark_story
552f698d4e Adding Routing.prefixes configuration value to core.php.
Deprecating Routing.admin
2009-09-27 00:18:24 -04:00
mark_story
943524b3a5 Adding empty files to directories that were previously omitted. 2009-09-20 18:03:42 -04:00
mark_story
caf780fdfb Correcting mistake from earlier. 2009-09-17 20:25:44 -04:00
mark_story
dc013dadb1 Updating file headers in test.php files. 2009-09-16 01:34:37 -04:00
mark_story
5717e3b59c Merge branch '1.2' into 1.2-merger
Conflicts:
	app/webroot/test.php
	cake/VERSION.txt
	cake/bootstrap.php
	cake/config/config.php
	cake/console/cake.php
	cake/console/libs/schema.php
	cake/console/templates/skel/webroot/test.php
	cake/libs/configure.php
	cake/tests/cases/console/libs/schema.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/fixtures/aco_fixture.php
2009-09-16 01:23:49 -04:00
mark_story
a499c980cd Removing webroot/js/vendors.php. These files are no longer needed as Dispatcher can handle serving js files from vendors directories. Adding empty files to empty directories. Refs #50 2009-09-13 23:32:27 -04:00
renan.saddam
2e8bbd5eb1 Adding docblock for the new variable used for logging. Making the CakeLog::handleError logs the same output as in Debugger::handleError. 2009-09-10 12:32:21 -03:00
mark_story
036bb620fa Removing error flags from test.php. 2009-09-07 16:13:25 -04:00
nate
b2d13fce40 Moving error flags to core bootstrap to avoid extra changes in user files, fixing error in previous commit. 2009-09-07 15:12:39 -04:00
nate
a5c00de3bd Applying PHP 5.3 compatibility patch from. Please update your config/core.php, webroot/index.php and webroot/test.php accordingly. 2009-09-07 14:25:22 -04:00
AD7six
9d1e556486 Revert "mend"
This reverts commit a0f42640cc10342f96effe4d08be188bb51bd0db.
2009-08-12 09:46:18 -04:00
AD7six
b53c7339c4 mend 2009-08-12 09:46:17 -04:00
gwoo
c7050c9879 Merge branch '1.3-inflector' into 1.3 2009-08-01 23:53:36 -07:00
davidpersson
1a1fef6030 Updating commented Inflector code in app bootstrap. 2009-08-02 03:14:10 +02:00
nate
7847044711 Moving error flags to core bootstrap to avoid extra changes in user files, fixing error in previous commit. 2009-08-01 08:36:57 -04:00
nate
e47b1960ad Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3 2009-07-31 11:54:01 -04:00
nate
729d8fddea Applying PHP 5.3 compatibility patch from Mark Story. Please update your config/core.php, webroot/index.php and webroot/test.php accordingly. 2009-07-31 11:48:30 -04:00
gwoo
fe569ecdf8 updating bootstrap comments 2009-07-25 15:17:27 -07:00
gwoo
f295a21831 updating some code related to Configure/App changes. Fixing issue when cache is not configured 2009-07-22 09:11:38 -07:00
gwoo
5a45c15d9d merging 1.3-session 2009-06-02 14:52:14 -07:00
gwoo
15518b8c9a merging 1.3-misc into master 2009-05-01 14:05:46 -07:00