Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
71,221 Commits 36 Branches 190 Tags
0a057c8277b26e2429b51f9f2c54e81a0445fd6c
Commit Graph

145 Commits

Author SHA1 Message Date
Laurent Destailleur
39621ec686 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-11-19 20:07:51 +01:00
Laurent Destailleur
25ee999d27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-19 20:05:32 +01:00
Laurent Destailleur
8535844737 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-19 18:27:00 +01:00
Frédéric FRANCE
30b1db34cd Update CMailFile.class.php 2018-11-17 11:33:01 +01:00
Laurent Destailleur
5d596fe584 Fix trackid must contains an id of instance 2018-11-16 16:43:13 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Laurent Destailleur
08862fb482 Log success of emails 2018-10-29 03:25:21 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
9ccdd10a81 FIXx format (html/text) of emails sent on leave request module 2018-10-25 13:19:56 +02:00
Laurent Destailleur
897a2b09a7 Removed scrutinizer warning 2018-10-19 15:02:54 +02:00
Laurent Destailleur
52840478c0 Clean code 2018-10-17 21:11:07 +02:00
Laurent Destailleur
62b31df069 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/rssparser.class.php
	htdocs/langs/en_US/boxes.lang
 2018-09-27 12:55:25 +02:00
Laurent Destailleur
575c63f87d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2018-09-27 12:52:10 +02:00
Laurent Destailleur
291d477f65 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-27 12:47:48 +02:00
Frédéric FRANCE
1bac3a0ccf swiftmailer is doing encodetorfc2822 2018-09-26 10:37:20 +02:00
Frédéric FRANCE
92a3faeaf7 add try catch for swiftmailer 2018-09-26 10:13:14 +02:00
Philippe GRAND
67bbead7c1 Standardize and update code 2018-09-20 17:46:39 +02:00
Laurent Destailleur
e90a60d4ee Remove warnings 2018-09-16 10:09:19 +02:00
Frédéric FRANCE
b60f7db60a move phpcs:ignore 2018-09-02 10:43:34 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Frédéric FRANCE
b03f4004ea PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
850ac34020 mark non camelCaps function 2018-08-13 17:26:32 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
 2018-07-02 12:16:51 +02:00
Laurent Destailleur
2175a012e1 Fix lang 2018-06-29 18:23:59 +02:00
Laurent Destailleur
75dee7538b Fix add protection to avoir fatal error 500 2018-06-19 01:15:37 +02:00
Laurent Destailleur
5d5083199f FIX better text content for multipart email 2018-06-18 23:26:21 +02:00
Laurent Destailleur
f9f7d3655d FIX better text content for multipart email 2018-06-18 23:24:31 +02:00
Laurent Destailleur
c3f64ed36e FIX better text content for multipart email 2018-06-18 23:18:22 +02:00
Laurent Destailleur
b094ae953e Better log 2018-06-01 17:20:49 +02:00
Laurent Destailleur
fb8ad77378 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2018-04-23 23:09:53 +02:00
Laurent Destailleur
6b90558b7a FIX File name not visible in email preview 2018-04-20 11:20:56 +02:00
Frédéric FRANCE
f5b49aa93b do not fill error with success message 2018-04-09 00:21:29 +02:00
Frédéric FRANCE
fd6c1f129c Update CMailFile.class.php 2018-04-04 15:58:24 +02:00
Frédéric FRANCE
1071ec7e57 ignore Return-Path in dkim sign with swiftmailer 2018-03-26 21:36:03 +02:00
Frédéric FRANCE
d6e98d3b05 Update CMailFile.class.php 2018-03-12 15:14:41 +01:00
Laurent Destailleur
b084ca4a50 Fix 2018-03-11 19:44:19 +01:00
Frédéric FRANCE
27bf5419d6 Merge branch 'develop' into swifmailer 2018-03-09 22:44:57 +01:00
Laurent Destailleur
de9f1aab0f NEW Can set the reply-to into email sent 2018-02-28 19:09:05 +01:00
Laurent Destailleur
7c6c893657 Merge pull request #7996 from atm-maxime/new_force_mailto 
NEW Option to force all emails recipient
 2018-02-03 19:15:11 +01:00
Laurent Destailleur
833c7685e1 Hook 'maildao' was renamed into 'mail' into the method sendfile that 
send emails, and method was renamed from 'doaction' into 'sendMail'.
To process task #4875 #7969 in several steps.
 2018-02-03 17:36:33 +01:00
Frédéric FRANCE
0568461a7b swiftmailer 2018-01-25 22:03:51 +01:00
Laurent Destailleur
d796f403a9 Fix sender email when sending a password remind 2018-01-24 15:43:55 +01:00
Frédéric FRANCE
d31684376a swiftmailer 2018-01-21 18:59:48 +01:00
Frédéric FRANCE
a34b99f3ec swiftmailer 2018-01-21 15:55:56 +01:00
Maxime Kohlhaas
a9c7dc48ab New option to force e-mail recipient, helpful for test purposes 2017-12-24 17:31:31 +01:00
Laurent Destailleur
2b95679b84 Add info to help spam fight 2017-11-21 14:09:15 +01:00
Laurent Destailleur
f7fe011e98 Add CRLF before 'boundary' word. Use \r\n on wordwrap. 2017-10-16 14:31:28 +02:00
Laurent Destailleur
a60cd49fb0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/CMailFile.class.php
	htdocs/filefunc.inc.php
 2017-08-28 12:53:02 +02:00
Laurent Destailleur
075a138e14 Fix substitution of __EMAIL__ 2017-08-28 12:49:57 +02:00
Laurent Destailleur
c382ca22b8 FIX link in to email and option for tls 2017-08-28 00:09:21 +02:00