Commit graph

282 commits

Author SHA1 Message Date
ADmad
49f8e73ab3 Allow bulk storing/updating of mime types. Closes #2844 2012-05-03 01:39:12 +05:30
Ceeram
74ee75b0ef Merge branch '2.1' into 2.2 2012-04-23 10:34:04 +02:00
mark_story
2480ee1beb Fix coding standards. 2012-04-20 20:52:10 -04:00
euromark
a5c323064f domain configurable for mailing in CLI environment 2012-04-20 03:38:26 +02:00
mark_story
b54c3b0308 Convert FILES processing to use recursion.
Fixes issues with deeply nested file data issues.
Fixes #2796
2012-04-17 22:28:08 -04:00
mark_story
21ba5bf04a Merge branch '2.1' into 2.2 2012-04-17 21:47:24 -04:00
Renan Gonçalves
b0b36e8fba Defining default values for CakeRequest, those params are present anywhere except when there isn't a Route match. 2012-04-13 15:58:45 +02:00
mark_story
9f9feec222 Merge branch '2.2-hash' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
mark_story
a24aca6ffc Fix a few code standards errors. 2012-04-06 22:56:01 -04:00
mark_story
4eea72205b Merge branch '2.1' into 2.2 2012-04-06 21:34:11 -04:00
mark_story
b3419be0fb Fix issues loading response classes from plugins.
Fixes #2759
2012-04-06 20:38:14 -04:00
Norio Suzuki
26b93afc3c fixed CakeEmail::reset, no initialized charset and headerCharset property 2012-04-01 23:42:18 +00:00
Rachman Chavik
6fa30db504 CakeEmail can use theme when rendering template 2012-03-28 22:01:30 +07:00
mark_story
19e0d8d946 Switch usage to Hash where possible. 2012-03-26 22:32:53 -04:00
Norio Suzuki
358b84b577 Add charset() / headerCharset() methods to CakeEmail class 2012-03-16 12:54:30 +00:00
Juan Basso
c754fb2dcb Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
mark_story
150c9fc6a3 Remove parse_str() its buggy and wrong.
parse_str() replaces `.` with _ and drops duplicated keys, which is
incorrect.  Replace parse_str with an updated version of parseQuery
from 1.x

Fixes #2629
Fixes #2647
2012-03-08 21:05:28 -05:00
mark_story
17eb0e4f68 Fix duplicate values when merging POST data.
Fixes #2648
2012-03-06 20:22:13 -05:00
mark_story
a6da736149 Fix coding standards errors in Network/ 2012-03-04 11:18:20 -05:00
Mark Story
6599422a7a Merge pull request #534 from dogmatic69/2622
Fixes #2622
2012-02-28 12:11:44 -08:00
dogmatic69
ac06880241 making the name lowercase in the addDetector method so that it will be found in the is() method fixes #2622 with tests. 2012-02-28 16:05:32 +00:00
mark_story
0568746bfd Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/CakeSchema.php
2012-02-26 12:04:28 -05:00
euromark
e94d307ee1 code conventions 2012-02-25 19:46:05 -05:00
José Lorenzo Rodríguez
2840dc74d3 Merge pull request #528 from vantienvnn/2.0
CakeRequest::here explicitly using & as a query string separator to overcome issue in some badly configured 5.3 servers
2012-02-24 06:51:12 -08:00
vantienvnn
c0b2d8ad9d Fixed #2615 2012-02-24 21:35:50 +07:00
Ceeram
8eea263d71 fixing incorrect post data 2012-02-23 20:00:51 -05:00
Ceeram
55b8f66095 fixing incorrect post data 2012-02-22 22:49:42 +01:00
Christopher Vrooman
585f1e2c31 Minor changes to two error messages. 2012-02-19 14:47:49 -02:00
mark_story
943d928084 Merge branch '2.0' into 2.1 2012-02-18 22:19:38 -05:00
mark_story
89df484fc5 Remove un-necessary Set::merge().
Using Set::merge() on an empty array causes issues with out of order
numeric keys. Only merge if necessary.

Fixes #2595
2012-02-18 22:18:16 -05:00
mark_story
20229eeb43 Merge branch '2.0' into 2.1 2012-02-18 11:22:18 -05:00
teddy
0ea00c5f07 urldecode $this->url before unsetting it from CakeRequest->query 2012-02-18 11:03:36 -05:00
Majna
1dbafe1d4f Fix docblocks. 2012-02-17 13:51:20 +01:00
Thomas Ploch
1a07f55d43 Renamed parameter to CakeResponse::cookie() to match cakephp standard naming. 2012-02-13 09:59:45 +01:00
Thomas Ploch
574b5dcd41 Merge branch '2.1' of https://github.com/cakephp/cakephp into 2.1-cookie-response 2012-02-13 09:56:39 +01:00
mark_story
2afb05b590 Merge branch '2.0' into 2.1
Conflicts:
	app/View/Pages/home.ctp
	lib/Cake/Config/config.php
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
mark_story
4c01ba7224 Add ics mime type.
Fixes #2565
2012-02-11 11:39:24 -05:00
mark_story
0207a61e9b Move alias wrapping into _formatAddress()
Fixes #2502
2012-02-11 10:16:08 -05:00
Thomas Ploch
059a5f21ed Fixed TODO: Refactored setting of Cookies into CakeResponse. 2012-02-09 14:24:10 +01:00
ADmad
12bf1348f5 Merge branch '2.0' into 2.1 2012-02-05 17:55:46 +05:30
ADmad
6f09f5dfc8 Added missing file extension to mime type mapping for files used with html5 audio/video tags 2012-02-05 05:41:02 +05:30
mark_story
ace9fefb02 Merge branch '2.0' into 2.1 2012-02-03 21:54:50 -05:00
mark_story
f5d05d9ea9 Fix https + query string requests.
Using https + query strings would result in port 80 instead of the
default https port.

Fixes #2530
2012-02-01 21:10:56 -05:00
mark_story
167a551656 Fix incorrect doc block. 2012-02-01 19:30:56 -05:00
Ceeram
c8eae93292 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Network/Http/HttpSocket.php
2012-02-01 12:11:01 +01:00
Ceeram
cccf663c23 omit equal sign if query component is not a key value pair 2012-02-01 12:04:52 +01:00
Ceeram
7eda0affe3 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/View/ThemeView.php
2012-01-26 21:40:18 +01:00
mark_story
f02a3b0531 Wrap aliases containing , in ""
Fixes #2502
2012-01-25 21:03:03 -05:00
Jose Lorenzo Rodriguez
a1daaf5960 Merge branch '2.1-http' into 2.1 2012-01-21 15:51:34 -04:30