Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 01:58:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
89,905 Commits 36 Branches 190 Tags
1e176fad8fed1d8e89c9009f5e2cf0fc2069b51d
Commit Graph

228 Commits

Author SHA1 Message Date
Laurent Destailleur
8b2ba8cbba Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/bom/bom_card.php
	htdocs/core/class/ldap.class.php
	htdocs/core/lib/files.lib.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/admin.lang
 2020-09-29 13:28:22 +02:00
Laurent Destailleur
43c167f0c8 Fix init var 2020-09-28 20:47:36 +02:00
kkhelifa-opendsi
1f5f784b75 Merge branch 'develop' into email_smtp_allow_auto_signed 2020-09-14 10:25:15 +02:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
 2020-09-12 04:29:28 +02:00
Laurent Destailleur
990af9d5cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
 2020-09-12 04:25:54 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
kamel
ccff18e2a5 NEW : Email configuration - Allow auto signed certificat when ssl activated 2020-09-08 14:48:50 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
lvessiller
27c754e6c8 NEW add send context for ticket 2020-09-02 15:33:18 +02:00
Florian Mortgat
134a47a93f FIX 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename 2020-09-01 15:36:35 +02:00
Laurent Destailleur
9dbc9582c1 Code comment 2020-08-31 17:12:31 +02:00
Laurent Destailleur
0a93954134 Fix regresssion. The reply_to was missing with SMTPS 2020-08-31 17:07:13 +02:00
Laurent Destailleur
49a4f4f1a1 More log 2020-08-31 17:00:43 +02:00
Laurent Destailleur
0381cf5665 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/modules/modPaymentByBankTransfer.class.php
	htdocs/filefunc.inc.php
 2020-08-14 11:08:53 +02:00
Laurent Destailleur
030df58fea Fix regression in sending emails 2020-08-07 17:11:23 +02:00
Laurent Destailleur
795754273e Fix regression in sending emails 2020-08-07 17:06:57 +02:00
Laurent Destailleur
bd5c4603e3 Fix regression in sending emails 2020-08-07 17:06:12 +02:00
Laurent Destailleur
6fd433167f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-08-07 11:59:55 +02:00
florian HENRY
46cafcc445 Merge branch '11.0' into 12.0 2020-08-06 16:54:49 +02:00
florian HENRY
3e6ae9bebf Merge branch '10.0' into 11.0 2020-08-06 16:34:45 +02:00
florian HENRY
53acd8cffd FIX: MAIN_MAIL_FORCE_SENDTO work now for all mail sending method 2020-08-06 16:28:17 +02:00
Laurent Destailleur
eb7f3b81d3 Merge pull request #14187 from atm-john/10.0_fix_email_spoofing 
Fix email spoofing - with hidden conf
 2020-07-06 12:01:35 +02:00
Laurent Destailleur
42917000a3 Update CMailFile.class.php 2020-07-06 12:01:00 +02:00
Laurent Destailleur
2f04b4c559 Update CMailFile.class.php 2020-07-06 12:00:14 +02:00
stickler-ci
cb7b66d52c Fixing style errors. 2020-07-06 09:19:27 +00:00
John Botella
2a9311b2d8 Fix email spoofing - with hidden conf 2020-07-01 16:55:23 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5 add new rule 2020-05-21 01:41:27 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
83af4ebea4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/product/stock/class/entrepot.class.php
	htdocs/product/stock/list.php
 2020-04-10 01:22:22 +02:00
stickler-ci
e402e35d96 Fixing style errors. 2020-04-08 14:09:04 +00:00
simicar29
6cb780d125 Avoid the doubledot issue in quoted-printable mail 
When sending HTML mail using swiftmailer, the content will be encoded using quoted-printable. We may then encounter the "double dot" issue (doubled dot at the beginning of the line). This can be problematic with broken links to pictures for example.
This PR switches the encoding to base64.
 2020-04-08 16:03:41 +02:00
Laurent Destailleur
895503d2eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/CMailFile.class.php
 2020-02-20 00:21:25 +01:00
Laurent Destailleur
016c7ad875 FIX #13135 2020-02-19 01:17:16 +01:00
Laurent Destailleur
6badf724cf FIX Mail smtps truncated if content has a line with single . 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-02-09 16:38:19 +01:00
Laurent Destailleur
5c000159c1 FIX Mail smtps truncated if content has a line with single . 2020-02-09 16:36:38 +01:00
Laurent Destailleur
18d332994f FIX Mail smtps truncated if content has a line with single . 2020-02-09 15:51:43 +01:00
Laurent Destailleur
e14612f569 FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.

Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-02-06 13:02:27 +01:00
Laurent Destailleur
13442ef0df FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.
 2020-02-06 13:01:09 +01:00
Laurent Destailleur
05e08b3596 FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.
FIX Do not encode subject if it is full ascii (not required)
 2020-02-06 12:58:02 +01:00
Laurent Destailleur
7c35e9aaa8 FIX #12932 2020-02-03 03:56:30 +01:00
Laurent Destailleur
1dab308e4a FIX #12932 2020-02-03 03:55:37 +01:00
Laurent Destailleur
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
 2019-12-23 14:13:26 +01:00
Regis Houssin
8321fe6ad2 FIX missing nl2br conversion 2019-12-22 09:13:34 +01:00
Laurent Destailleur
d38c73c90a FIX output of emails from and error on emailing pages. 2019-12-13 15:52:08 +01:00
Laurent Destailleur
92a65a8039 Log 2019-11-21 21:36:03 +01:00
Laurent Destailleur
5fdd6f698d More complete error message 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2019-11-21 20:46:27 +01:00
Laurent Destailleur
b46362dff9 More complete error message 2019-11-21 20:45:19 +01:00
Laurent Destailleur
75667833fe Fix missing ->msgid 2019-11-14 10:01:05 +01:00