mark_story
21cd3f00ac
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/BasicsTest.php
2011-11-19 20:40:07 -05:00
mark_story
95b85118c7
Fix issue with button() and nested name attributes.
...
Buttons with nested name attributes were not properly unlocked
and caused SecurityComponent to black hole the request.
Fixes #2271
2011-11-19 11:43:09 -05:00
mark_story
f36c43bfe4
Add protected to method picked from 1.3
2011-11-19 11:37:37 -05:00
mark_story
c8ab4ad05b
Fix issue in TimeHelper with translated values.
...
LC_TIME files using unicode code points would incorrectly display.
Use either the Multibyte class or mbstring to correctly detect
and convert values.
Fixes #912
Conflicts:
lib/Cake/View/Helper/TimeHelper.php
2011-11-19 10:12:05 -05:00
Christian Hieke
7dfe72708f
Allow a boolean value for the disabled attribute in function radio.
2011-11-17 15:59:14 +01:00
ADmad
90b007ef75
Implemented priority based triggering of callbacks for objects in collection
2011-11-17 12:36:54 +05:30
Rachman Chavik
408e785d5e
Display datasource name in exceptions and error page.
...
When working with multiple databases, it's helpful to display
the datasource name that is requested by a given model.
2011-11-17 11:24:45 +07:00
mark_story
542e5c91de
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2011-11-15 23:11:07 -05:00
mark_story
fb7d931bef
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
2011-11-15 23:10:34 -05:00
Kyle Robinson Young
4e8239a2a5
Add missing @link to docs if available to helpers
2011-11-13 22:08:20 -08:00
Jose Lorenzo Rodriguez
de5a4ead25
Releasing 2.0.3
2011-11-13 20:32:23 -04:30
ADmad
87f12de1ab
Moving view for Pages controller from core to app which was missed in earlier commit. Also moving AppHelper.
2011-11-14 02:11:18 +05:30
mark_story
42f9f8e2c3
Fixing strict errors.
...
While this is a minor API change, its required to
make CakePHP pass E_STRICT in testing.
2011-11-12 21:42:20 -05:00
mark_story
92688e2a49
Fix keying in SessionHelper::flash()
...
It shouldb e looking for the plugin in the params key. This
makes SessionHelper compatible with SessionComponent.
2011-11-12 11:54:57 -05:00
mark_story
3ad50a2591
Fix session flash with plugins.
...
Fix using plugin elements for SessionHelper::flash()
Fixes #2246
2011-11-12 11:03:17 -05:00
mark_story
50b253565a
Adding more verbose info to connection errors.
...
The start page now shows the connection exception message.
Fixes #875
2011-11-11 23:04:54 -05:00
mark_story
254357e9c9
Merge branch '2.0' into 2.1
2011-11-11 22:38:11 -05:00
Kyle Robinson Young
7df3252d6b
Add missing @link to TimeHelper docblocks and correct @return
2011-11-11 10:51:14 -08:00
mark_story
7d756fda81
Fix Helper::field() for Model.min
...
This field would be treated as a field suffix even though
it is not. Expand existing tests, and reformat some code.
Fixes #2240
2011-11-10 22:22:11 -05:00
Mark Story
946753acde
Merge pull request #306 from shama/patch-2
...
Fix incorrect toQuarter docblock return tag
2011-11-07 06:18:44 -08:00
Renan Gonçalves
f09904ca91
Merge branch 'patch-time-gmt' of https://github.com/shama/cakephp into shama-patch-time-gmt
2011-11-07 10:44:28 +01:00
Kyle Robinson Young
72502e8fec
Remove extra fromString in TimeHelper::gmt and update docblock
2011-11-06 22:54:52 -08:00
Kyle Robinson Young
09300433f5
Fix incorrect toQuarter docblock return tag
2011-11-06 22:26:58 -08:00
mark_story
0304bb8796
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
2011-11-03 22:04:00 -04:00
Jose Lorenzo Rodriguez
606c30b77f
Releasing 2.0.2
2011-11-02 23:44:50 -04:30
mark_story
6623b7dc9d
Update generated cache files.
...
- Cache files should contain a response object on the controller.
Without it bad things happen.
- Include the $request and $response contructor arguments for Controller.
- Update import -> uses()
Refs #2190
2011-10-31 22:27:43 -04:00
Jose Lorenzo Rodriguez
7141dff5d1
Releasing 2.0.1
2011-10-30 18:28:32 -04:30
mark_story
bcdf61a9d5
Adding escaping by default for TextHelper::autoLink()
...
TextHelper::autoLink, autoLinkEmails, and autoLinkUrls now all
escape HTML by default, this can be disabled using the escape => false option.
Fixes #1625
2011-10-29 12:08:43 -04:00
mark_story
ce9bb6b632
Fix validation detection in FormHelper
...
string values for validation means a single validation method.
That implies the field is required.
Fixes #2181
2011-10-28 21:35:43 -04:00
Gun.io Whitespace Robot
4742168253
Remove whitespace [Gun.io WhitespaceBot]
2011-10-28 18:25:08 -04:00
mark_story
8529d76e6f
Removing Xml prolog from default xml layouts.
...
Both DOMDocument and SimpleXML output the prolog when
saving xml.
Fixes #2171
2011-10-27 20:58:03 -04:00
Daniel Luiz Pakuschewski
eb6c07f77e
Fixed: _passedArgs now is _passedVars
2011-10-27 10:16:38 -02:00
Daniel Luiz Pakuschewski
24bb6663ab
Fixed typo
2011-10-27 10:10:57 -02:00
mark_story
24fd87398d
Fix issue with 0.Model.field inputs.
...
These inputs would be incorrectly prefixed with another Model name.
2011-10-26 23:46:15 -04:00
mark_story
ad524b25ef
Merge branch '2.0' into 2.1
2011-10-25 22:29:03 -04:00
mark_story
c2c63d373c
Fix incorrect field detection for habtm fields.
...
Fields on habtm models would always be treated as multiselects.
Even when there were additional fields specified.
Fixes #2153
2011-10-25 22:21:27 -04:00
mark_story
7547d2c2d1
Update doc block concerning plugins.
...
Fixes #2146
2011-10-25 20:33:55 -04:00
mark_story
e80c548887
Update link on home page.
...
Fixes #2159
2011-10-25 12:36:13 -04:00
Majna
42042c2a76
Fixing incorrect theme view doc block.
2011-10-24 16:32:19 +02:00
mark_story
d6bf1479c8
Add documentation and test for FormHelper::select()
...
An alternate syntax was undocumented and untested. Fix that.
Refs #1794
2011-10-23 22:27:07 -04:00
mark_story
d6f7669f54
Merge branch '2.0' into 2.1
2011-10-23 21:07:09 -04:00
mark_story
d62351eb36
Revert the changes done to remove the 'cake' domain
...
After some discussion, polutting the app POT file
with unchanging Cake strings was incorrect. Having these
strings in a separate POT file allows reuse of translations across
projects.
Refs #2103
2011-10-23 20:36:31 -04:00
AD7six
53bc963315
Merge branch '2.0' into 2.1
2011-10-20 08:57:49 +02:00
mark_story
a7404e8e83
Remove more incorrect __d() calls.
2011-10-19 23:25:22 -04:00
mark_story
71a55f52f8
Fixing incorrect translation usage.
2011-10-19 23:21:43 -04:00
mark_story
25e9aaf6c8
Removing the remaining cake domain translations.
...
3rd time is a charm.
Fixes #2103
2011-10-19 23:09:21 -04:00
mark_story
7c70b371bf
Removing the rest of the 'cake' domain.
...
These string should all be part of the app POT files.
Fixes #2103
2011-10-19 22:55:50 -04:00
mark_story
183ffb29d7
Improving the exception stack traces.
...
Adding Debugger::getType()
2011-10-19 22:27:55 -04:00
Johannes N
30504ef32b
Enable Asset timestamp for image submit buttons.
...
Conflicts:
lib/Cake/View/Helper/FormHelper.php
2011-10-19 21:51:18 -04:00
mark_story
7f0f224c56
Fix missing preg_quote around highlight searches.
...
Highlight strings should be literal values not regexp fragments.
Fixes #2111
Conflicts:
cake/libs/view/helpers/text.php
cake/tests/cases/libs/view/helpers/text.test.php
2011-10-18 12:19:19 -04:00
Jose Lorenzo Rodriguez
abdddd1271
Releasing 2.0.0
2011-10-16 18:33:00 -04:30
mark_story
6ecbcccf25
Updating links to the book.
2011-10-16 09:36:51 -04:00
Renan Gonçalves
573a349209
Using plugin name on exception thrown and in templates files.
2011-10-16 13:40:36 +02:00
Renan Gonçalves
282d322523
Fixing @package tag in Cake/View files.
2011-10-15 20:17:44 +02:00
Renan Gonçalves
1cf67b1e55
Little cleanup in exceptions.
...
- Removed duplicated or non-used exceptions.
- Making the error messages more descriptive and stardard.
2011-10-15 20:08:02 +02:00
Florian Krämer
b6d7766e78
Updating the @link's in the doc blocks for the views
2011-10-15 12:46:22 -04:30
mark_story
6bf6d79979
Removing 'cake' domain from core.
...
This domain was supposed to be replaced by cake_dev.
There are a number of translations that should be App land as well.
Such as those in helpers.
Fixes #2103
2011-10-14 21:01:17 -04:00
Ceeram
981f40758c
Fixing incorrect theme paths for plugins, tests updated. Fixes #2099
2011-10-13 15:22:10 +02:00
Dave
db51c0539a
Fix TextHelper::autoLinkUrls() from linking iframes
...
iframe and img elements should not be autolinked.
Fixes #GH-208
2011-10-10 22:16:46 -04:00
Majna
a5220fa7bb
Fixed doc block comments.
2011-10-11 00:22:23 +02:00
ADmad
fa214e8716
Updating old usage Configure::read()
to new Configure::read('debug')
. Closes #2070
2011-10-06 17:02:15 +05:30
mark_story
d40bd240ac
Add missing echo in MissingHelperClass error page.
...
Fixes #2065
2011-10-05 17:51:19 -04:00
Jose Lorenzo Rodriguez
bab131b8fd
Releasing 2.0.0-RC3
2011-10-03 18:36:56 -04:30
mark_story
c9bd97309f
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/configure.php
cake/libs/controller/components/email.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/email.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ViewTask.php
lib/Cake/Model/Datasource/DboSource.php
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Utility/InflectorTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Utility/Inflector.php
lib/Cake/Utility/Validation.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper.php
lib/Cake/View/Helper/FormHelper.php
2011-10-01 22:38:20 -04:00
Majna
681207e327
Fixed doc block comments.
2011-09-28 22:33:46 +02:00
mark_story
08b974d64b
Adding the _x and _y fields to the unlocked fields
...
for image submits.
Fixes #2032
2011-09-27 21:14:36 -04:00
ADmad
2a554237f4
Improving error view. Closes #2027
2011-09-26 11:49:49 +05:30
mark_story
8272758eb9
Adding block to home page for PHP version.
...
Fixes #2010
2011-09-24 10:41:22 -04:00
Jose Lorenzo Rodriguez
b3157cdd71
Releasing 2.0.0-RC2
2011-09-18 16:54:14 -04:30
mark_story
6a4e7558fc
Merge branch '1.3' into merger
...
Conflicts:
cake/basics.php
cake/console/libs/tasks/extract.php
cake/libs/view/helpers/js.php
cake/tests/cases/console/libs/tasks/extract.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/test_app/views/pages/extract.ctp
lib/Cake/Cache/Engine/MemcacheEngine.php
lib/Cake/Model/Behavior/ContainableBehavior.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Model/Datasource/DboSource.php
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
lib/Cake/Test/Case/Model/CakeSchemaTest.php
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
2011-09-18 12:09:04 -04:00
mark_story
0e5797d69d
Make full page caching + Themes work.
...
Dispatcher now uses ThemeView for rendering cache files.
This enables nocache blocks to reference theme elements.
Fixes #1858
2011-09-17 13:19:43 -04:00
mark_story
85b86cb282
Fix entity names for associated model date fields.
...
Fixes #1993
2011-09-17 12:29:21 -04:00
mark_story
1743eaa776
Fix issue with HABTM fields
...
habtm fields were not being correctly being detected.
2011-09-08 22:18:44 -04:00
mark_story
d6b978c0e8
Moving declaration of $fieldset
...
Its used in base Helper methods, so that's where the property
should live as well.
2011-09-08 20:44:33 -04:00
mark_story
fa8bdfd0dd
Add fix and test for CamelBack input names.
...
Refs #1974
2011-09-08 20:34:41 -04:00
mark_story
6ab59a447c
Fix create() and onsubmit option.
...
Removing support for onSubmit variant. Additional
choices are not necessary. Fixing onsubmit option
not correctly working.
Fixes #1977
2011-09-07 20:59:04 -04:00
Mark Story
9587892727
Register AppHelper for autoloading
...
Fixes issues where people with no core helpers loaded would hit fatal
errors.
Fixes #1973
2011-09-07 16:46:59 -04:00
mark_story
a0d531cef2
Updating documentation with missing option.
2011-09-06 02:37:43 +01:00
mark_story
3d44489b0c
Deprecating the %page% style placeholders in PaginatorHelper.
...
Updating scaffold and bake templates to not use deprecated placeholders.
2011-09-06 02:37:43 +01:00
Jose Lorenzo Rodriguez
b2fac1b1e7
Releasing 2.0.0-RC1
2011-09-04 12:30:53 -04:30
Jose Lorenzo Rodriguez
3d0af8b690
Adding a new exception renderer method to show useful error for failed queries
2011-09-04 04:50:19 -04:30
Jose Lorenzo Rodriguez
36470f4a86
Removing $error property from DboSource, errors in queries will throw exceptions now
2011-09-03 12:17:00 -04:30
mark_story
1c40a37439
Removing dead links from the home.ctp
...
Updating CSS for changes in previous commit.
2011-09-03 10:06:01 +01:00
mark_story
8c75488979
More changes to the CSS, and updating the bake templates and scaffolds.
2011-09-03 10:06:01 +01:00
mark_story
ec9d29fca5
Removing the trailing ?> from the suggested error code text.
2011-09-03 10:06:00 +01:00
Juan Basso
689c7ffd45
Fixed some problems caused by the visibility changes.
2011-08-21 01:04:55 -04:00
Juan Basso
a1a049c700
Merge remote-tracking branch 'origin/2.0' into 2.0-api-doc
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/View/Helper/CacheHelper.php
2011-08-20 01:47:27 -04:00
Juan Basso
61833294f0
Changed the visibility to methods that not affect others classes.
2011-08-20 01:39:30 -04:00
Juan Basso
f5a54d00dd
Changed methods and attributes from private to protected.
2011-08-20 00:43:34 -04:00
Juan Basso
40654df5ab
Fixing more documentations.
2011-08-18 22:31:00 -04:00
Mark Story
46c07add3f
Fixing issues with HTML5 number inputs and float columns.
...
For float columns, the default step value is 'any'
Fixes #1907
2011-08-18 22:31:00 -04:00
Juan Basso
0575e92833
Added visibility in some methods and attributes.
2011-08-18 22:30:28 -04:00
Mark Story
0e21093268
Removing XmlHelper references in layouts.
...
Fixes #1916
2011-08-18 22:11:42 -04:00
Mark Story
54e1de9070
Adding visibility keywords to code that came from
...
a 1.3 merge.
2011-08-16 22:40:38 -04:00
Juan Basso
16ef234180
Removing trailing spaces.
2011-08-15 23:55:08 -04:00
Juan Basso
620a65b2fc
Merge branch '2.0' into 2.0-api-doc
...
Conflicts:
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00
mark_story
d93c8cb200
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/controller/components/security.php
cake/libs/view/pages/home.ctp
cake/libs/view/view.php
lib/Cake/Cache/Engine/FileEngine.php
lib/Cake/Config/config.php
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Utility/SanitizeTest.php
lib/Cake/Test/Case/Utility/SetTest.php
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/CacheHelper.php
2011-08-14 14:39:49 -04:00
ADmad
5d79299362
For paging links the 'class' attribute is now always applied to the wrapping tag for consistency. Closes #1759
2011-08-14 05:09:57 +05:30
Jose Lorenzo Rodriguez
9b6ea7dc45
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-08-11 13:17:19 -04:30
Jose Lorenzo Rodriguez
3d461724cf
Re-adding primaryKey detection support to FormHelper, it was removed mistakenly in last refactor
2011-08-11 12:13:01 -04:30
Mark Story
2ce2d06de2
Fixing issue where postLink() would fail when used with SecurityComponent.
2011-08-10 21:53:33 -04:00
Maggion Emmanuel
6cd89b0992
Edited lib/Cake/View/Helper/FormHelper.php via GitHub
2011-08-09 17:59:55 +03:00
Maggion Emmanuel
cb5f57f0ed
Adding support for url input
2011-08-09 17:02:00 +03:00
mark_story
a268eea24f
Expanding docs on HtmlHelper.
2011-08-07 18:17:14 -04:00
mark_story
5330096019
Fixing parameter name in RssHelper docs.
...
Fixes #1888
2011-08-07 09:14:16 -04:00
Mark Story
4da671c952
Merge pull request #157 from ProLoser/patch-2
...
Added `'integer' => 'number'` for HTML5
2011-08-01 18:07:40 -07:00
Juan Basso
895c10af7b
Adjusted some types in @param, @return and @var.
2011-07-31 22:57:17 -04:00
Juan Basso
d84531d29c
Using @property to autocomplete components and helpers in some IDEs. Also added @property to bake of controller and model. Fixes #103 .
2011-07-31 20:28:35 -04:00
Juan Basso
7604763888
Updated some file headers to include correct license and copyright.
2011-07-31 19:14:36 -04:00
Juan Basso
2a50a1ea99
Included @var in API that was missing.
2011-07-31 17:05:20 -04:00
Juan Basso
fedadc091c
Included @throws in API that was missing.
2011-07-31 16:55:52 -04:00
Juan Basso
9bc3e567c1
Removed the @access and @static.
2011-07-30 20:56:48 -04:00
Juan Basso
e4a1816557
Changed the signature of methods to avoid strict messages.
2011-07-30 19:17:20 -04:00
Juan Basso
552791d74b
Marked Helper::_parseAttributes() and Helper::_formatAttribute() as deprecated.
2011-07-28 23:33:33 -04:00
Juan Basso
02f290ac52
Fixed some API doc in views.
2011-07-28 22:45:47 -04:00
Dean Sofer
2ef17ec0a7
Additional tweak to FormHelper::input(), make float types use the number input
2011-07-27 15:15:31 -07:00
Jose Lorenzo Rodriguez
402934fa4d
Updating version numbers to 2.0.0-beta
2011-07-26 13:20:27 -04:30
Dean Sofer
333f36585b
Added 'integer' => 'number'
for HTML5
...
Located in $map in the `FormHelper::input()` method. This means that if a field input is related to an integer column in the database, it will show up as a number input in the HTML5 form (where supported) yet gracefully degrade.
2011-07-26 01:39:56 -07:00
Jose Lorenzo Rodriguez
cfd2d9e00b
Updating all @package annotations in doc blocks
2011-07-26 01:46:14 -04:30
Jose Lorenzo Rodriguez
2b7888ec47
Reverting change done by previous merge
2011-07-25 14:58:51 -04:30
Jose Lorenzo Rodriguez
febf28f34b
Merge remote-tracking branch 'origin/1.3' into 2.0
...
Conflicts:
cake/console/templates/default/views/home.ctp
cake/libs/controller/controller.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/view/media.test.php
cake/tests/lib/cake_test_case.php
cake/tests/lib/code_coverage_manager.php
cake/tests/test_app/views/pages/home.ctp
lib/Cake/Cache/Engine/ApcEngine.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/View/Helper/FormHelper.php
2011-07-25 14:44:23 -04:30
Juan Basso
a2e7c0febe
Optimization in FormHelper::postLink().
2011-07-18 20:33:45 -04:00
Jose Lorenzo Rodriguez
ad28228495
Removing unused parameters of tagIsInvalid()
2011-07-16 17:36:47 -04:30
Jose Lorenzo Rodriguez
d5ce09cd96
Restoring the validationErrors property in FormHelper, it will be checked first before the validation errors in the model
2011-07-15 18:24:27 -04:30
Jose Lorenzo Rodriguez
84aba009e7
Documentation and code cleaning, this commit means that the FormHelper is now fully able to locate models even though lazy loading is used in the controller, closes #1690
2011-07-14 20:35:44 -04:30
Jose Lorenzo Rodriguez
0c79ad88a3
Cleaning up the code and adding tests for new features
2011-07-14 17:26:55 -04:30
Jose Lorenzo Rodriguez
ba012ed950
Adding a special case for not trying to instantiate a Model called Model in FormHelper
2011-07-14 11:13:51 -04:30
Jose Lorenzo Rodriguez
ef5650c034
Fixing ClassRegistry that was incorrectly checking class inheritance
...
Fixing Model class that was incorrectly sending model names to be instantiated
Fixing more FormHelper tests
2011-07-14 01:30:52 -04:30
Jose Lorenzo Rodriguez
1941be6a76
Updating FormHelper tests
2011-07-14 01:03:29 -04:30
Jose Lorenzo Rodriguez
39dadf58db
Refactoring how model information is extracted in the FormHelper, it is done now in a lazy manner and hopefully using less memory
2011-07-13 23:49:50 -04:30
Jose Lorenzo Rodriguez
22f02373c9
Moving tagIsInvalid from Helper back to FormHelper, as it is a better home for it
2011-07-13 23:49:01 -04:30
José Lorenzo Rodríguez
af12a17b81
Fixing copy paste typos from previous commit
2011-07-07 09:59:02 -07:00
Jose Lorenzo Rodriguez
feb567d4ee
Adding better help and documentation for loading plugins. The exception renderer will serve a helpful page if a plugin is missing
2011-07-07 02:34:22 -04:30
mark_story
1d0d3f80fb
Fixing Helper::value() when models exist in ClassRegistry
...
and field values are empty.
Fixes #1817
2011-07-06 21:26:07 -04:00
mark_story
be09c67fa6
Fixing failing test that happened between 12:00 & 12:59
2011-07-02 13:01:08 -04:00
mark_story
c2a96267b2
Merge branch 'form-helper' into 2.0
2011-07-02 12:13:41 -04:00
Mark Story
2f24be77e9
Merge pull request #140 from majna/2.0
...
Fix for render element - allow under_scored plugin name.
Fixes #1814
2011-07-01 18:11:57 -07:00
Majna
71ed244f14
Fix for render element - allow under_scored plugin name. Fixes #1814
2011-07-02 02:17:44 +02:00
mark_story
bef2e75bdf
Fixing failing debugger test.
...
Adding doc blocks for helper properties.
2011-07-01 07:56:48 -04:00
mark_story
c9acb6b587
Moving FormHelper specifics into that class.
2011-07-01 07:39:03 -04:00
Mark Story
89258327c6
Moving entity() and its related attributes to Helper
...
Removing entity() and its attributes from View.
Having that information on View allowed for unwanted side effects,
and seemed like a break of encapsulation.
2011-06-25 20:02:34 -04:00
Mark Story
1ffa7366a5
Removing now dead code.
2011-06-25 19:31:20 -04:00
Mark Story
4073584eef
Fixing more failing tests.
...
Fixing use of properties that are going away.
2011-06-25 19:31:20 -04:00
Mark Story
f5b3549018
Fixing issue where _method would be remembered as a field.
2011-06-25 19:31:20 -04:00
Mark Story
25870441bc
Fixing '2.name' style fields when creating multiple record forms.
2011-06-25 19:31:20 -04:00
Mark Story
b7e554fcd7
Starting to update FormHelper's internals to work with changes in
...
Helper.
2011-06-25 19:31:19 -04:00
Mark Story
3a847ae28f
Updating more tests for change in Helper setEntity().
2011-06-25 19:31:19 -04:00
Mark Story
8a8336c1b0
Starting to convert Helper::setEntity() and View::entity()
...
to not be nearly as complex and magic. This also
helps reduce coupling between the helpers and Models.
2011-06-25 19:31:19 -04:00
Robert Sworder
fb3a1928d3
Minor comment and path changes.
2011-06-25 15:08:41 +01:00
Mark Story
d6e262da2d
Fixing form action attributes being double encoded with
...
querystring attributes.
Fixes #1748
2011-06-23 14:32:53 -07:00
Mark Story
3e4388d7d7
Fixing failures from merging.
2011-06-23 13:22:08 -07:00
Mark Story
91a1cf81f3
Merge branch '1.3' into merger
...
Conflicts:
app/Config/acl.ini.php
app/config/database.php.default
app/webroot/css.php
app/webroot/css/cake.generic.css
cake/basics.php
cake/bootstrap.php
cake/config/paths.php
cake/console/cake.php
cake/console/error.php
cake/console/libs/acl.php
cake/console/libs/bake.php
cake/console/libs/i18n.php
cake/console/libs/shell.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/plugin.php
cake/console/libs/tasks/project.php
cake/console/libs/testsuite.php
cake/console/templates/default/classes/test.ctp
cake/console/templates/default/views/home.ctp
cake/console/templates/default/views/view.ctp
cake/console/templates/skel/config/database.php.default
cake/console/templates/skel/views/elements/email/text/default.ctp
cake/console/templates/skel/webroot/css.php
cake/dispatcher.php
cake/libs/cache.php
cake/libs/cake_session.php
cake/libs/configure.php
cake/libs/controller/component.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/email.php
cake/libs/controller/components/request_handler.php
cake/libs/controller/components/security.php
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/error.php
cake/libs/magic_db.php
cake/libs/model/behaviors/acl.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/model/model_behavior.php
cake/libs/overloadable.php
cake/libs/overloadable_php4.php
cake/libs/overloadable_php5.php
cake/libs/router.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/errors/missing_behavior_class.ctp
cake/libs/view/errors/missing_behavior_file.ctp
cake/libs/view/errors/missing_component_class.ctp
cake/libs/view/errors/missing_component_file.ctp
cake/libs/view/errors/missing_connection.ctp
cake/libs/view/errors/missing_controller.ctp
cake/libs/view/errors/missing_helper_class.ctp
cake/libs/view/errors/missing_helper_file.ctp
cake/libs/view/errors/missing_layout.ctp
cake/libs/view/errors/missing_model.ctp
cake/libs/view/errors/missing_scaffolddb.ctp
cake/libs/view/errors/missing_table.ctp
cake/libs/view/errors/missing_view.ctp
cake/libs/view/errors/private_action.ctp
cake/libs/view/errors/scaffold_error.ctp
cake/libs/view/helpers/ajax.php
cake/libs/view/helpers/javascript.php
cake/libs/view/helpers/js.php
cake/libs/view/helpers/session.php
cake/libs/view/helpers/xml.php
cake/libs/view/media.php
cake/libs/view/pages/home.ctp
cake/libs/view/scaffolds/edit.ctp
cake/libs/view/scaffolds/index.ctp
cake/libs/view/scaffolds/view.ctp
cake/libs/view/view.php
cake/libs/xml.php
cake/tests/cases/console/cake.test.php
cake/tests/cases/console/libs/acl.test.php
cake/tests/cases/console/libs/api.test.php
cake/tests/cases/console/libs/bake.test.php
cake/tests/cases/console/libs/shell.test.php
cake/tests/cases/console/libs/tasks/controller.test.php
cake/tests/cases/console/libs/tasks/db_config.test.php
cake/tests/cases/console/libs/tasks/fixture.test.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/console/libs/tasks/plugin.test.php
cake/tests/cases/console/libs/tasks/project.test.php
cake/tests/cases/console/libs/tasks/test.test.php
cake/tests/cases/console/libs/tasks/view.test.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/cache/apc.test.php
cake/tests/cases/libs/cake_session.test.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/code_coverage_manager.test.php
cake/tests/cases/libs/configure.test.php
cake/tests/cases/libs/controller/component.test.php
cake/tests/cases/libs/controller/components/auth.test.php
cake/tests/cases/libs/controller/components/cookie.test.php
cake/tests/cases/libs/controller/components/request_handler.test.php
cake/tests/cases/libs/controller/components/session.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/controller/pages_controller.test.php
cake/tests/cases/libs/error.test.php
cake/tests/cases/libs/http_socket.test.php
cake/tests/cases/libs/magic_db.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.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/model/datasources/dbo_source.test.php
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/overloadable.test.php
cake/tests/cases/libs/test_manager.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
cake/tests/cases/libs/view/helpers/session.test.php
cake/tests/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/view/media.test.php
cake/tests/cases/libs/view/theme.test.php
cake/tests/cases/libs/xml.test.php
cake/tests/fixtures/aco_fixture.php
cake/tests/fixtures/translate_fixture.php
cake/tests/groups/acl.group.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/cache.group.php
cake/tests/groups/components.group.php
cake/tests/groups/configure.group.php
cake/tests/groups/console.group.php
cake/tests/groups/controller.group.php
cake/tests/groups/database.group.php
cake/tests/groups/helpers.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/groups/lib.group.php
cake/tests/groups/model.group.php
cake/tests/groups/no_cross_contamination.group.php
cake/tests/groups/routing_system.group.php
cake/tests/groups/socket.group.php
cake/tests/groups/test_suite.group.php
cake/tests/groups/view.group.php
cake/tests/groups/xml.group.php
cake/tests/lib/cake_test_case.php
cake/tests/lib/cake_test_model.php
cake/tests/lib/cake_test_suite_dispatcher.php
cake/tests/lib/cake_web_test_case.php
cake/tests/lib/code_coverage_manager.php
cake/tests/lib/reporter/cake_base_reporter.php
cake/tests/lib/reporter/cake_cli_reporter.php
cake/tests/lib/reporter/cake_text_reporter.php
cake/tests/lib/templates/menu.php
cake/tests/lib/templates/simpletest.php
cake/tests/lib/test_manager.php
cake/tests/test_app/controllers/tests_apps_controller.php
cake/tests/test_app/libs/cache/test_app_cache.php
cake/tests/test_app/libs/library.php
cake/tests/test_app/libs/log/test_app_log.php
cake/tests/test_app/plugins/test_plugin/config/load.php
cake/tests/test_app/plugins/test_plugin/config/more.load.php
cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
cake/tests/test_app/vendors/Test/MyTest.php
cake/tests/test_app/vendors/Test/hello.php
cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
cake/tests/test_app/vendors/shells/sample.php
cake/tests/test_app/vendors/somename/some.name.php
cake/tests/test_app/vendors/welcome.php
cake/tests/test_app/views/elements/email/text/default.ctp
cake/tests/test_app/views/layouts/default.ctp
cake/tests/test_app/views/posts/test_nocache_tags.ctp
lib/Cake/Cache/Engine/MemcacheEngine.php
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
lib/Cake/Console/Templates/skel/webroot/test.php
lib/Cake/Console/cake.bat
lib/Cake/Controller/Component/CookieComponent.php
lib/Cake/Log/CakeLog.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Test/Case/Log/Engine/FileLog.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Test/test_app/View/Emails/html/custom.ctp
lib/Cake/Test/test_app/View/Emails/text/custom.ctp
lib/Cake/TestSuite/templates/header.php
lib/Cake/Utility/Sanitize.php
lib/Cake/Utility/Validation.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
2011-06-23 12:48:06 -07:00
Mark Story
edda41e23b
Removing 'altclass' from scaffold templates.
...
Refs #306
2011-06-22 13:08:17 -07:00
Graham Weldon
3474837492
Fix error message for database configuration missing.
2011-06-21 11:42:35 -07:00
Juan Basso
1c7d54eacc
Updated the paths from comments.
2011-06-19 20:28:40 -04:00
Mark Story
b4a780332f
Add the 'model' key to PaginatorHelper::counter()
...
Its available as both '%model%' and '{:model}'
Fixes #1773
2011-06-19 14:05:28 -07:00
Renan Gonçalves
f4e598f920
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-06-15 21:01:17 +02:00
Renan Gonçalves
98f2684c66
Assigning the viewVars to $this too. It was empty before, the result was no variables.
2011-06-15 21:01:08 +02:00
mark_story
613410f985
Making submit() and button() create unlocked fields by default.
...
This fixes issues where buttons would cause post validation checks to
fail.
Fixes #1746
2011-06-14 22:37:02 -04:00
mark_story
f3f475f502
Updating method name, variables, and properties to be unlocked.
...
This better reflects what is actually going to happen, as fields that are
unlocked are not checked. It also works better with the idea that secure = false
means unlocked or unsecured.
2011-06-14 21:50:45 -04:00
mark_story
0c3c6e5e21
Adding a new hidden field for the disabled fields.
...
Updating the FormHelper tests for the new field.
2011-06-14 21:50:45 -04:00
mark_story
83184c99da
Adding disableField() to start allowing disabled fields to be manipulated
...
from the view/helper.
2011-06-14 21:50:45 -04:00
mark_story
2a15e630ef
Starting to refactor field securing, so disabledFields can be controlled
...
from the Helper.
2011-06-14 21:50:44 -04:00
Leonid Mamchenkov
01b2e7eea0
Removed unnecessary Inflector::camelize() calls
2011-06-15 00:36:14 +03:00
Leonid Mamchenkov
ffab73442a
Camelize file names in Errors
2011-06-15 00:27:44 +03:00
Leonid Mamchenkov
aeb510e521
Camelized controller file names in Errors
2011-06-15 00:14:38 +03:00
Leonid Mamchenkov
4c02fa75eb
Updated paths in all Errrors
2011-06-14 21:57:42 +03:00
Renan Gonçalves
2e3f828098
Updating the home.ctp file to include last changes made on directories name and i18n usage.
2011-06-12 23:24:42 +02:00
mark_story
71e2c8e734
Changing how 'id' attribute is treated for multiple checkboxes.
...
Setting the id option, will now also override the generated id's for
checkboxes.
Fixes #1691
2011-06-06 22:32:55 -04:00
ADmad
cb946bbcf3
Added warning message on homepage for misconfigured URL rewriting. Removed dead link for cakeforge.org
2011-06-05 03:34:28 +05:30
Neil Crookes
ea82261ad8
Removing call to RssHelper::header() as method does not exit
2011-05-31 22:50:47 +01:00
Juan Basso
192812ee7f
Updating the copyright to 2011.
2011-05-30 22:32:43 -04:00
Renan Gonçalves
ed96936ea7
According to CakePHP conding styles, methods prefixed by _ are protected. Changing where it makes sense and don't break anything.
2011-05-30 22:26:42 +02:00
Renan Gonçalves
438050dcaa
Adding 'public' visibility to all public methods.
2011-05-30 22:02:32 +02:00
ADmad
4c042ae133
Adding proper visibility keywords for class functions
2011-05-29 03:31:34 +05:30
Ceeram
5f97292648
Change case of Controller::$plugin, fixing missing plugin exceptions, tests updated. Also removing no longer needed camelize() calls
2011-05-26 15:31:40 +02:00
Juan Basso
acc0660989
Changed the emails folder in layouts to CamelCased. Fixes #1730 .
2011-05-24 01:05:29 -04:00
Jose Lorenzo Rodriguez
bfcfa4c06e
Marking 2.0.0-alpha
2011-05-20 22:18:14 -04:30
AD7six
20f541108e
partial fix for the scaffold test
2011-05-16 23:50:42 +02:00
Thomas Ploch
785c80ba88
Added missing string concatenator to lib/Cake/Views/pages/home.ctp.
2011-05-16 08:41:25 +02:00
AD7six
805cc944da
correct for case sensitivity
2011-05-15 19:41:34 +02:00
AD7six
ef684c3d94
a couple of find/replace oversights
2011-05-15 18:40:48 +02:00
AD7six
0cb70ae3bb
remove CONFIGS constant
2011-05-15 18:34:52 +02:00
AD7six
afa8f6b441
remove LIBS constant
...
libs always means the Cake lib - so use the CAKE constant
2011-05-15 18:29:52 +02:00
Jose Lorenzo Rodriguez
91bce16e9d
Merge remote-tracking branch 'origin/2.0' into 2.0-merge
...
Conflicts:
lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
lib/Cake/Test/Case/Log/Engine/FileLog.php
lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticateTest.php
lib/Cake/tests/Case/Log/Engine/FileLog.php
lib/Cake/tests/Case/Log/Engine/FileLogTest.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/PluggedHelper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/TestPluginAppHelper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
2011-05-15 00:40:54 -04:30
Jose Lorenzo Rodriguez
6713bb154e
Making themes also CamelCased
2011-05-15 00:09:32 -04:30
Jose Lorenzo Rodriguez
eea981940e
Replacing config string in favor of Config
2011-05-13 03:36:45 -04:30
Jose Lorenzo Rodriguez
649b863fc5
Changing more strings after renaming folders
2011-05-13 03:19:00 -04:30
Jose Lorenzo Rodriguez
7ba60ff424
Changing more paths
2011-05-13 03:15:04 -04:30
Jose Lorenzo Rodriguez
8746a485bd
Search and replace for changed paths
2011-05-13 02:53:35 -04:30
Jose Lorenzo Rodriguez
3b725290ba
Renaming elements and layouts
2011-05-13 02:45:36 -04:30
Jose Lorenzo Rodriguez
ded3cb4826
Renaming more folders
2011-05-13 02:31:33 -04:30
mark_story
523b1b6165
Updating docs.
2011-05-12 22:41:35 -04:00
Jose Lorenzo Rodriguez
54eb934892
Fixing plugin related tests in Core package
2011-05-10 00:46:24 -04:30
Jose Lorenzo Rodriguez
bd1479f732
Fixing a bunch of tests in the View/Helper package
2011-05-09 23:33:58 -04:30
Jose Lorenzo Rodriguez
77788a965d
Merge remote-tracking branch 'origin/2.0' into 2.0-plugin-loader
...
Conflicts:
lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_post.php
lib/Cake/tests/test_app/plugins/test_plugin/Model/TestPluginPost.php
lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_post.php
2011-05-08 22:08:31 -04:30
Jose Lorenzo Rodriguez
a45758cc7d
Migrating all View package tests to use the new plugin loader
2011-05-06 01:23:01 -04:30
Jose Lorenzo Rodriguez
d83555cc52
Merge remote-tracking branch 'origin/1.3' into merger
...
Conflicts:
cake/console/cake.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/controller/controller.php
cake/libs/view/helpers/xml.php
cake/libs/view/pages/home.ctp
cake/libs/xml.php
cake/tests/cases/console/cake.test.php
cake/tests/cases/libs/controller/components/cookie.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/xml.test.php
lib/Cake/Console/Command/SchemaShell.php
lib/Cake/Controller/Component/CookieComponent.php
lib/Cake/Network/Http/HttpSocket.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
lib/Cake/View/Helper/TextHelper.php
lib/Cake/View/Helper/TimeHelper.php
lib/Cake/config/config.php
lib/Cake/tests/Case/Cache/CacheTest.php
lib/Cake/tests/Case/Model/CakeSchemaTest.php
lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php
2011-05-04 01:10:23 -04:30
Jose Lorenzo Rodriguez
07b84a71ab
Removing unneeded assignments by reference
2011-04-29 11:49:46 -04:30
Thomas Ploch
bea666bb12
Removed JsBaseEngineHelper::$useNative. Removed json_encode() emulation from JsBaseEngineHelper::object(). Removed unnessecary call to get_object_vars() in JsBaseEngineHelper::object(). Removed unnessecary tests for equalness of emulation and native json_encode(). Added test for correct encoding of objects to JsHelper test case. Fixes #704
2011-04-26 22:35:33 -04:00
evilbloodydemon
1d7d20768f
Fixed typo in variable name
2011-04-26 21:44:37 +04:00
Juan Basso
24fbaafe01
Merge with 2.0-email.
2011-04-23 22:36:55 -04:00
Juan Basso
fac5ae50d0
Moved the emails templates from elements to views. Renamed the path in layouts to keep the same name. Fixes #1415 .
2011-04-20 23:47:21 -04:00
mark_story
d124b6c05d
Removing class
from being excluded from the attributes applied to hidden inputs. Fixes #1124
2011-04-20 21:37:47 -04:00
ADmad
3844966714
Changed default value for key 'last' in validator options to true. Also implemented ability to list messages for all failed validations for a field at once, instead of current display of just one message at a time.
2011-04-18 02:08:48 +05:30
ADmad
c80a51a163
Splitting View::element() param $params into $data and $options. Removed param $callbacks, use key 'callbacks' in $options array instead. Closes #1646
2011-04-17 07:00:14 +05:30
Jose Lorenzo Rodriguez
000e05b468
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/helpers/js.php
cake/tests/lib/templates/missing_conenction.php
cake/tests/lib/templates/missing_connection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/templates/missing_conenction.php
lib/Cake/View/Helper/FormHelper.php
lib/Cake/tests/Case/Core/ConfigureTest.php
2011-04-11 22:48:08 -04:30
Jose Lorenzo Rodriguez
433e9e7177
Fixing typos in time helper translations
2011-03-21 00:57:37 -04:30
AD7six
32df3156a7
consolidate cake_error and cake_developer to simply "cake_dev"
...
it's a lot easier for adding new translations to think:
is it for the end user?
use 'cake' as the domain
is it for the developer
use 'cake_dev' as the domain
is it for the console
use 'cake_console' as the domain
also neatly avoids the "this message is an error, and it's in
cake_developer, why?" - question (because cake_error was intended for
anything which is used in trigger_error/exceptions, not a variable named
$error
2011-03-20 16:38:31 +01:00
AD7six
128407fb4a
corect a bad habbit
...
don't request the same thing 3 times - request it once and use 3 times.
removed the almost duplicate translation too.
2011-03-19 18:41:50 +01:00
AD7six
ca254dae98
update language domains used in standard views
2011-03-19 18:40:36 +01:00
AD7six
d2badbeb22
update language domains
...
no domain - the thing being translated comes from the app - so let the
user handle that
cake - end user
cake_error - error messages
2011-03-19 18:29:31 +01:00
AD7six
e492bce64f
Merge branch '2.0-translations' of github.com:AD7six/cakephp into 2.0-class-loading
2011-03-16 17:08:15 +01:00
AD7six
64e71de52a
Merge branch '2.0-class-loading' of github.com:cakephp/cakephp into 2.0-class-loading
2011-03-16 17:07:22 +01:00
AD7six
39c7d03319
Merge branch '2.0-class-loading' into 2.0-translations
...
Conflicts:
lib/Cake/Console/Command/Task/ControllerTask.php
lib/Cake/Console/Command/Task/ProjectTask.php
lib/Cake/Core/Configure.php
lib/Cake/View/pages/home.ctp
2011-03-16 12:29:39 +01:00
Jose Lorenzo Rodriguez
8213160bb1
Udating template home.ctp and providing a default skel dir in tamplate task
2011-03-15 23:48:51 -04:00
Jose Lorenzo Rodriguez
2e2f5ea2a5
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-15 21:13:45 -04:00
AD7six
28eae99ecb
translation changes in the view folder
2011-03-12 20:02:56 +01:00
Jose Lorenzo Rodriguez
90b01b7ec3
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-10 23:17:54 -04:30
Jose Lorenzo Rodriguez
472257c347
Removing unused variables and properly testing more methods in App class
2011-03-09 23:33:03 -04:30
Jose Lorenzo Rodriguez
ca32143292
Fixing the ControllerTestCase tests
2011-03-09 01:05:58 -04:30
Jose Lorenzo Rodriguez
7b7dabce48
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-09 00:26:18 -04:30
Jose Lorenzo Rodriguez
f8a08432f4
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-05 17:37:31 -04:30
Jose Lorenzo Rodriguez
42b3f993b9
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-01 23:04:52 -04:30
Jose Lorenzo Rodriguez
ba694c45c9
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-02-27 22:50:53 -04:30
José Lorenzo Rodríguez
4e1fcbed61
Fixing ScaffoldView test
2011-02-22 22:47:07 -04:30
José Lorenzo Rodríguez
4cebe55a9b
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
app/webroot/index.php
lib/Cake/Controller/Component/AuthComponent.php
lib/Cake/Network/CakeRequest.php
lib/Cake/tests/cases/libs/controller/components/auth.test.php
2011-02-21 22:28:30 -04:30
José Lorenzo Rodríguez
227ed6ef27
Fixing the Js engine helpers
2011-02-14 00:19:06 -04:30
José Lorenzo Rodríguez
396fbeec91
Fixing the HtmlHelper tests
2011-02-14 00:18:10 -04:30
José Lorenzo Rodríguez
c1e81a20cd
Moving more files to the new folder
2011-02-13 23:20:49 -04:30
José Lorenzo Rodríguez
6e4f4efb79
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/bootstrap.php
lib/Cake/Console/Command/TestSuiteShell.php
lib/Cake/Console/TaskCollection.php
lib/Cake/Controller/ComponentCollection.php
lib/Cake/Controller/Controller.php
lib/Cake/Core/App.php
lib/Cake/Model/BehaviorCollection.php
lib/Cake/Network/CakeRequest.php
lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
lib/Cake/TestSuite/CakeWebTestCase.php
lib/Cake/TestSuite/TestManager.php
lib/Cake/TestSuite/TestRunner.php
lib/Cake/View/HelperCollection.php
lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
lib/Cake/tests/cases/libs/test_manager.test.php
2011-02-13 23:10:19 -04:30
José Lorenzo Rodríguez
61e7cafe32
Fixing HelperCollection tests after merging 2.0 branch in
2011-01-28 01:33:08 -04:30
José Lorenzo Rodríguez
aa18cca1c3
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
lib/Cake/View/Helper.php
2011-01-28 01:14:59 -04:30
José Lorenzo Rodríguez
d9c99b5ef6
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/tests/cases/libs/controller_test_case.test.php
lib/Cake/Controller/ComponentCollection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/View/pages/home.ctp
2011-01-22 01:00:15 -04:30
José Lorenzo Rodríguez
1332561164
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/helpers/js.php
lib/Cake/Console/Command/Task/FixtureTask.php
2011-01-09 23:32:05 -04:30
José Lorenzo Rodríguez
599a110d6b
Merge remote branch 'origin/2.0' into 2.0-class-loading
2011-01-08 22:59:02 -04:30
José Lorenzo Rodríguez
e8a93aef93
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Temporarly commenting code on App class while the transition is made
Conflicts:
lib/Cake/Core/App.php
2011-01-05 22:21:27 -04:30
José Lorenzo Rodríguez
4c0e06c451
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/bootstrap.php
cake/libs/view/helpers/js.php
lib/Cake/Model/AclNode.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/bootstrap.php
lib/Cake/tests/cases/libs/controller/controller.test.php
2011-01-02 02:00:03 -04:30
José Lorenzo Rodríguez
57e6ac7eb7
Adding cast to avoind fatal error in Helper class
2010-12-21 22:05:36 -04:30
José Lorenzo Rodríguez
9fac0b92c6
Extracting JsBaseEngineHelper to its own file, fixing some JsHelper related test cases
2010-12-21 22:01:38 -04:30
José Lorenzo Rodríguez
2cb2609a43
Making ThemeView test pass
2010-12-19 23:49:20 -04:30
José Lorenzo Rodríguez
151a4bdb33
Fixing view files finding and making tests pass
2010-12-18 22:09:08 -04:30
José Lorenzo Rodríguez
387281e506
Moving newly created classes to the new folders
2010-12-15 01:32:37 -04:30
José Lorenzo Rodríguez
8436fd53d0
Changing initial uses of App::uses() to the new packages system
2010-12-15 01:20:02 -04:30
José Lorenzo Rodríguez
07e43bb0f8
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/scaffolds/edit.ctp
cake/libs/view/scaffolds/form.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
cake/tests/test_app/views/posts/scaffold.edit.ctp
cake/tests/test_app/views/posts/scaffold.form.ctp
lib/Cake/Error/ErrorHandler.php
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/Datasource/CakeSession.php
lib/Cake/Routing/Router.php
lib/Cake/TestSuite/TestManager.php
lib/Cake/View/scaffolds/edit.ctp
lib/Cake/tests/cases/console/shells/bake.test.php
lib/Cake/tests/cases/libs/cake_log.test.php
lib/Cake/tests/cases/libs/cake_request.test.php
lib/Cake/tests/cases/libs/view/helpers/number.test.php
lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
2010-12-15 01:13:05 -04:30
José Lorenzo Rodríguez
8e5bd76752
Fixing several errors when running the testsuite
2010-12-11 01:17:55 -04:30
José Lorenzo Rodríguez
e57b3d8e74
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
lib/Cake/View/Helper.php
2010-12-10 01:25:00 -04:30
José Lorenzo Rodríguez
b8344ecd33
Replacing some of the App::import by App::uses
2010-12-08 23:15:18 -04:30
José Lorenzo Rodríguez
02ad049559
Fixing more shells, and updating code in home.ctp
2010-12-07 20:42:50 -04:30
José Lorenzo Rodríguez
7828f7d2fb
Lazy loading connections in ConnectionManager, changing some class names and imports
2010-12-07 19:59:07 -04:30