Commit Graph

896 Commits

Author SHA1 Message Date
Laurent Destailleur
48eb82a5bd
Merge pull request #23254 from lamrani002/KanbanViewForAdherent
NEW Kanban view for list of adherents
2023-01-11 11:07:04 +01:00
Laurent Destailleur
de0cb53313
Merge pull request #23263 from lamrani002/kanbanAdherenType
New mode view for adherent type List
2023-01-04 17:51:12 +01:00
Laurent Destailleur
e5f17a8db7
Merge pull request #23257 from lamrani002/kanbanViewSubscribe
New Kanban view for subscribe list
2023-01-04 17:50:30 +01:00
Laurent Destailleur
ba6374e6be Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-03 15:31:00 +01:00
Laurent Destailleur
8d4e973e00 Fix warnings 2023-01-03 15:29:49 +01:00
Laurent Destailleur
e523c04ce7 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-31 14:25:11 +01:00
Laurent Destailleur
751f79b672 Debug v17 2022-12-31 14:21:16 +01:00
Laurent Destailleur
f6e8d13e1f FIX stats page for donation 2022-12-27 21:04:48 +01:00
Laurent Destailleur
edad39a93b FIX stats page for donation 2022-12-27 21:02:21 +01:00
Lamrani Abdel
061ef892b2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into KanbanViewForAdherent
resolve the conflict in project.lib
2022-12-22 14:49:13 +01:00
Laurent Destailleur
7e05743edc
Merge branch 'develop' into kanbanViewSubscribe 2022-12-22 14:28:57 +01:00
lamrani abdelwadoud
7833efe613
Merge branch 'develop' into kanbanAdherenType 2022-12-22 11:16:51 +01:00
Laurent Destailleur
b281924f03
Merge pull request #23279 from frederic34/fixwarnings
fix warnings
2022-12-21 20:01:48 +01:00
stickler-ci
46ac466d3c Fixing style errors. 2022-12-21 16:08:34 +00:00
Frédéric FRANCE
690562c22e add numbering modules for members 2022-12-21 16:43:38 +01:00
Frédéric FRANCE
3680f20465 use user->hasRight 2022-12-21 08:41:19 +01:00
Frédéric FRANCE
9ecf353342 fix warnings 2022-12-20 17:57:19 +01:00
Lamrani Abdel
a849283e37 update return type 2022-12-20 12:41:54 +01:00
Lamrani Abdel
aed3f841bc New View mode for Adherent Type list 2022-12-20 11:27:55 +01:00
Lamrani Abdel
0c75e5bb2d mode Kanban for subscription list 2022-12-19 15:19:18 +01:00
Lamrani Abdel
abd5a86f34 mode Kanban for subscription list 2022-12-19 15:19:12 +01:00
Lamrani Abdel
f90b887ec2 NEW mode view for list adherent 2022-12-19 13:48:08 +01:00
Laurent Destailleur
7510ed68a8 Debug v17 2022-12-09 16:34:32 +01:00
Laurent Destailleur
c22d9f282a
Merge pull request #23016 from inovea-conseil/FIX_product_type9
FIX product_type 9
2022-11-30 00:41:35 +01:00
Laurent Destailleur
7884216197
Merge pull request #23003 from rycks/14_fix_api_status_on_delete
fix #22766: better API response HTTP code
2022-11-26 10:26:21 +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
stickler-ci
3fd81293a3 Fixing style errors. 2022-11-25 23:57:35 +00:00
Eric Seigne
616e2b79ef fix #22766: better API response HTTP code 2022-11-26 00:50:45 +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
06d94c9a97 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-19 17:11:32 +02:00
Laurent Destailleur
babf1e0e27 Fix doc 2022-10-17 01:55:57 +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
Philippe GRAND
9027e2b96b update code toward php8 compliance 2022-09-09 10:28:00 +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