Commit graph

1302 commits

Author SHA1 Message Date
mark_story
6b5c247162 Merge commit 'origin/1.2' into mergers
Conflicts:
	cake/bootstrap.php
	cake/console/cake.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
2009-11-08 22:21:21 -05:00
mark_story
7981b44db4 Merge branch '1.3-misc' into mergers 2009-11-08 21:39:55 -05:00
mark_story
30dc0cfe56 Removing unused $view property from CacheHelper.
Fixes #272
2009-11-07 10:44:14 -05:00
mark_story
4a08bd120d Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-07 10:41:12 -05:00
mark_story
4704a8cd00 Removing unused $view property from CacheHelper.
Fixes #272
2009-11-07 10:40:48 -05:00
ADmad
002a01a9d8 passedArgs from current request are auto merged with url options of paginator helper
Signed-off-by: Florian Krämer <florian.kraemer@cakedc.com>
2009-11-06 18:31:42 +01:00
mark_story
4deaf27cc0 Removing deprecated code in Html::css()
Minor refactoring in HtmlHelper methods.
Fixes #268
2009-11-06 09:31:57 -05:00
mark_story
ab76cb1217 Merge branch '1.3' into 1.3-misc 2009-11-06 09:25:11 -05:00
predominant
62810fb4f4 Updating more Copyright dates. 2009-11-06 18:04:38 +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
mark_story
e776cf1ad2 Adding tests and fixing inline parameter being converted to an attribute.
Fixes #265
2009-11-05 23:32:39 -05:00
predominant
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11:00
predominant
490e76460f Changing quotes and adding spaces. Standarization cleanup. 2009-11-06 13:46:49 +11:00
predominant
2669b6179f Fix committed merge conflict for home page. 2009-11-05 14:30:56 +11:00
mark_story
380b49a446 Fixing Helper::value() and extraction of habtm data. Refs #256 2009-11-04 14:05:12 -05:00
mark_story
dc07a05fca Merge branch '1.3' into 1.3-misc 2009-11-04 09:20:21 -05:00
predominant
59c62426c9 Merge branch '1.3-misc' of code.cakephp.org:cakephp into 1.3-misc 2009-11-04 16:11:35 +11:00
predominant
cf42c8dd7f Updating default views and baking templates to use $this->Helper syntax for helpers. 2009-11-04 15:52:56 +11:00
mark_story
12c7203c71 Merge branch '1.3-alpha' into 1.3
Conflicts:
	cake/libs/view/pages/home.ctp
2009-11-03 23:19:01 -05:00
mark_story
1d22adbc1a Merge branch '1.3-misc' into 1.3 2009-11-03 22:50:11 -05:00
mark_story
0aecb9de2d Applying patch from 'dogmatic' to update home.ctp to use helper methods, and i18n. 2009-11-03 22:40:36 -05:00
mark_story
bc8d920c0f Updating changelog link on home.ctp 2009-11-03 19:53:59 -05:00
mark_story
d63218c0a0 Fixing error in previous commit. 2009-11-03 09:52:59 -05:00
mark_story
6b043c6c57 Updating doc blocks for paginator helper. 2009-11-02 21:37:20 -05:00
renan.saddam
91b9e1d50b Updating docblock for FormHelper::dateTime method. 2009-11-02 13:57:05 -02:00
renan.saddam
034b5c435c Allowing FormHelper::month() to use a $monthNames array as values. 2009-11-02 13:51:16 -02:00
ceeram
988ab2d29f fixes Ticket #6300
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-02 00:19:44 -05:00
mark_story
9d2628f699 Removing tab 2009-11-02 00:07:16 -05:00
mark_story
a87d31cc7f Fixing $cacheAction requiring the inclusion of the controller name for view cache files to be generated. This behavior makes the cache helper behave as documented.
Test cases added.  Fixes #232
2009-11-02 00:07:02 -05: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
44d7742b85 Minor refactoring and removal of duplicate test. 2009-10-31 16:28:43 -04:00
tPl0ch
2331cfde60 Added 'before' and 'after' options to FormHelper::submit(). Test cases updated.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-10-31 16:21:53 -04:00
mark_story
6726b76077 Refactoring input() to reduce number of method calls.
Applying patch from 'j3ffy' to allow user defined types to override magic select type.
Test case added.
Fixes #5109
2009-10-31 01:45:17 -04:00
mark_story
ade96b7ea5 Updating doc blocks. 2009-10-31 01:11:02 -04:00
mark_story
83caf50918 Fixing doc blocks and minor refactoring. 2009-10-31 01:04:33 -04:00
mark_story
9ed7a5cd55 Adding new options into doc blocks.
Removing todo as its implemented already.
2009-10-31 00:58:21 -04:00
mark_story
ac302bb6c2 Minor refactoring.
Adding tests for form->create() with file type forms.
2009-10-31 00:08:49 -04:00
José Lorenzo Rodríguez
adea104edb Allowing output disabling of hidden fields in checkbox and radio input types. closes #6185
Signed-off-by: Mark Story <mark@mark-story.com>
2009-10-30 22:47:31 -04:00
José Lorenzo Rodríguez
1c47b2182e Adding form encoding default in form create options. Default is always taken from Configure::read('App.encoding'). closes #6042 2009-10-30 22:35:21 -04:00
José Lorenzo Rodríguez
dfc1014fba Making current action be the default for new forms. Updating test accordingly. closes #5353
Signed-off-by: Mark Story <mark@mark-story.com>
2009-10-30 22:29:49 -04:00
renan.saddam
84a10904fb Fixing typo on variable name. 2009-10-30 18:42:04 -02:00