tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
16,393 Commits 31 Branches 527 Tags 162 MiB
6fe5c37d6a
Commit Graph

42 Commits

Author SHA1 Message Date
Sam Minnee
3ee8f505b7 MINORE: Remove training whitespace. 
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
 2016-01-07 10:15:54 +13:00
Ed Linklater
856722a561 Handle incorrectly deprecated validEmailAddr methods 2015-11-10 13:17:27 +13:00
Damian Mooyman
1686c83826 Revert #3425 #3396 to restore deprecated functionality 
Fixes #4514
 2015-08-24 11:26:25 +12:00
Damian Mooyman
e14f743bf0 Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00
Damian Mooyman
e47800917a API Mailer can be configured to use different encoding mechanisms, and added support for unicode quoted-string encoding 
API Mailer bounce email can now be configured
API Mailer no longer calls Convert::xml2raw on all email subjects
API Deprecate dead Mailer code and refactored duplicate or mis-documented code.
 2014-09-25 16:04:56 +12:00
Sean Harvey
404478b07f Removing @deprecated 3.1 functionality and classes. 
Changelog has been updated to include what was removed in terms of
major functionality, and what to use as a replacement.
 2014-08-18 16:00:13 +12:00
Simon Welsh
dde90dc346 Correct line length and endings 2014-03-30 19:51:38 +13:00
Ingo Schommer
0d7e9a9692 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	_config/routes.yml
	docs/en/topics/datamodel.md
	forms/DropdownField.php
 2014-02-04 08:19:04 +13:00
madmatt
bebe0f6e37 Updating @package and @subpackage doc tags 2013-11-29 17:49:30 +13:00
Ingo Schommer
4d36b97543 Check for $bounceAddress before using (fixes #3359) 2013-04-05 11:46:15 +02:00
Justin Martin
22e7313d93 Bug: Fixed BC break (ancestry) in Mailer 2013-03-12 10:56:39 -07:00
Ingo Schommer
7f4c173369 Fixed indentation in Mailer 
No functional changes
 2013-01-30 12:52:18 +01:00
Ingo Schommer
7327f120aa Re-added wrapImagesInline and wrapImagesInline_rewriter to Mailer class 
Deprecated in fb076c03, but can't be removed just yet.
Also included some fixes which have since been applied in 3.0 to this.
 2013-01-30 12:48:54 +01:00
Ingo Schommer
634c91c6ff Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	email/Mailer.php
 2013-01-30 12:46:24 +01:00
Carlos Barberis
33a1fc7b3a FIX: Fixed operation of inlined images in Mailer, when no inlined images actually attached. 2013-01-29 18:03:47 +01:00
Ingo Schommer
c11b3918fc Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
	core/PaginatedList.php
	email/Mailer.php
 2013-01-21 11:14:57 +01:00
Sam Minnee
0c9b216894 FIX: Escape the -f argument passed to mail() 2013-01-18 11:24:23 +13:00
Simon Welsh
e20f15df55 Remove /e option due to preg_replace_callback use 2012-12-20 15:35:40 +13:00
Simon Welsh
c56a80d6ce Use preg_replace_callback over preg_replace with e modifier 2012-12-20 13:40:42 +13:00
Ingo Schommer
f03ad7b0dd Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/javascript/LeftAndMain.AddForm.js
	control/Director.php
	control/HTTPResponse.php
	dev/Profiler.php
	email/Mailer.php
	forms/ComplexTableField.php
	forms/ManyManyComplexTableField.php
	forms/SimpleImageField.php
	forms/TableField.php
	forms/TableListField.php
	javascript/ComplexTableField.js
	javascript/ImageFormAction.js
	javascript/TableField.js
	javascript/TableListField.js
	security/Member.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
	tests/forms/TableListFieldTest.php
 2012-12-12 10:11:56 +01:00
Simon Welsh
b0121b541c Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
Simon Welsh
fc5dd2994c Add codesniffer that ensures indentation is with tabs. 2012-12-12 00:12:11 +13:00
Ingo Schommer
fb076c0396 API Deprecated global email methods, moved to Mailer class 
Code reorganization to reduce global scope pollution.
Removed non-functional `$inlineImages` option for sending emails.
 2012-12-09 22:09:35 +01:00
Sam Minnee
1f7fc1f76a FIX Remove instances of lines longer than 120c 
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit.  This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
 2012-09-30 17:18:13 +13:00
Ingo Schommer
e2f073f38a Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
Stig Lindqvist
dffae1a2e7 API CHANGE: Do not rely on a specific OS mime type detection, use PHP finfo 
This also removes the $global_mimetypes that was generating weird errors when both HTTP and Mailer classes tried to modify and use it.

Support of finfo should be straightforward since PHP 5.3 includes that module that default
 2012-05-11 11:34:07 +12:00
Sam Minnee
364d413c66 BUGFIX: Send plaintext email as text/plain if there are no attachments. (#4603) 2012-04-18 10:11:50 +12:00
Simon Welsh
f07258f3cf MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
AngryPHPNerd
0e2cbb0b88 Replace ereg with preg_* 2012-02-27 22:14:02 +01:00
Ingo Schommer
5e9ba3c1d5 BUGFIX Correct formatting of "Content-Type: ...; charset=..." header in HTTPResponse and Mailer (breaks Adobe BrowserLab) 2011-07-15 07:05:50 +02:00
Sean Harvey
6faf418693 BUGFIX #6240 Line length of emails sent out by Mailer.php set too long and could cause emails to be marked as spam by certain filters (thanks florian.thoma!) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@115155 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-17 00:56:03 +00:00
Sean Harvey
fc3101760f ENHANCEMENT Always encode email subject as UTF-8 (thanks syntax!) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@115151 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-17 00:15:01 +00:00
Sam Minnee
58a50b7351 BUGFIX: Applied/edited paradigmincarnate's patch to quote plaintext email with htmlEmail (#5120) (from r108396) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112723 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-18 22:51:54 +00:00
Sam Minnee
c52f67aae5 MINOR ajshort: Replaced usage of the deprecated split() function with preg_split(). 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79568 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-18 09:34:17 +00:00
Sean Harvey
13b358a8dd Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75582 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-29 00:07:39 +00:00
Ingo Schommer
187a1f6f30 MINOR documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73232 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-17 20:20:08 +00:00
Ingo Schommer
331ea15e45 MINOR Documentation for email classes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73225 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-17 09:07:33 +00:00
Andrew O'Neil
60f75c5ca4 Merged changes from 2.3 branch 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71172 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-01 23:49:53 +00:00
Normann Lou
22752170fb BUGFIX: Fixed bounce-address generation so that it doesn't have a human component to the email address 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63602 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-03 03:57:58 +00:00
Sean Harvey
aa1a72ff04 MINOR added todo for someone to complete the description in Mailer.php 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@57419 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-07-04 23:33:02 +00:00
Ingo Schommer
4693ca4ba7 MINOR Moving Mailer.php into /email 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56225 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-15 14:07:14 +00:00