mark_story
f09693f6e8
Merge branch 'master' into 2.4
2013-06-29 23:26:26 -04:00
mark_story
0d76bfe325
Add an additional test for CakeRequest::referer().
...
Trying to track down the issue for #3897 . This test coverage was
missing, so fix that.
2013-06-29 23:26:13 -04:00
euromark
24506dcc2c
update test for FileLog config
2013-06-21 16:39:51 +02:00
ADmad
12da3b1f27
Merge branch 'master' into 2.4
2013-06-16 13:07:44 +05:30
Renan Gonçalves
796e4b45dd
Using Return-Path email address in MAIL FROM instead of a header in SmtpTransport.
...
The Return-Path header should not be present on the SMTP transaction, this header is set by the time of final delivery.
Quote RFC2821:
> When the delivery SMTP server makes the "final delivery" of a message, it inserts a return-path line at the beginning of the mail data. This use of return-path is required; mail systems MUST support it. The return-path line preserves the information in the from the MAIL command.
2013-06-12 11:31:49 +02:00
José Lorenzo Rodríguez
3b4a4fde31
Merge pull request #1317 from lorenzo/feature/full-base-url
...
Adding App.fullbaseURL as a recognized Configure value
2013-06-05 15:12:27 -07:00
Mark Story
59646aa30a
Merge pull request #1326 from fahad19/http-patch
...
convenience wrapper for HTTP PATCH in HttpSocket class.
2013-06-04 20:54:45 -07:00
Fahad Ibnay Heylaal
679177b8f3
convenience wrapper for HTTP PATCH in HttpSocket class.
2013-06-04 22:46:15 +02:00
ADmad
3303a2cda1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
Mark Story
4b7c128f04
Merge pull request #1320 from ravage84/docblock-improvements
...
Improved the DocBlocks and other code cleanup
2013-05-31 07:36:04 -07:00
Mark
525bf3b362
Merge pull request #1297 from dereuromark/master-email-wrapping
...
enforce a better email wrapping to send valid emails
2013-05-31 07:30:32 -07:00
Marc Würth
4c9f0414cb
Improved the DocBlocks and other code cleanup
...
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
Jose Lorenzo Rodriguez
4bc92b822e
Adding App.fullbaseURL as a recognized Configure value
2013-05-30 16:07:26 +02:00
Sebastián Marcos Arce
bf6c3854e5
Update HttpSocketTest.php
...
Update tests.
2013-05-30 10:13:31 -03:00
euromark
bebb8ec416
do not translate error message in test case
2013-05-28 03:25:52 +02:00
ADmad
36c592e72e
Merge branch 'master' into 2.4
2013-05-26 11:23:53 +05:30
euromark
75b5a323e4
enforce a better email wrapping to send valid emails
2013-05-23 18:34:39 +02:00
mark_story
ca1f9e800e
Make CakeEmail::config() merge configuration.
...
This allows you to incremementally overwrite configuration and better
matches other config methods in CakePHP.
Fixes #3848
2013-05-23 09:47:24 -04:00
ADmad
eccdf3bf60
Ensure passing empty array to SmtpTransport::config() does not reset existing config.
...
Synced args and return value with AbstractTransport::config().
Fixes #3840
2013-05-22 11:36:31 +05:30
TAKAHASHI Kunihiko
05473fe7d0
Processing was simplified when a length of one line was smaller than CakeEmail::LINE_LENGTH_MUST
2013-05-21 10:50:46 +09:00
ADmad
fb86859585
Merge branch 'master' into 2.4
2013-05-19 14:37:41 +05:30
Mark Story
9147f545fe
Merge pull request #1286 from kunit/master
...
CakeEmail::_wrap does not operate correctly by the character string of specific Japanese.
2013-05-17 13:17:13 -07:00
TAKAHASHI Kunihiko
f541260350
Add TestCase for Network/Email/CakeEmail.php
2013-05-17 18:56:52 +09:00
TAKAHASHI Kunihiko
a562d9c04e
The assembly of the message was not correctly completed in specific Japanese.
2013-05-17 18:36:53 +09:00
euromark
97c2cb367d
CS fixes
2013-05-17 10:36:17 +02:00
mark_story
df872dde28
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-05-10 21:58:48 -04:00
mark_story
6017db9dc8
Add missing urlencoding to base/webroot.
...
This fixes URL generation when PHP_SELF or the request path contains
special characters.
2013-05-10 11:04:46 -04:00
ADmad
a10275fb8b
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
2013-05-05 14:36:46 +05:30
Mark Story
ac94d11e65
Merge pull request #1254 from dereuromark/master-spelling-corrections
...
spelling corrections (a url to an URL, unify URL)
2013-04-29 09:27:48 -07:00
euromark
ff0aa70b59
fix line length for templated emails
2013-04-29 16:18:00 +02:00
euromark
09d9efe235
spelling corrections (a url to an URL, unify URL)
2013-04-29 11:05:17 +02:00
ADmad
8135d405a3
Merge branch 'master' into 2.4
2013-04-27 18:39:30 +05:30
ADmad
3c036e9ebf
Merge pull request #1249 from DiegoMax/master
...
Fixed CakeResponse Tests
2013-04-26 00:37:18 -07:00
Diego Massanti
03b6c3fa61
Fixed test case for CakeResponse
2013-04-26 04:32:44 -03:00
ADmad
06a5c509c0
Merge branch 'master' into 2.4
2013-04-21 19:15:55 +05:30
mark_story
4d8dd12449
Add support for key => value cookies.
...
This makes using simple arrays easier, and I feel it is a long standing
omission from HttpSocket.
Fixes #3771
2013-04-18 21:22:50 -04:00
mark_story
ce04d6afa1
Add CakeRequest::isAll().
...
Provides a way to test multiple request types at the same time. And
assert that all pass. This replaces longer conditionals with a terser
syntax.
Refs #3714
2013-04-01 21:52:22 -04:00
mark_story
d4a3594e4f
Add support for is() with multiple types.
...
Add ability to check if a request is one of a set number of types
by providing an array. If any type matches, then the method returns
true.
Refs #3714
2013-04-01 21:52:15 -04:00
mark_story
3fc627c5f8
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
lib/Cake/Error/ErrorHandler.php
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
lib/Cake/View/Helper/HtmlHelper.php
2013-03-30 22:12:27 -04:00
ADmad
7b90542230
Fix CS error
2013-03-31 00:23:03 +05:30
Joel Bradshaw
ece6ac3663
Backwards compat for auth in the config array of HttpSocket::request()
...
Brings functionality back in line with docs as well
2013-03-29 15:46:42 -07:00
Jad Bitar
f1b815a9bb
Add scope to email logging.
2013-03-01 22:24:02 -05:00
mark_story
d1c88ebf8a
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Log/Engine/FileLog.php
lib/Cake/Utility/Validation.php
lib/Cake/View/Helper/HtmlHelper.php
2013-02-24 20:24:26 -05:00
mark_story
9f25da49ef
Attempt to get more tests passing on travis ci.
2013-02-19 22:17:47 -05:00
mark_story
27dc666c8d
Fix incorrect method names.
2013-02-19 22:04:44 -05:00
mark_story
3e34a09e8b
Make skips more permissive.
...
Hopefully this fixes issues on travisci.
2013-02-19 21:05:05 -05:00
mark_story
341c0d17f0
Attempt to fix failures in travisci.
...
Network tests have recently started failing, make those skip conditions
instead. Convert SocketExceptions in Xml::build() into XmlExceptions.
This is the documented behavior so we should try to honour that.
2013-02-19 20:53:28 -05:00
euromark
111366d5c8
== to === and != to !== where applicable
2013-02-12 03:38:08 +01:00
ADmad
13029cc2bc
Merge branch 'master' into 2.4
2013-02-09 02:20:16 +05:30
Graham Weldon
66d856d883
Added extra line for referencing license file for copyright
2013-02-08 21:22:51 +09:00