Laurent Destailleur
|
5f3596ef3e
|
Merge branch 'develop' into 20201027_phpcs
|
2020-10-28 17:08:15 +01:00 |
|
Laurent Destailleur
|
393efed01f
|
Merge pull request #15196 from ppenelon/develop
New Handle proposals upload in documents API
|
2020-10-28 17:07:21 +01:00 |
|
Laurent Destailleur
|
9a85441c61
|
Fix phpcs
|
2020-10-28 17:06:30 +01:00 |
|
Laurent Destailleur
|
ef59b71cdf
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/class/product.class.php
htdocs/product/stats/card.php
|
2020-10-28 17:02:20 +01:00 |
|
Laurent Destailleur
|
f02a35d398
|
Fix bad array when year is not defined into graph stat of products
|
2020-10-28 16:47:00 +01:00 |
|
Laurent Destailleur
|
6363a6cd60
|
Fix sanitize
|
2020-10-28 14:11:46 +01:00 |
|
Laurent Destailleur
|
47dfe633f9
|
Fix filter on date on statistics of products
|
2020-10-28 13:19:35 +01:00 |
|
Pierre Penelon
|
63c5c41a7b
|
ADD Handle proposals upload in documents API
|
2020-10-28 01:47:25 +01:00 |
|
Pierre Penelon
|
8532135630
|
Merge pull request #2 from Dolibarr/develop
Update from master
|
2020-10-28 01:44:58 +01:00 |
|
Frédéric FRANCE
|
7a7a6f8018
|
fix phpcs
|
2020-10-27 21:28:26 +01:00 |
|
Laurent Destailleur
|
f7c90d7e90
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-27 20:50:48 +01:00 |
|
Laurent Destailleur
|
039bc3c412
|
Fix phpunit
|
2020-10-27 20:50:33 +01:00 |
|
Laurent Destailleur
|
9595d56235
|
Merge pull request #15186 from fappels/13_fix_delete_product_ajax
Fix delete product using ajax
|
2020-10-27 20:03:00 +01:00 |
|
Laurent Destailleur
|
6e0ae82048
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-27 19:57:52 +01:00 |
|
Laurent Destailleur
|
33e56a2d7c
|
Fix decimal qty for #14666
|
2020-10-27 19:56:36 +01:00 |
|
Laurent Destailleur
|
d7a9e0f61a
|
Merge pull request #15185 from Dolibarr/scrutinizer-patch-1
Scrutinizer Auto-Fixes
|
2020-10-27 19:47:20 +01:00 |
|
Scrutinizer Auto-Fixer
|
a2a9c51e50
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-27 18:46:07 +00:00 |
|
Francis Appels
|
828df6c134
|
Fix delete product using ajax
|
2020-10-27 19:45:12 +01:00 |
|
Laurent Destailleur
|
ec6c735d89
|
Clean code
|
2020-10-27 19:44:15 +01:00 |
|
Laurent Destailleur
|
ebdc1f7457
|
Fix scrutinizer
|
2020-10-27 19:34:52 +01:00 |
|
Laurent Destailleur
|
f7de9333bb
|
Doxygen
|
2020-10-27 19:29:42 +01:00 |
|
Laurent Destailleur
|
f670f71df9
|
Fix scrutinizer
|
2020-10-27 19:14:03 +01:00 |
|
Laurent Destailleur
|
e10051800d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-27 19:06:58 +01:00 |
|
Laurent Destailleur
|
f54f67cae3
|
Fix sanitizing
|
2020-10-27 19:06:41 +01:00 |
|
Laurent Destailleur
|
7d291d075e
|
Merge pull request #15184 from frederic34/formcolor
formcolor parameter is deprecated
|
2020-10-27 19:03:29 +01:00 |
|
Laurent Destailleur
|
1b939ab8f4
|
Merge pull request #15183 from frederic34/dol_fiche_end
end of dol_fiche_end
|
2020-10-27 19:00:32 +01:00 |
|
Laurent Destailleur
|
358ac4cd36
|
Fix scrutinizer
|
2020-10-27 18:55:55 +01:00 |
|
Laurent Destailleur
|
e099507594
|
Fix regression
|
2020-10-27 18:53:03 +01:00 |
|
Frédéric FRANCE
|
900452a47d
|
formcolor parameter is deprecated
|
2020-10-27 18:46:42 +01:00 |
|
Laurent Destailleur
|
e10033143a
|
Fix bad var
|
2020-10-27 18:40:44 +01:00 |
|
Laurent Destailleur
|
2559489920
|
Fix
|
2020-10-27 18:38:13 +01:00 |
|
Laurent Destailleur
|
50cf7704fe
|
Log
|
2020-10-27 18:30:03 +01:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Laurent Destailleur
|
80d13e711c
|
More secured getURLContent method. Add PHPUnit on getURLContent
|
2020-10-27 18:02:05 +01:00 |
|
Laurent Destailleur
|
d750dc48a1
|
More secured getURLContent method. Add PHPUnit on getURLContent
|
2020-10-27 15:06:16 +01:00 |
|
Laurent Destailleur
|
7efbab88a8
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-27 12:49:30 +01:00 |
|
Laurent Destailleur
|
c6216eddd1
|
CSS
|
2020-10-27 12:49:14 +01:00 |
|
Laurent Destailleur
|
92f3137c3e
|
Merge pull request #15179 from frederic34/boxmembers
add small photo in box members
|
2020-10-27 11:55:32 +01:00 |
|
Laurent Destailleur
|
4adaf67d47
|
Hide setup we don't need if email are disabled globally
CSS
|
2020-10-27 11:40:30 +01:00 |
|
Laurent Destailleur
|
fe357e17e8
|
Fix for ja
|
2020-10-27 11:00:50 +01:00 |
|
Laurent Destailleur
|
56903d3677
|
Fix trans
|
2020-10-27 10:35:22 +01:00 |
|
Laurent Destailleur
|
16ac8a9d52
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-27 10:33:46 +01:00 |
|
Laurent Destailleur
|
8bcd704d9b
|
Disable notif as it is used as a frame
|
2020-10-27 10:32:25 +01:00 |
|
Laurent Destailleur
|
5943e784ec
|
Remove var_dump
|
2020-10-27 10:27:44 +01:00 |
|
Laurent Destailleur
|
00b49dba18
|
Fix label
|
2020-10-27 10:26:30 +01:00 |
|
Laurent Destailleur
|
ffc961599c
|
FIX error 500 on cash fence
|
2020-10-27 10:19:00 +01:00 |
|
Laurent Destailleur
|
19b82047f0
|
Fix sql
|
2020-10-27 10:00:35 +01:00 |
|
Frédéric FRANCE
|
6fc4b1b839
|
add small photo in box members
|
2020-10-27 08:17:12 +01:00 |
|
Laurent Destailleur
|
c81c3ec71a
|
Fix translation
|
2020-10-27 03:20:33 +01:00 |
|
Laurent Destailleur
|
e637b60b4b
|
Fix regression in language files
|
2020-10-27 03:04:53 +01:00 |
|