Commit Graph

112 Commits

Author SHA1 Message Date
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
15de8a9497 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/mailing/card.php
2019-05-27 19:25:53 +02:00
Laurent Destailleur
1c6ddd25c4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-27 19:23:54 +02:00
Laurent Destailleur
93c395fe10 FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL 2019-05-27 19:22:51 +02:00
Laurent Destailleur
c3b9c08219 CSS 2019-05-21 21:36:48 +02:00
Laurent Destailleur
fdeb12a909 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/mailing/card.php
2019-05-21 21:18:40 +02:00
Laurent Destailleur
a7f5f3fb94 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-21 21:16:54 +02:00
Laurent Destailleur
dcf77520ea FIX Error management when MAILING_NO_USING_PHPMAIL is set 2019-05-21 21:16:06 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Frédéric FRANCE
ff39491f15
wip 2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
46db246273 Look and feel v9: Autofocus on create forms 2018-11-07 13:04:43 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
d9ccc7624b Standardize code 2018-09-23 16:09:25 +02:00
Philippe GRAND
d1f100b0c9 standardize 2018-07-29 17:17:29 +02:00
Frédéric FRANCE
30a3b95368
loadlangs 2018-05-26 20:32:23 +02:00
Laurent Destailleur
63ed5dcccc Fix securekey for new online payment form 2018-05-12 11:23:40 +02:00
Laurent Destailleur
86112f0096 Syntax error 2018-04-13 14:15:33 +02:00
Laurent Destailleur
d4cd5a0d95 Fix syntax error 2018-04-13 13:37:43 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
Laurent Destailleur
191a1e9350 Fix css 2018-03-02 11:18:29 +01:00
Laurent Destailleur
c67e57836e Code comment 2018-01-29 12:58:33 +01:00
Laurent Destailleur
0a11d52d53 Fix info on email sent 2018-01-29 12:46:07 +01:00
Laurent Destailleur
c5307e5cac Fix option MAILING_LIMIT_SENDBYWEB 2018-01-26 15:12:40 +01:00
Laurent Destailleur
53b36435d0 Fix on smartphone 2018-01-12 20:50:18 +01:00
Laurent Destailleur
ff9a62e519 Fix trackid from emailings 2017-11-21 11:15:33 +01:00
Laurent Destailleur
2b55fb81b9 Standardize substition keys. 2017-10-13 10:35:21 +02:00
Laurent Destailleur
084dc7798d Standardize use of function getCommonSubstitutionArray 2017-10-09 14:51:42 +02:00
Laurent Destailleur
252f038468 Mutualize code of substitutions for emails 2017-09-22 14:34:31 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Laurent Destailleur
1a78e2a055 Mutualize/share code of all payments modes 2017-09-15 13:43:16 +02:00
Laurent Destailleur
e254554461 Code comment 2017-09-15 11:28:21 +02:00
Laurent Destailleur
1ffcb5d94e FIX background color not visible in emailing view 2017-09-15 11:24:32 +02:00
Laurent Destailleur
0ade500535 Better support of text editor when no js available. 2017-09-15 11:19:56 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
61cf69f2bb NEW Include a color syntaxed HTML editor for emailing edition. 2017-09-01 13:09:13 +02:00
Laurent Destailleur
075a138e14 Fix substitution of __EMAIL__ 2017-08-28 12:49:57 +02:00
Laurent Destailleur
a96362e2f9 Fix #formmailbeforetitle not supported everywhere 2017-06-11 11:40:01 +02:00
Laurent Destailleur
e93cefbbf0 FIX #6985 2017-06-11 10:37:58 +02:00
Laurent Destailleur
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
Laurent Destailleur
910a925167 NEW Add last activation author and ip of modules 2017-05-06 20:43:14 +02:00
Laurent Destailleur
3da0aea168 Prepare code to use different SMTP servers. 2017-04-18 01:39:06 +02:00
Laurent Destailleur
0994622bf8 NEW Can use translations into all substitutions (watermark, freetext...) 2017-04-17 23:54:09 +02:00