Commit graph

71 commits

Author SHA1 Message Date
predominant
13ffd76178 Removing "Long description for file" from /cake/libs tree. 2009-12-08 20:19:02 +11: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
Juan Basso
df9e1e0bd1 Replace function join (alias) by implode.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05: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
d1f5acd0e0 Merge commit 'origin/1.2' into 1.2-merge-in
Conflicts:
	cake/console/libs/shell.php
	cake/libs/model/connection_manager.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/groups/database.group.php
2009-10-14 00:51:55 -04:00
mark_story
34deb2a18d Correcting omission of group in DboOracle. Fixes #98 2009-09-23 23:16:57 -04:00
mark_story
326424592d Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/libs/inflector.php
	cake/libs/view/view.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
jperras
e9cfb66424 Fixing calling of method from incorrect object in DboOracle::describe(). Fixes #21. 2009-08-23 17:52:40 -04:00
AD7six
a4bc755cc7 whitespace normalization 2009-08-02 16:10:24 -07:00
gwoo
15ed658a27 Revert "Merge branch '1.3-newlines' into 1.3"
This reverts commit c088131cd8e9f53396852e8a320e2b0396807d20, reversing
changes made to 9341a2bb5eda1db208019aa8a9171224fb76fc6b.
2009-08-02 15:59:54 -07:00
gwoo
d118c6a764 Merge branch '1.3-newlines' into 1.3 2009-08-02 12:08:55 -07:00
gwoo
38221e7aa2 Merge branch '1.2' into 1.3 2009-08-01 23:47:28 -07:00
jperras
5172035e02 Adding table prefix detection for sequence maps in DboOracle::describe(). Fixes #6527.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8268 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-01 19:40:52 +00:00
AD7six
fd0aaefb39 whitespace normalization 2009-07-26 12:46:07 +02:00
gwoo
766e12bc2a Merge branch '1.3' into 1.3-newlines 2009-07-25 10:41:40 -07:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
mark_story
93d64c4e76 Removing use of e() from core classes. Refs #6525
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8250 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-23 13:35:14 +00:00
gwoo
9ab6339392 fixes #6240, DboOracle: fix cache sources and php version compatibility
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8154 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-25 01:06:46 +00:00
phishy
afe9970157 Fixes #5939
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7965 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-29 21:37:01 +00:00
phishy
caa063590d Fixed #5800. Fixed INSERTs broken by refactoring of DboSource::renderStatement()
Also added slightly more support for CakeSchema with DboOracle


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7912 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-10 01:30:36 +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
phishy
091325bcd1 Fixes #5539 - $config prototype was not being set correctly
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7709 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-07 00:55:51 +00:00
TommyO
b6e9888753 Replaced all instances of ife() in /cake
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7387 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-30 20:34:01 +00:00
phishy
9cf8a77e88 added fetchResult() wrapper
fixed queryAssociation(), it was producing invalid queries


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7350 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-22 12:20:18 +00:00
phishy
c60b232ab4 fixed quoting bug in name()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7259 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-24 21:11:23 +00:00
gwoo
f2fd386217 fixes #4892 different users on oracle, fixes #4894 escaping field
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7258 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-24 20:30:51 +00:00
nate
df75a06756 Fixing coding standards violations in core, and adding misc tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7222 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 20:17:23 +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
DarkAngelBGE
a625537c4e optimization, refs #3877, fixes #3415
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6969 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 20:31:42 +00:00
phishy
6c44d00642 Fixed #4206 - lastError now works
Fixed #4181 - model sequence name now respected
added constraint() method to enable/disable
added truncate() to aid in test suite integration
hacked name() to work with ACL


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6903 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-16 15:42:13 +00:00
nate
42083e0a1b Refactoring insertMulti() for DboSource and drivers, updating Model test for non-transactional db's
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6707 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-21 12:31:28 +00:00
phpnut
acc79fe0f3 "Closes #2508, Allow requestAction to use array urls
Fixes #4325, error pages no longer displayed since changeset
Closes #4329, remove am() usage in core"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6563 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-12 21:19:31 +00:00
phishy
18b30e11b4 fixed bug in quoting of acl schema identifiers
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6505 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-03 18:34:15 +00:00
phishy
5c9c5dbb47 removed duplicate baseConfig
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6468 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-20 20:02:18 +00:00
nate
7248048d85 Adding default configuration to Oracle driver
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6448 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-11 01:13:13 +00:00
phishy
cd8da1bd18 removed conect config parameter in favor of auto-persistant connection
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6446 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-07 15:46:05 +00:00
phishy
97cae1c208 added support for introspecting oracle schema
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6417 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-29 14:25:48 +00:00
phishy
9ddbd992e9 chunked query generation for more than 1000 IN arguments
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6416 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-29 02:38:54 +00:00