Commit Graph

23258 Commits

Author SHA1 Message Date
Laurent Destailleur
ebb4f03788 Prepare public page for autocreate contact-lead 2021-02-24 12:19:28 +01:00
Laurent Destailleur
822bfc957c
Merge pull request #16368 from FHenry/dev_EventOrganisation_draft
NEW : Tab on project for Event Organization #FoundationFunding
2021-02-23 12:09:00 +01:00
Florian HENRY
fa65956801 Merge branch 'develop' into dev_EventOrganisation_draft 2021-02-22 21:02:22 +01:00
daraelmin
29b1f10fd4
Fix #16096 #16085 missing CSRF token 2021-02-22 17:33:54 +01:00
Laurent Destailleur
9e5e31dec9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:33 +01:00
Laurent Destailleur
f6080d45fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:26 +01:00
Laurent Destailleur
b674ebad88 Responsive 2021-02-22 16:21:05 +01:00
Laurent Destailleur
912f9f9bdb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/contact/card.php
	htdocs/core/actions_massactions.inc.php
2021-02-22 15:54:24 +01:00
Laurent Destailleur
eee936b91c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-22 15:51:16 +01:00
Laurent Destailleur
c010cab47e Fix translation of default value for contacts 2021-02-22 15:51:00 +01:00
Laurent Destailleur
7677edf41d
Merge pull request #16357 from bb2a/ADD_SUBSTITUTION_DELIVRY_DATE
Add substitution for delivry date
2021-02-22 14:23:37 +01:00
Frédéric FRANCE
84a5f69834
fix propal sqls 2021-02-22 13:14:13 +01:00
Frédéric FRANCE
58f301389c
fix box activity 2021-02-22 12:08:22 +01:00
Laurent Destailleur
122538ca51 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 11:51:55 +01:00
Laurent Destailleur
38465ea591 Fix website editor 2021-02-22 11:51:43 +01:00
Laurent Destailleur
0be001c70b
Merge pull request #16374 from aspangaro/14a21
Code enhanced - Standardize field name #14697
2021-02-22 11:40:55 +01:00
Anthony Berton
566c3ada55 Update functions.lib.php 2021-02-22 11:30:00 +01:00
Laurent Destailleur
c227275c55
Merge pull request #16379 from danielprowald/develop
CLOSE #16378 More E-Mail Contact substitution Values for better salutation
2021-02-22 11:20:03 +01:00
Laurent Destailleur
2673e93dfc
Update card_presend.tpl.php 2021-02-22 11:19:47 +01:00
Laurent Destailleur
f99232e66e
Merge branch 'develop' into 14a21 2021-02-22 11:18:07 +01:00
Daniel
7bbf1b4841 Fix Formatting 2021-02-22 10:04:29 +01:00
Daniel
38e1264588 For more flexible salutation in some languages the folloing Variables
are availible

__CONTACT_LASTNAME_XXX__
__CONTACT_FIRSTNAME_XXX__
__CONTACT_SALUTATION_XXX__
2021-02-22 09:56:48 +01:00
Alexandre SPANGARO
267b095786 Fix import/export 2021-02-22 06:09:33 +01:00
Alexandre SPANGARO
dfb6490bb4 Fix export 2021-02-22 05:24:39 +01:00
Alexandre SPANGARO
116a491ae1 Revert "Fix export"
This reverts commit 01e351e87e.
2021-02-22 05:23:02 +01:00
Alexandre SPANGARO
01e351e87e Fix export 2021-02-22 05:19:48 +01:00
Alexandre SPANGARO
71ce871da6 Fix element 2021-02-22 05:13:14 +01:00
Anthony Berton
3256a17280 Update functions.lib.php 2021-02-21 23:52:22 +01:00
Alexandre SPANGARO
818a826c3e Code enhanced - Standardize field name 2021-02-21 22:10:00 +01:00
Alexandre SPANGARO
2cd181b86d Code enhanced - Standardize field name #14697 2021-02-21 22:07:58 +01:00
Alexandre SPANGARO
ddea3f8a92 Code enhanced - Standardize field name #14697 2021-02-21 21:47:26 +01:00
Laurent Destailleur
e3419df36e
Merge branch 'develop' into 14a20 2021-02-21 20:28:06 +01:00
Laurent Destailleur
97ce13bf84
Merge pull request #16369 from frederic34/doltrunc
replace ... by one char in dol_trunc
2021-02-21 20:16:07 +01:00
Laurent Destailleur
c9f67b27b2
Merge pull request #16364 from frederic34/memcacheexpire
memcached can set expire
2021-02-21 20:14:09 +01:00
Laurent Destailleur
4bf7c89d4e
Merge pull request #16363 from frederic34/patch-2
fix propal box
2021-02-21 19:19:08 +01:00
Laurent Destailleur
1e62a1a13f
Merge pull request #16359 from aspangaro/14a19
Code enhanced - Standardize field name #14697
2021-02-21 19:18:33 +01:00
Frédéric FRANCE
71d32a7422
fix tests 2021-02-21 15:59:19 +01:00
Frédéric FRANCE
5ceb8163de
fix tests 2021-02-21 15:40:03 +01:00
Laurent Destailleur
0a7e692fbf Wip website module 2021-02-21 14:46:52 +01:00
Frédéric FRANCE
548820011a
fix tests 2021-02-21 13:39:59 +01:00
Frédéric FRANCE
6e3a1a1d41
fix tests 2021-02-21 13:32:54 +01:00
Frédéric FRANCE
d3a98c7680
replace ... by one char in dol_trunc 2021-02-21 13:00:31 +01:00
Florian HENRY
be34fb4541 tab event ok 2021-02-21 12:32:16 +01:00
Frédéric FRANCE
5096c5bf2d
cache socialnetworks array 2021-02-21 10:18:05 +01:00
Frédéric FRANCE
41b89ae677
add files and links 2021-02-21 09:50:58 +01:00
Florian HENRY
556ba2b369 statart card 2021-02-20 23:17:48 +01:00
Frédéric FRANCE
518826ad3d
add project 2021-02-20 22:03:11 +01:00
Frédéric FRANCE
65925e60b9
memcached can set expire 2021-02-20 20:48:59 +01:00
Frédéric FRANCE
da37497a38
memcached can set expire 2021-02-20 20:47:01 +01:00
Laurent Destailleur
91d0652476 Clean code of cache 2021-02-20 18:32:16 +01:00