Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
95,795 Commits 36 Branches 189 Tags
9d8ec0441b7614c43fa4336d0ecda1aa3cb15ffe
Commit Graph

23424 Commits

Author SHA1 Message Date
Regis Houssin
0a3d1ab92e FIX use var "saved_url" instead global var "$url" 2021-02-23 16:56:45 +01:00
Regis Houssin
ec5d9983e0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 
fix_avoid_missing_url_and_token

Conflicts:
	htdocs/core/js/lib_head.js.php
 2021-02-23 16:55:32 +01:00
Gauthier PC portable 024
c0160a5f3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:20:15 +01:00
Laurent Destailleur
b7e2c7d87a FIX #16393 Do not sanitize <!DOCTYPE html> 2021-02-23 12:58:43 +01:00
Frédéric FRANCE
f50ce6f91f add cache on project head 2021-02-23 12:19:49 +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
Laurent Destailleur
d2e1f9fce9 FIX #16096 #16085 Any call of ajax pages must provide the token 2021-02-23 11:13:57 +01:00
Regis Houssin
77cecf58ce Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into fix_avoid_missing_url_and_token 2021-02-23 11:10:32 +01:00
Laurent Destailleur
34dcebea78 Code comment 2021-02-23 11:03:34 +01:00
Regis Houssin
7c32e43c68 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into fix_avoid_missing_url_and_token 2021-02-23 08:19:18 +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
Gauthier PC portable 024
939d406ab1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:10:24 +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