Commit graph

41 commits

Author SHA1 Message Date
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
Juan Basso
1acc60b04c Replace function die (alias) by exit.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:38:11 -05:00
predominant
0977b3fe15 Standardising docblock endings throughout. 2009-11-14 23:19:25 +11:00
predominant
1185681549 Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11: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
mark_story
a3bb77c4f3 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/acl.php
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/db_config.php
	cake/console/libs/tasks/model.php
	cake/console/libs/templates/skel/views/layouts/xml/default.ctp
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/validation.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/basics.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	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/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/no_database.group.php
2009-11-01 12:11:49 -05:00
mark_story
072e1efc13 Adding Datasource::enabled()
Allows for checking a datasource's ability to be used before attempting to connect it.
Added enabled() to all the core dbo's.
Fixes whitescreen when trying to use a non installed database driver.
Fixes #131
2009-10-20 16:11:31 -04:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
TommyO
a601129d46 Brings odbc driver mostly up-to-date. Fixes #5730
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7921 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-14 18:36:40 +00:00
renan.saddam
6319f8ea69 Removed trailing whitespaces from core.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7847 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:54:07 +00:00
AD7six
3f2fa6929b changing tabs for spaces in comment block indentation
Removing address and replacing with cakefoundation url


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
mark_story
676459224c Adding patches from andy__ to dbo_odbc
Schema related functions will not work due to the way odbc works.
Closes #5398

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7646 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-23 02:59:05 +00:00
phpnut
1c2b1ef8eb Fixes #5008, DBO Source fails on >= query fixes failing tests added in [7302]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7319 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-05 12:56:56 +00:00
nate
42da5aba81 Moving Cake folder to correct location
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7063 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 11:40:08 +00:00
DarkAngelBGE
e6e0d852a2 deleting cake folder from svn
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7061 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 10:59:16 +00:00
phpnut
cb53dc61b0 "Closes #2897, Built-in file validation.
Implemented Validation::extension(); and Vaidation::range();
Updated copyright notices in all files"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6296 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-01 22:18:17 +00:00
mariano.iglesias
896f62544b Changing @return int to @return integer and @param bool to @param boolean
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5860 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:54:36 +00:00
phpnut
da97a5c871 Correcting @return bool
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5857 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:09:35 +00:00
mariano.iglesias
897825d596 Adding documentation to classes belonging to Cake console.
Standarizing on datatypes used in phpdocblocs and removing unneeded @return types

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5851 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 05:52:20 +00:00
gwoo
9d0502943a fix for odbc, closes #3145 and closes #3146. changes will be merged to 1.1 shortly
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5594 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-28 22:46:57 +00:00
dho
f2e5dcbbf9 Fixing syntax errors
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5572 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-23 05:43:12 +00:00
gwoo
8bb67d9f6a Adding Schema support, updated fixtures, deprecated loadInfo, changed Dbo::describe in all dbos, fixed tests,
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5563 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-21 21:46:59 +00:00
phpnut
23dfd90b29 Correcting code structure to standards
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5313 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-20 06:15:35 +00:00
phpnut
232b109bef Adding enhancement suggestion from #1565 to all Dbo classes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5166 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-24 05:33:55 +00:00
dho
076a5dbd63 Renaming $__transactionStarted to $_transactionStarted (ticket #2141)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4527 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-17 08:28:09 +00:00
phpnut
a8a91e35be Correcting all headers in the files
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4407 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-02 10:39:45 +00:00
phpnut
adae18da2d Corrected doc comments in dbo sources.
Renamed DBO_Pear to DboPear

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4042 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-01 02:34:56 +00:00
phpnut
3180035f0f Merged fixes for Ticket #1681
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3905 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-22 19:58:53 +00:00
nate
7506859555 Fixing DataSource path typo in ConnectionManager, and removing hardcoded paths to DboSource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3713 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-18 19:35:29 +00:00
phpnut
ead9f329e9 Adding fix for #1396.
Would not allow saving values with \ in the string

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3504 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-16 02:39:06 +00:00
nate
82ebd41fa6 Adding fix for Ticket #1088, additional refactorings, and code formatting fixes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3253 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-13 14:55:48 +00:00
phpnut
0801dce999 git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3092 3807eeeb-6ff5-0310-8944-8be069107fe0 2006-06-14 19:06:14 +00:00
Renamed from cake/libs/model/dbo/dbo_odbc.php (Browse further)