217 Commits

Author	SHA1	Message	Date
Laurent Destailleur	5b49021bb4	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0	2022-11-16 20:20:34 +01:00
Laurent Destailleur	23feae3ee2	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0	2022-11-16 20:07:51 +01:00
VESSILLER	10154cc357	FIX remove not initialized variable	2022-11-16 11:05:39 +01:00
VESSILLER	6e33d1e2b1	FIX merge errors on mailing card	2022-11-16 10:48:25 +01:00
Laurent Destailleur	8ac625f03b	FIX reading of trackid in emailcollector (when on recipient suffix)	2022-09-12 10:26:20 +02:00
Laurent Destailleur	71045cbe83	Fix popup message	2022-07-13 14:00:19 +02:00
Laurent Destailleur	97acf949fc	Clean message on email limit	2022-07-13 13:39:16 +02:00
Laurent Destailleur	24dc936000	Revert "default to create on card.php if $action is empty" ... This reverts commit e0b664066b.	2022-07-11 00:05:50 +02:00
Christian Foellmann	e0b664066b	default to create on card.php if $action is empty	2022-07-11 00:01:42 +02:00
Frédéric France	287f868fbb	use getDolGlobalString	2022-06-22 08:36:24 +02:00
Laurent Destailleur	8ee30e067f	Rename var	2022-06-20 02:23:37 +02:00
Laurent Destailleur	e97f021380	Fix #yogosha11295	2022-06-19 19:02:16 +02:00
Laurent Destailleur	4b996f79a9	Debug v16	2022-05-19 13:52:29 +02:00
Laurent Destailleur	e96061dd18	Fix phpunit SecurityTest	2022-02-22 23:46:57 +01:00
Laurent Destailleur	60b90056c4	Fix #yogosha8450	2022-01-19 15:20:10 +01:00
Laurent Destailleur	8e2f76ca66	Merge pull request #17577 from OGPayet/feature/addThirdpartyCustomerCodeToEmailingSubstitutionArray ... add thirdparty customer code to substitutionarray	2022-01-11 13:31:32 +01:00
Laurent Destailleur	54cf91eda4	Update card.php	2022-01-11 13:31:16 +01:00
Christian Foellmann	6608f5f0d8	update all script tags to be uniform. language="javascript" removed ... https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language	2021-11-29 15:09:18 +01:00
Laurent Destailleur	441af6b6fb	Fix add rel="noopener noreferrer"	2021-11-22 02:35:55 +01:00
Laurent Destailleur	f8010dfcbc	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/reception/list.php htdocs/takepos/pay.php	2021-10-16 13:01:03 +02:00
lvessiller	be4a00213c	FIX optional visibility on create card	2021-10-08 15:58:08 +02:00
Alexandre SPANGARO	c57aea1ead	HTML5 - <font> tag is deprecated, replace by <span>	2021-10-05 09:10:37 +02:00
Christian Foellmann	08b395e127	another set of cleanup for action buttons	2021-09-22 08:43:30 +02:00
Laurent Destailleur	1d597e8a72	Fix add unset* action as sensible GET actions	2021-09-19 18:03:38 +02:00
Laurent Destailleur	0749d01c5a	Fix add action delete* as sensitive action	2021-09-18 22:04:41 +02:00
Laurent Destailleur	2f225ee7e5	Clean code by adding cast int.	2021-08-27 16:33:03 +02:00
Laurent Destailleur	3dff7e29cc	Fix #yogosha6567	2021-07-06 01:44:05 +02:00
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
Laurent Destailleur	a4f4cca895	Prefix length may have different length and be at a different place so i remove this tag. Must be replaced by a generic method to substring a substitution variable.	2021-05-17 08:36:49 +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
Pierre Payet	4ce81ee535	set new outside the loop, add fetch result check	2021-05-11 20:30:57 +02:00
Pierre Payet	ff178667a3	add thirdparty customer code to substitutionarray	2021-05-11 12:33:35 +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