Commit Graph

645 Commits

Author SHA1 Message Date
Laurent Destailleur
747cd766b0 FIX Pb in install when password start with some special char like ! 2023-04-15 04:29:19 +02:00
Laurent Destailleur
f39bf7a43c Debug v17 2023-03-17 19:09:31 +01:00
Laurent Destailleur
751f79b672 Debug v17 2022-12-31 14:21:16 +01:00
Laurent Destailleur
c62c7e3805 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
2022-11-26 01:43:09 +01:00
Laurent Destailleur
b231bcb64a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
2022-11-26 01:21:51 +01:00
Laurent Destailleur
85e9ac1e40 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:13:58 +01:00
IC-Ilies
b5ab1f612c FIX#19828 2022-11-25 22:29:35 +01:00
fboitel
00f5a2ddc8 Merge branch 'Dolibarr:develop' into FIX-SECURITY-Fail2ban-public-pages 2022-11-24 19:10:35 +01:00
Faustin
6e4eeb8b3c Limit member subscription on public page by ip adress 2022-11-24 14:26:50 +01:00
Laurent Destailleur
dd50854b05 Fix log 2022-11-23 18:58:17 +01:00
Laurent Destailleur
4d11b5db31 Fix error management 2022-11-23 18:52:43 +01:00
Laurent Destailleur
b42b0ef841 Fix error management 2022-11-23 18:49:59 +01:00
Laurent Destailleur
fb2b4ea388 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-23 17:07:36 +01:00
Laurent Destailleur
d0ac102bd0 Debug v17 2022-11-23 17:07:11 +01:00
Laurent Destailleur
1a8dbd75ea Fix update socialnetworks 2022-11-23 16:59:40 +01:00
Laurent Destailleur
4890a2ada3 Debug v17 2022-11-04 11:37:28 +01:00
Laurent Destailleur
a52de14003 Debug hrm module 2022-10-20 22:56:07 +02:00
Laurent Destailleur
96bf7016c7 Fix filter on membership status and graph 2022-10-13 04:25:20 +02:00
Philippe GRAND
e0ca87516f update code toward php8 compliance 2022-09-24 14:35:45 +02:00
Laurent Destailleur
b69031e979 Fix php8.1 2022-09-21 03:23:03 +02:00
Laurent Destailleur
7c7ccc2393 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 01:45:59 +02:00
Laurent Destailleur
fb60c100e5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 01:39:52 +02:00
Laurent Destailleur
3177a065cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-09 01:31:43 +02:00
Alexandre SPANGARO
9a5927d833 FIX Column label 2022-09-06 05:30:35 +02:00
Laurent Destailleur
a67008f7e9 Merge pull request #22058 from grandoc/16.0
FIX : bug#22057
2022-09-03 11:38:36 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
00da52ef8c fix php8 warnings 2022-08-31 22:12:25 +02:00
ptibogxiv
9d57680d82 FIX double fix 2022-08-31 20:14:54 +02:00
Laurent Destailleur
a5c18ea776 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-31 17:57:14 +02:00
Laurent Destailleur
dc08b96444 Fix phpcs 2022-08-31 17:17:43 +02:00
ptibogxiv
30475a8ce6 Fix updating member
need functions2.lib.php for clean_url()
2022-08-31 15:41:25 +02:00
stickler-ci
a7529c171d Fixing style errors. 2022-08-30 15:33:18 +00:00
ptibogxiv
0f4c59689d Fix updating member
need functions2.lib.php for clean_url()
2022-08-30 17:26:18 +02:00
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
2022-08-12 16:03:09 +02:00
Laurent Destailleur
059d0073ff FIX Maxi debug v16 2022-08-12 15:54:50 +02:00
Laurent Destailleur
2d8b544ace Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
2022-08-12 12:19:20 +02:00
Laurent Destailleur
110f7a4736 Debug v16 2022-08-12 12:17:49 +02:00
ptibogxiv
65629121f8 update 2022-08-07 10:14:40 +02:00
Anthony Berton
cfc9819e49 FIX - strlower for email 2022-07-28 15:13:13 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Laurent Destailleur
bedb08df50 Clean and debug online payment code 2022-04-08 15:15:55 +02:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
2022-02-28 20:12:28 +01:00
Laurent Destailleur
b9649632fa Fix update 2022-02-28 11:53:29 +01:00
Laurent Destailleur
3b6f7bff66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 16:32:51 +01:00
Laurent Destailleur
3d9cdbf136 FIX Debug v15 2022-02-18 16:24:11 +01:00
Frédéric FRANCE
dad73b755e fix merge 2022-02-15 18:46:41 +01:00
Frédéric FRANCE
0ba912b1e5 add missing global 2022-02-15 18:14:44 +01:00