Commit Graph

7640 Commits

Author SHA1 Message Date
Laurent Destailleur
adec77e449 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 18:47:24 +02:00
Laurent Destailleur
f648185839 Fix phpcs 2021-07-05 17:34:25 +02:00
Laurent Destailleur
fe5c4f4a0e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 17:04:38 +02:00
Laurent Destailleur
8b07e99e05 Fix for ' inserted by CKEditor instead of ' 2021-07-05 16:08:47 +02:00
ATM john
752fe22c68 Add simple auto mode 2021-07-04 23:24:38 +02:00
ATM john
a709cc583f Add modal option to btn 2021-07-04 22:59:53 +02:00
Laurent Destailleur
5779a56ae0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-04 21:23:53 +02:00
Laurent Destailleur
5853aa4c1e Look and feel v14 2021-07-04 20:08:34 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
Laurent Destailleur
bf7f8f7c45 Fix phpcs 2021-06-30 17:28:23 +02:00
Laurent Destailleur
6cb5ea6ec2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-30 17:27:20 +02:00
Laurent Destailleur
bda36337cd Prepare fix #yogosha6443 2021-06-30 17:22:36 +02:00
Laurent Destailleur
a914ffa42c CSS 2021-06-30 15:00:04 +02:00
Florian Mortgat
5d4c40fffa Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword 2021-06-30 09:36:34 +02:00
Florian Mortgat
94416072d8 FIX after PR feedback: remove uses of keyword attribute of EcmFiles (use keywords instead) 2021-06-30 09:34:49 +02:00
Laurent Destailleur
02a5755876 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/langs/nl_NL/main.lang
2021-06-29 19:59:51 +02:00
Laurent Destailleur
6196a77e64 Merge pull request #17861 from marc-dll/develop_NEW_project_block_timesheet
NEW: project time spent: conf to prevent recording time after X months
2021-06-29 19:53:20 +02:00
Laurent Destailleur
c7befd9acc Fix php8 (related to #18019) 2021-06-29 19:49:37 +02:00
Laurent Destailleur
0f020d5b20 Fix for phpv8 2021-06-29 19:05:18 +02:00
Laurent Destailleur
796b2d201a Enhance the sanitizing. 2021-06-29 18:17:27 +02:00
Laurent Destailleur
2e2d9002ad Code comment 2021-06-27 14:54:17 +02:00
Laurent Destailleur
4ff2ff779b css 2021-06-26 16:35:33 +02:00
Laurent Destailleur
b3b96ddb7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-26 16:11:13 +02:00
Laurent Destailleur
bbc6b9aa1b Look and feel v14 2021-06-26 16:10:56 +02:00
Laurent Destailleur
e62ed28701 Debug v14 2021-06-26 15:39:52 +02:00
lmarcouiller
98244a5e44 Fix : error display fr phone number 2021-06-24 14:20:19 +02:00
Florian Mortgat
d0a4ae88b1 NEW: make it easier to set the keyword, keywords and description attributes of an ecm file object 2021-06-24 11:50:34 +02:00
Laurent Destailleur
d57699b7d7 css 2021-06-23 10:22:51 +02:00
Alexandre SPANGARO
f1a5d4009f Merge remote-tracking branch 'upstream/develop' into 14b15 2021-06-22 14:07:52 +02:00
Laurent Destailleur
8887f71c26 Doc 2021-06-22 10:57:16 +02:00
Alexandre SPANGARO
23f6e183d3 Forget information in tooltip for direct download 2021-06-21 21:51:41 +02:00
Laurent Destailleur
bb8d5cec1b More complete management of
MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL
2021-06-21 11:36:28 +02:00
Laurent Destailleur
5bfd82e528 Clean code 2021-06-21 11:23:53 +02:00
Laurent Destailleur
59a7d5b89d Introduce option
MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL
2021-06-21 11:13:30 +02:00
Laurent Destailleur
65110411ac Doc 2021-06-20 17:20:12 +02:00
Laurent Destailleur
f486595e13 Fix dolSqlDateFilter 2021-06-20 16:55:22 +02:00
Laurent Destailleur
4a3da84098 Clean code 2021-06-19 23:52:52 +02:00
Laurent Destailleur
edb4cf4130 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	README.md
	htdocs/filefunc.inc.php
2021-06-19 20:05:25 +02:00
Frédéric FRANCE
5d79143401 fix php warning 2021-06-16 11:50:52 +02:00
Laurent Destailleur
83ec4cbd71 Reponsive 2021-06-15 15:19:46 +02:00
Laurent Destailleur
3b9936f7e2 Fix responsive 2021-06-15 01:18:17 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-06-14 13:37:02 +00:00
Laurent Destailleur
b588aee704 Merge pull request #17917 from fappels/14_create_thumbs_php8.0
Fix create image thumbs on php 8.0
2021-06-14 14:07:21 +02:00
Laurent Destailleur
03fbd68da4 Update images.lib.php 2021-06-14 14:05:48 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Francis Appels
a019996bc8 Fix create image thumbs on php 8.0 2021-06-13 17:36:51 +02:00
Laurent Destailleur
9ba0fe07f0 Fix phpcs 2021-06-12 18:47:29 +02:00
Laurent Destailleur
bbb751dc53 Merge pull request #17822 from frederic34/zapier_create_contacts
add more capabilities for zapier
2021-06-11 19:51:01 +02:00
Laurent Destailleur
04a500f516 Merge pull request #17850 from moreauftheobald/Develop_hook_on_product_stat
Adding hooks on product stat in order to allow to expand stat on othe…
2021-06-11 19:33:37 +02:00
Laurent Destailleur
5d2f5b2305 Update product.lib.php 2021-06-11 19:33:07 +02:00