Commit graph

41 commits

Author SHA1 Message Date
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
51e471427a Updating doc blocks to improve parsing in the API. 2009-10-05 21:01:31 -04:00
gwoo
38221e7aa2 Merge branch '1.2' into 1.3 2009-08-01 23:47:28 -07:00
renan.saddam
76e50ef625 Adding support for Model.* syntax, which translates to a list of fields from Model.
Fixing buildColumn for null values.
Fixing small containable merge, it was duplicating values, tests added.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8265 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-31 02:08:20 +00:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
mark_story
4b00c29eef Updating doc blocks to improve readability in API.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8015 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-04 05:00:59 +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
1b456f2cf1 Applying patch from 'davidpersson' fixing code spacing. Closes #5643
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
mark_story
62168bfe0f Updating doc blocks to include access and return PHPDOC tags.
Removing use of e() in Debugger.
Fixing code formatting in CookieComponent
Closes #5477

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7662 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-25 16:49:56 +00:00
gwoo
995040a98a fixes #5239, primary key for HABTM, reverts last change for #5233 which broke the tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7454 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-11 16:18:19 +00:00
gwoo
8cb73ead3c fixes #5233, uppercase fields in containable
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7452 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-11 15:11:06 +00:00
mariano.iglesias
eb02ec4ca9 Fixing issue on Containable when multiple unbindings take place on the same model, fixes #5096. Fixing notices on unmergable results on DboSource.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7424 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-02 21:56:55 +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
mariano.iglesias
6eb4aba543 Changing test for Containable to reflect #4790
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7246 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-23 06:33:31 +00:00
gwoo
ca38b035b5 fixes #4790, restoring associations in Containable. Thanks to maular for the patch
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7245 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-23 04:41:15 +00:00
phpnut
6807d4c333 Starting initial refactoring of current code base.
Made changes to test suite to allow running test without headers already sent errors.
Moved Component::initialize(), Controller::beforeFilter(); and Component::startup(); from Dipatcher::start() to Controller::constructClasses();
Removed Dispatcher::start();
Fixing model instances not being created
Adding additional test to CookieComponent to increase coverage to 95%
Optimizing Set::diff();
Fixing SessionComponent test and RequestHandlerComponent test
Fixing CakeSession tests, removed deprecated code from CakeSession

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7162 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-10 22:38:05 +00:00
mariano.iglesias
2d2096d9f7 Fixing issue where Containable was not resetting the original bindings properly when reset was false under some circumstances, fixes #4812
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7104 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-03 14:12:38 +00:00
mariano.iglesias
6dff6e30f7 Removing debug statement
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7091 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-02 18:06:47 +00:00
mariano.iglesias
04b8270fb6 Adding tests to show use of bindModel with reset false and pagination in Containable, closes #4812
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7090 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-02 18:05:45 +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
mariano.iglesias
9c722b6999 Improving field detection in Containable. paginate() now avoids sending recursive to find calls when it is not explicitly set. Adding more tests to Containable to show how to paginate, fixes #4746
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7030 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-23 16:12:14 +00:00
mariano.iglesias
ea94b57ec1 Properly setting non-array option overrides, fixes #4732
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7008 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-22 14:22:12 +00:00
mariano.iglesias
340496079f Removing countReset option from Containable as pagination support will be handled from paginate
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7006 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-22 13:43:23 +00:00
mariano.iglesias
61415e2449 Allowing children when Model(field1, field2, ...) is used as key, fixes #4690
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6989 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-20 15:21:38 +00:00
the_undefined
aa00e47fe8 Added countReset option that defaults to false, fixes #4694
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6979 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-20 01:01:11 +00:00
the_undefined
1224845967 Found the bug and fixed it, closes #4693
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6977 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-20 00:50:06 +00:00
phpnut
47d3a8123b "Fixing translation"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6966 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 16:55:45 +00:00
mariano.iglesias
1448d95478 Allowing spaces as part of the inner field declaration, fixes #4690
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6964 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 12:04:41 +00:00
mariano.iglesias
775707838e Fixing docbloc in Containable, fixing issue where no notices and invalid bindings were throwing PHP warnings, added tests, fixes #4683
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6938 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 02:40:13 +00:00
mariano.iglesias
a33cfd0b98 Added Containable behavior, a mix of the original Containable and Bindable behavior.
Allows find operations to define restrictions on what models to get based on the 'contain' parameter, including ability to override binding settings on the fly. Go through the test cases to get a crash course about some of the available functionality.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6918 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-18 04:36:09 +00:00