Commit graph

128181 commits

Author SHA1 Message Date
Laurent Destailleur
a2df2f2553 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-15 11:33:16 +01:00
Laurent Destailleur
085f7c2796
Merge pull request #27521 from libremaster/develop
File not joined : slash is missing in case DOL_DATA_ROOT doesn't end with a slash
2024-01-15 11:32:52 +01:00
Laurent Destailleur
dc9fa8a6e0
Merge pull request #27516 from frederic34/patch-3
fix phpstan
2024-01-15 11:31:31 +01:00
Laurent Destailleur
c2b29b9343
Merge pull request #27515 from frederic34/patch-1
fix phpstan
2024-01-15 11:31:15 +01:00
Laurent Destailleur
315b6850a9
Merge pull request #27514 from frederic34/patch-8
fix phpstan
2024-01-15 11:30:58 +01:00
Laurent Destailleur
3a8b3f9158
Merge pull request #27527 from W1W1-M/fix-resource-phpstan
Fix resource phpstan
2024-01-15 11:28:45 +01:00
Laurent Destailleur
3ac7706a63 Clean code 2024-01-15 11:28:25 +01:00
Laurent Destailleur
179cd86cec
Merge pull request #27520 from frederic34/patch-10
fix phpstan
2024-01-15 11:04:20 +01:00
Laurent Destailleur
f47a30bd2f
Merge pull request #27526 from frederic34/patch-12
fix phpstan
2024-01-15 11:02:53 +01:00
William Mead
136e1431e4 Merge remote-tracking branch 'origin/fix-resource-phpstan' into fix-resource-phpstan
# Conflicts:
#	htdocs/resource/class/html.formresource.class.php
2024-01-15 09:43:41 +01:00
William Mead
cc4cf8bf0d Updated PHPDoc 2024-01-15 09:42:39 +01:00
William Mead
8d0f013378
Merge branch 'develop' into fix-resource-phpstan 2024-01-15 09:25:50 +01:00
Frédéric FRANCE
f03a8fdc65
fix phpstan 2024-01-15 09:20:57 +01:00
William Mead
19f7fa0030 Fixed selected default value 2024-01-15 09:18:18 +01:00
Laurent Destailleur
abb4bed44e Fix phpstan 2024-01-15 03:18:59 +01:00
Laurent Destailleur
1bd3777a80 Fix phpstan 2024-01-15 03:16:05 +01:00
Laurent Destailleur
699f0889c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-01-15 03:08:38 +01:00
Laurent Destailleur
d85ab489f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-15 02:54:59 +01:00
Laurent Destailleur
c94165067c Swith to level 3 of phpstan 2024-01-15 02:54:44 +01:00
Christophe TREMBLAY-GUILLOUX
25de0779b2 File not joined : slash is missing in case DOL_DATA_ROOT doesn't end with slash 2024-01-14 22:57:16 +01:00
Frédéric FRANCE
13c9707c9d
fix phpstan 2024-01-14 22:34:37 +01:00
Frédéric FRANCE
df48eb6032
fix phpstan 2024-01-14 22:23:50 +01:00
Frédéric FRANCE
459c07abd8
fix phpstan 2024-01-14 22:22:10 +01:00
Frédéric FRANCE
18861291a0
fix phpstan 2024-01-14 22:05:43 +01:00
Laurent Destailleur
ac6e8c8cd3
Merge pull request #27512 from frederic34/patch-7
fix phpstan
2024-01-14 21:59:21 +01:00
Laurent Destailleur
95330a93f8
Merge pull request #27510 from frederic34/patch-3
fix phpstan
2024-01-14 21:59:12 +01:00
Laurent Destailleur
08588cb949
Merge pull request #27513 from mdeweerd/fix/github_lines_byuser
Fix: github_lines_byuser.sh - resolve issue with iconv
2024-01-14 21:59:04 +01:00
Laurent Destailleur
72fb927742
Merge pull request #27511 from frederic34/patch-5
fix phpstan
2024-01-14 21:57:39 +01:00
Laurent Destailleur
af9f14337c
Merge pull request #27509 from frederic34/patch-1
fix phpstan
2024-01-14 21:57:31 +01:00
MDW
dfc263ced5 Fix: github_lines_byuser.sh - resolve issue with iconv
# Fix: github_lines_byuser.sh - resolve issue with iconv

iconv could not convert certain characters and truncated the output.
That is fixed.
The script was improved by adding a variable, cleaning up and hence
also fixing shellcheck warnings.
2024-01-14 21:56:47 +01:00
Laurent Destailleur
0a97dcc7b5 Clean dolibarr about page 2024-01-14 21:48:35 +01:00
Laurent Destailleur
4352a0203c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-14 21:37:24 +01:00
Laurent Destailleur
5599ac733b QUAL: Remove the external js library jstimezonedetect 2024-01-14 21:37:04 +01:00
Laurent Destailleur
5577cfbb26 Update jstz 2024-01-14 21:20:57 +01:00
Frédéric FRANCE
8a5d40b749
fix phpstan 2024-01-14 21:12:52 +01:00
Frédéric FRANCE
edf3b996de
fix phpstan 2024-01-14 21:00:18 +01:00
Frédéric FRANCE
08bc6996c9
fix phpstan 2024-01-14 20:57:26 +01:00
Laurent Destailleur
870ea8de9f
Merge pull request #27222 from glu000/develop-fix-27221
New Feature: E-Mailcollector: Save attachments on operation "recordevent" for tickets
2024-01-14 20:56:58 +01:00
Laurent Destailleur
c3c1ba7f49 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-14 20:56:13 +01:00
Laurent Destailleur
0794a9d052 Add migration v20 in travis script 2024-01-14 20:55:59 +01:00
Frédéric FRANCE
866753d87e
fix phpstan 2024-01-14 20:53:22 +01:00
Laurent Destailleur
74a5dec370
Merge pull request #27507 from mdeweerd/logToCs/yamllint-extraction
Qual: Update logToCs to extract yamllint messages
2024-01-14 20:46:21 +01:00
MDW
139b338dff Qual: Update logToCs to extract yamllint messages
# Qual: Update logToCs to extract yamllint messages

logToCs did not identify the yamllint messages in the pre-commit action.
This is now added
2024-01-14 20:42:32 +01:00
Laurent Destailleur
13faae29ba
Merge branch 'develop' into develop-fix-27221 2024-01-14 20:34:54 +01:00
Laurent Destailleur
1600c985da Fix phpcs 2024-01-14 20:34:25 +01:00
Laurent Destailleur
299f13cbf0 Fix input lost 2024-01-14 20:24:37 +01:00
Laurent Destailleur
d6509a7d27
Merge branch 'develop' into develop-fix-27221 2024-01-14 19:52:26 +01:00
Laurent Destailleur
3d8436c74a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-14 19:43:12 +01:00
Laurent Destailleur
b20838077b Try to merge the 2 phpstan files 2024-01-14 19:42:54 +01:00
Laurent Destailleur
b427b4dfd7
Merge pull request #27506 from mdeweerd/fix/notfound-message
Fix: tools: Small fix with regards to path issue detection
2024-01-14 19:41:14 +01:00