Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
100,555 Commits 35 Branches 179 Tags 1.7 GiB
c03958a867
Commit Graph

187 Commits

Author SHA1 Message Date
Laurent Destailleur
5a3d7663d1
Merge pull request #17764 from Hystepik/develop#3 
Fix of a bug on mass mailing
 2021-06-04 12:32:48 +02:00
lmarcouiller
c77dee0922 changes to fetch after send 2021-06-04 12:27:50 +02:00
Laurent Destailleur
e73dad30bb Warning 2021-06-04 11:53:12 +02:00
lmarcouiller
05a966b93e Fix of a bug on mass mailing 2021-05-28 10:29:46 +02:00
lmarcouiller
06c1817930 Update mailing-send script and mailling card 2021-05-12 09:21:28 +02:00
lmarcouiller
cd4583a841 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-12 09:08:19 +02:00
Laurent Destailleur
91312f0411 Fix url for emailing unsubscribe 2021-05-11 21:13:52 +02:00
Laurent Destailleur
dc2c5aa0a8 Add substitution __UNSUBSCRIBE_URL__ for link to unsubscribe 
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/theme/eldy/global.inc.php
	htdocs/theme/eldy/info-box.inc.php
 2021-05-11 21:02:27 +02:00
daraelmin
22d9c4c166
Update card.php 2021-05-08 09:35:41 +02:00
daraelmin
2e1158934b
Copyright 2021-05-08 09:20:59 +02:00
daraelmin
33d68db9a1
add entity in new subst publiclink_newmemberform 2021-05-08 09:18:41 +02:00
daraelmin
7c27e9f931
too much underscore 2021-05-07 17:19:33 +02:00
daraelmin
0173d8db5f
Add substitution key for membernewform url in mailing 2021-05-07 17:09:59 +02:00
lmarcouiller
b41a87ff70 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 12:06:46 +02:00
lmarcouiller
0f2ce8687d Fix #17475 : Update of previous fix 2021-05-07 09:19:44 +02:00
daraelmin
866857c111
Html link instead of url in substitutionarray 2021-05-04 21:57:59 +02:00
lmarcouiller
457a96bc34 Fix #17475 : Add of List-Unsubscribe in mass emailing 2021-05-04 15:11:30 +02:00
daraelmin
034378a958
Add online substitution keys link in mailing 2021-05-04 00:58:29 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
6fc19c626d Try fix for #17094 2021-04-04 17:05:01 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
ce5bea7b34 FIX #yogosha5751 2021-03-29 22:43:39 +02:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Laurent Destailleur
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
 2021-03-05 19:29:09 +01:00
Laurent Destailleur
3cfcad284b Fix unsubscribe to MLs 2021-03-05 17:48:55 +01:00
Frédéric FRANCE
5931051c88
code syntax comm directory 2021-02-23 18:59:19 +01:00
Frédéric FRANCE
12f4a74a74
Merge remote-tracking branch 'upstream/develop' into mailingcard 2020-12-27 14:04:04 +01:00
Laurent Destailleur
58cd7c97a5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/mailing/card.php
	htdocs/comm/mailing/cibles.php
	htdocs/comm/mailing/class/mailing.class.php
 2020-12-24 13:05:17 +01:00
Laurent Destailleur
739695c442 Fix delay to wait between email for emailing refused float. 2020-12-24 12:49:17 +01:00
Frédéric FRANCE
cb77d9f175
Merge remote-tracking branch 'upstream/develop' into mailingcard 2020-12-09 08:55:46 +01:00
Laurent Destailleur
3b55eb1d82 FIX master must be after session_start but dol_getprefix must be before 
and after filefunc.inc.php.
 2020-12-05 13:26:58 +01:00
Frédéric FRANCE
ba352c2374
remove warnings 2020-11-27 20:20:04 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
8074d2cc1d NEW Add validation of MX domain for emails 2020-10-22 20:01:59 +02:00
Givriz
c50e288a07 Correction de commentaires 
Correction de commentaires (passage de français à anglais ou correction d'un mauvais anglais).
 2020-10-14 18:26:05 +02:00
Laurent Destailleur
eb41a72e27 Properties ->titre have been renamed into ->title 2020-10-07 17:41:36 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
eb36c3f144 Fix must use GETPOST 2020-09-19 02:27:32 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
d700649fb9 The deprecated subsitution key __SIGNATURE__ has been removed. Replace 
with __USER_SIGNATURE__ if you still use old syntax in your email
templates.
 2020-09-06 19:25:25 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +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
Laurent Destailleur
44d36815bd Look and feel v12 2020-05-11 19:00:27 +02:00