Commit graph

151292 commits

Author SHA1 Message Date
yannis
2707e0660e feat: improve tab titles and trans 2025-07-07 16:12:24 +02:00
yannis
c24877a641 feat: add link back to list of token and to list of users 2025-07-07 15:59:42 +02:00
yannis
f211cc832d feat: added tpl for token lists 2025-07-07 15:54:52 +02:00
yannis
a118d9cb91 Merge branch 'new-api-rest-tokens-sql' of github.com:YannisHoareau/dolibarr into new-api-rest-tokens-sql 2025-07-07 14:21:40 +02:00
yannis
debd336f96 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new-api-rest-tokens-sql 2025-07-07 14:20:41 +02:00
yannis
625c323f76 feat: leave state field empty 2025-07-07 14:20:24 +02:00
yannis
58c3439abb Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new-api-rest-tokens 2025-07-07 12:17:58 +02:00
yannis
9af9bbfa3b feat: disable choosing token user for admin if creating from his list 2025-07-07 12:14:32 +02:00
yannis
366b0f231e feat: disable token filter in lists 2025-07-07 11:39:15 +02:00
yannis
2d7526a53f feat: remove unecessary url param 2025-07-07 11:06:56 +02:00
yannis
d9892a907c feat: improve display of user in admin token list 2025-07-07 10:57:12 +02:00
yannis
0cc77bb35d feat: disable token tab if api mod not enabled 2025-07-07 10:39:50 +02:00
Laurent Destailleur
1e7d7f67fc Debug v22 2025-07-06 22:50:27 +02:00
Laurent Destailleur
6378726514 Fix warning 2025-07-06 18:28:23 +02:00
Laurent Destailleur
feba6a4579 Close #34623 2025-07-06 18:19:20 +02:00
Laurent Destailleur
072b30f5f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-06 18:02:23 +02:00
Laurent Destailleur
a23ad6e91b Fix label of fieldand tooltip 2025-07-06 18:00:46 +02:00
HENRY Florian
ee294917e1
fix: bad date management on update in time spent list if column is not displayed (#34511)
* fix: if column date is missing in tasktime, line update failed with Data mandatory

* fix: if column date is missing in tasktime list, line update failed with Data mandatory

* fix: remove badd php comment

* Update time.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-06 13:51:42 +03:00
Frédéric FRANCE
38203fd694
add substitutions for year of previous or next month (#34691)
* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-06 13:45:11 +03:00
Laurent Destailleur
dda0849a46 Clean code 2025-07-05 22:58:39 +02:00
Laurent Destailleur
ebf4548616 Clean code 2025-07-05 22:52:27 +02:00
Laurent Destailleur
5af8569805 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-05 22:49:43 +02:00
Laurent Destailleur
f047007c19 Clean code 2025-07-05 22:48:36 +02:00
F-Node-Karlsruhe
1956776415
Allow email claim in oidc (#34669)
* allow email claim in oidc

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>

* switch to allow mail address in login

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>

* revert back to first draft

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>

---------

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-05 20:11:47 +03:00
Laurent Destailleur
bf470c4b5d Fix CI 2025-07-05 18:40:14 +02:00
Laurent Destailleur
7d02de2abf Fix CI 2025-07-05 16:04:56 +02:00
Laurent Destailleur
d05a9bbc28 Debug v22 2025-07-05 13:38:17 +02:00
Laurent Destailleur
0923600aee Fix CI 2025-07-05 13:12:17 +02:00
Laurent Destailleur
1380b94fb0 Fix CI 2025-07-05 13:02:17 +02:00
Laurent Destailleur
4f679f06d7 Fix CI 2025-07-05 12:41:00 +02:00
Laurent Destailleur
6748d3a14b Fix CI 2025-07-05 12:31:08 +02:00
Laurent Destailleur
84879c15e9 Fix CI 2025-07-05 12:09:45 +02:00
Laurent Destailleur
b70943db59 Fix typo 2025-07-05 11:45:25 +02:00
Laurent Destailleur
ce91aed92c Fix warning 2025-07-05 11:36:56 +02:00
Laurent Destailleur
6b68f5aad0 Fix CI 2025-07-05 11:33:46 +02:00
Laurent Destailleur
fcad7d7a4b
Merge branch 'develop' into new-api-rest-tokens-sql 2025-07-05 12:14:09 +03:00
Laurent Destailleur
fba47cba19 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-07-05 10:53:05 +02:00
Laurent Destailleur
4cbc1e012d Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-05 10:51:22 +02:00
Lucas Marcouiller
7572b33f6f
Fix clean code + phan warnings (#34688)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-05 10:49:56 +02:00
Laurent Destailleur
beac067e55 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-05 10:46:39 +02:00
Laurent Destailleur
5634483720 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-05 10:46:06 +02:00
Laurent Destailleur
af6076352c Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-07-05 10:44:49 +02:00
Laurent Destailleur
704173f4a6 FIX #34591 FIX #34692 2025-07-05 10:32:59 +02:00
Laurent Destailleur
75593e84b2 FIX #34591 FIX #34692 2025-07-05 10:21:25 +02:00
Laurent Destailleur
dff214402e Fix warning 2025-07-05 01:21:45 +02:00
Laurent Destailleur
53cf9f0bf1 Doc 2025-07-05 00:40:19 +02:00
Laurent Destailleur
e7592d6ea9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-05 00:14:58 +02:00
Laurent Destailleur
fe19745458 Add warning to avoid confusion. 2025-07-05 00:14:23 +02:00
Laurent Destailleur
7b8601d485
Update card.php 2025-07-04 20:29:29 +03:00
Frédéric FRANCE
31517fdc9c
situation_counter is nullable (#34693)
* situation_counter is nullable

* Update phpstan-baseline.neon
2025-07-04 20:07:03 +03:00