Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
74,307 Commits 36 Branches 189 Tags
4495f0a755c52c76456b51a3347ea42f4fc101a1
Commit Graph

203 Commits

Author SHA1 Message Date
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
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
5146ab9177 trim 2018-08-14 15:34:44 +02:00
Philippe GRAND
42fe2b78de clean and update code 2018-08-07 10:44:26 +02:00
Philippe GRAND
36ea20b7d4 standardize 2018-07-28 18:03:14 +02:00
Laurent Destailleur
03b6bec8b8 Fix email template for test 2018-06-13 17:03:46 +02:00
Frédéric FRANCE
f53f7bbf40 loadlangs 2018-05-26 18:41:16 +02:00
Philippe GRAND
f3a70a40d7 clean and update code 2018-05-03 21:27:52 +02:00
Laurent Destailleur
698f5c165a Merge pull request #8430 from atm-florian/dev_mailtouser 
NEW : Can select from the user list into send form email (For field to and CC)
 2018-04-11 17:55:40 +02:00
Laurent Destailleur
b412f0b76b Better interaction to setup email 2018-04-06 16:38:47 +02:00
Laurent Destailleur
85d4f7115b Better position of the substitution tooltip for emails 2018-04-06 16:16:08 +02:00
florian HENRY
dc6f4c1f4d NEW : option to send email to salaries 2018-03-21 11:48:30 +01:00
Frédéric FRANCE
27bf5419d6 Merge branch 'develop' into swifmailer 2018-03-09 22:44:57 +01:00
Laurent Destailleur
60fe1fa503 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails.php
 2018-02-17 01:19:17 +01:00
Laurent Destailleur
5c5d2cbefa Fix smtp warning message 2018-02-16 23:49:08 +01:00
Laurent Destailleur
d24d401f3a Fix translation 2018-02-04 10:55:09 +01:00
Frédéric FRANCE
0568461a7b swiftmailer 2018-01-25 22:03:51 +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
5935ad868a Fix the from robot must be visible only on test page 2017-11-25 19:23:27 +01:00
Laurent Destailleur
3d48e509bd Clean code 2017-11-25 19:16:15 +01:00
Laurent Destailleur
2fc5d9fefb The form to test email can now use all sending profiles. 2017-11-25 18:52:47 +01:00
Scrutinizer Auto-Fixer
165741517e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-13 11:28:26 +00:00
Laurent Destailleur
8113321062 Start to work on email sender profiles 2017-10-13 12:02:26 +02:00
Laurent Destailleur
2b55fb81b9 Standardize substition keys. 2017-10-13 10:35:21 +02:00
Laurent Destailleur
bcf56e3140 Introduce table c_email_senderprofile to have several profils 2017-10-11 19:41:19 +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
21a7fcb01a Fix substitution when sending emails 2017-08-28 12:18:18 +02:00
Laurent Destailleur
17f44ad980 NEW Can make a specific setup for SMTP sending for emailing module 2017-08-24 02:02:00 +02:00
Laurent Destailleur
15cf15f47f Look and feel v6 2017-07-14 02:07:01 +02:00
Laurent Destailleur
a96362e2f9 Fix #formmailbeforetitle not supported everywhere 2017-06-11 11:40:01 +02:00
Laurent Destailleur
aec4cef5de Clean some code for type of event deprecated since 3.3 2017-05-19 12:58:38 +02:00
Laurent Destailleur
846204bdb4 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
49624c7b68 Useless bottom-border 2017-03-18 19:57:33 +01:00
Laurent Destailleur
05c9f57fd4 Move edition of emails templates out of dictionaries so we would be able 
to have templates per user (not reserved to admin).
 2017-02-12 18:13:49 +01:00
Laurent Destailleur
c16489a3c0 Fix add message to explain why some emails fails 2016-12-25 23:14:51 +01:00
Laurent Destailleur
4d624fd875 Debug feature to choose email "from" 2016-12-20 11:23:44 +01:00
Laurent Destailleur
48ce299a38 NEW Option MAIN_INFO_SOCIETE_MAIL_ALIASES to use different identities. 2016-10-15 03:45:23 +02:00
Sergio Sanchis Climent
8556dab68e NEW: #5830 2016-10-13 16:44:17 +02:00
Laurent Destailleur
6ac39b97e4 Fix restore list of attached files into action report 2016-10-03 00:38:28 +02:00
Laurent Destailleur
fac946dbb8 FIX The email test sender in email setup was broken 2016-09-26 14:08:14 +02:00
frederic34
1a552cbd16 typo 2016-04-19 18:27:56 +02:00
frederic34
60ebc6fa11 Some correction for testconnect 2016-04-18 00:47:08 +02:00
frederic34
75127638a4 Embed images 2016-04-17 10:28:21 +02:00
frederic34
567dc1734e Add Swift Mailer to send mails 2016-04-16 18:15:03 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00