mark_story
|
c83e941497
|
Merge branch 'master' into 2.3
|
2012-08-15 21:00:49 -04:00 |
|
ADmad
|
4a483b4897
|
If cache is disabled in app and js cache file is not written don't return script tag with file url.
Instead return script block with inline js content.
|
2012-08-12 01:08:05 +05:30 |
|
Ceeram
|
e2e42ee185
|
move serialization to separate method, for easier overriding in subclasses
|
2012-08-10 09:54:05 +02:00 |
|
ADmad
|
8931b74ba2
|
Removed variable escaping in CakeErrorController::beforeRender(). Closes #3074
|
2012-08-05 02:36:29 +05:30 |
|
mark_story
|
e59555a66f
|
Merge branch 'master' into 2.3
|
2012-08-03 22:45:56 -04:00 |
|
mark_story
|
e620433680
|
Update doc block.
|
2012-08-02 21:35:06 -04:00 |
|
mark_story
|
e38c149880
|
Decompose complex nested conditionals.
Refs #808
|
2012-08-02 21:35:06 -04:00 |
|
euromark
|
a208eb6cb1
|
fixes disabled attribute for multiple checkboxes
|
2012-08-02 21:35:05 -04:00 |
|
mark_story
|
9b94133f0d
|
Fix uncaught exceptions when generating view cache files
Fixes #3016
|
2012-07-30 21:27:21 -04:00 |
|
mark_story
|
7b939186a1
|
Fix ( and ) not being correctly handled by autoLinkUrls
Fixes #3077
|
2012-07-29 21:18:33 -04:00 |
|
Schlaefer
|
19f0e72d58
|
fix #2858 RSS helper bug with namedspaced keys
http://cakephp.lighthouseapp.com/projects/42648/tickets/2858-rss-helper-bug-with-namedspaced-keys
|
2012-07-29 14:24:46 +02:00 |
|
mark_story
|
d94cdc67fe
|
Merge branch 'master' into 2.3
|
2012-07-27 22:38:24 -04:00 |
|
ADmad
|
99813e97b3
|
Implemented feature to allow individual "empty" values for date time select elements
|
2012-07-28 01:47:21 +05:30 |
|
mark_story
|
66b296527f
|
Add type check to prevent errors related to Hash::get()
Fixes #3041
|
2012-07-23 22:33:58 -04:00 |
|
mark_story
|
3c6b50953b
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/VERSION.txt
|
2012-07-18 22:12:51 -04:00 |
|
euromark
|
3945c0e6a8
|
rtim files
|
2012-07-18 03:55:29 +02:00 |
|
Jose Lorenzo Rodriguez
|
db247558b0
|
Correctly passing ellipsis options to all internal method calls insie
PaginatorHelper::numbers(), under some combinations of modulus/limit
it would not get passed even though there are pages in between to show
|
2012-07-10 20:46:56 -04:30 |
|
ADmad
|
69eba678f4
|
Deprecated MediaView and updated MediaView::render() to use CakeResponse::file()
|
2012-07-11 01:40:42 +05:30 |
|
Florian Krämer
|
83903cd5b4
|
Changing the signature of View::_elementCache()
|
2012-07-06 02:13:34 +02:00 |
|
Florian Krämer
|
b2bb7bf2ae
|
Fixing a few issues within the new methods
|
2012-07-06 00:22:39 +02:00 |
|
Florian Krämer
|
ca9ff0283c
|
Refactoring View::element()
|
2012-07-04 11:48:10 +02:00 |
|
mark_story
|
e61f636bc7
|
Fix double base dir in image() with fullBase.
Fixes #2991
|
2012-07-03 20:48:17 -04:00 |
|
mark_story
|
5e54be4e5a
|
Merge branch '2.1' into 2.2
Conflicts:
lib/Cake/Error/exceptions.php
|
2012-06-23 16:41:32 -04:00 |
|
Ceeram
|
b913fe5303
|
better error message in MissingConnectionException when driver is not enabled
|
2012-06-23 11:42:26 +02:00 |
|
Ceeram
|
55f3cbe1f6
|
remove unneeded line
|
2012-06-22 14:44:47 +02:00 |
|
euromark
|
b32edfe378
|
fix double-encoding of external urls
|
2012-06-12 16:30:37 +02:00 |
|
AD7six
|
43b37cd608
|
Revert "actually, just ensure the path is slash terminated"
This reverts commit e88a2bcdbb .
|
2012-06-07 23:32:43 +02:00 |
|
AD7six
|
e88a2bcdbb
|
actually, just ensure the path is slash terminated
that way we're all good
|
2012-06-07 23:29:49 +02:00 |
|
AD7six
|
72a36a0929
|
correct path in error message for a missing component
PluginNameController/Component
becomes
PluginName/Controller/Component
|
2012-06-07 23:05:32 +02:00 |
|
Jose Lorenzo Rodriguez
|
51635c2ca6
|
Merge remote-tracking branch 'origin/2.1' into 2.2
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
|
2012-06-06 11:06:06 -04:30 |
|
Rachman Chavik
|
8966f1b324
|
create CakeRequest in View instead of in CakeEmail
|
2012-06-04 22:21:41 +07:00 |
|
Rachman Chavik
|
9bafc5a3bb
|
CakeEmail: create request object before rendering
Closes #2931
|
2012-06-04 09:18:29 +07:00 |
|
Mark Story
|
119377422e
|
Merge pull request #674 from colares/ticket-2787
Add table attributes per column
Fixes #2787
|
2012-05-30 18:29:56 -07:00 |
|
mark_story
|
9a8ceaeba6
|
Merge branch '2.1' into 2.2
Conflicts:
lib/Cake/Test/Case/View/XmlViewTest.php
|
2012-05-30 21:20:56 -04:00 |
|
Thiago Colares
|
6262a074f6
|
Breaking tableHeaders description in two lines
|
2012-05-30 09:34:10 -03:00 |
|
Thiago Colares
|
c65d4318cf
|
Enhancement in HtmlHelper > tableHeaders. Each tablename also can be a key that points to an array with a set of attributes to its specific tag
|
2012-05-29 23:28:57 -03:00 |
|
Ceeram
|
25c7a27495
|
fixing XmlView, XmlException: Invalid input was raised when _serialize is string and data is numerically indexed.
|
2012-05-29 09:46:00 +02:00 |
|
José Lorenzo Rodríguez
|
ed15634ccb
|
Merge pull request #663 from jellehenkens/api-docs-mixed-params
Updating @param mixed docblock lines to proper multi type @param's
|
2012-05-22 08:38:23 -07:00 |
|
Tigran Gabrielyan
|
671c31218f
|
Making FormHelper::inputDefaults() code more readable
|
2012-05-21 13:56:51 -07:00 |
|
Jelle Henkens
|
f7ce5262b7
|
Updating mixed @param documentation to seperate list of accepted types
|
2012-05-21 21:55:10 +01:00 |
|
José Lorenzo Rodríguez
|
bb368c569c
|
Merge pull request #659 from tigrang/inputDefaults-setter
Input defaults setter for FormHelper
|
2012-05-20 16:40:20 -07:00 |
|
Tigran Gabrielyan
|
57ad5e2573
|
Made FormHelper::inputDefaults() alawys return inputDefaults array
|
2012-05-20 15:51:48 -07:00 |
|
Tigran Gabrielyan
|
fd0dd7ec04
|
Updating FormHelper::create to use new inputDefaults() method
|
2012-05-20 13:44:54 -07:00 |
|
Tigran Gabrielyan
|
1d77ad393c
|
Added FormHelper::inputDefaults setter/getter method
|
2012-05-20 13:41:55 -07:00 |
|
mark_story
|
024e30eb42
|
Fix coding standards errors.
Adding a private property allows fixing of 4 naming standards
errors.
|
2012-05-20 16:06:41 -04:00 |
|
Jose Lorenzo Rodriguez
|
2ad406ab64
|
Merge branch '2.2-validator' into 2.2
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
|
2012-05-20 14:27:35 -04:30 |
|
Jose Lorenzo Rodriguez
|
b22c50d8b6
|
Merge branch '2.1' into 2.2-validator
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Model/models.php
|
2012-05-19 15:39:44 -04:30 |
|
Jelle Henkens
|
97ebbc8e23
|
Fixing coding conventions
|
2012-05-19 16:08:40 +01:00 |
|
Jelle Henkens
|
5fe22cfc8d
|
Adding support for DateTime objects in the CakeTime Utility class
|
2012-05-17 19:31:30 +01:00 |
|
mark_story
|
4dc07b6d39
|
Merge branch '2.1' into 2.2
|
2012-05-16 21:08:06 -04:00 |
|