Laurent Destailleur
|
533e4f2424
|
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/fr_FR/accountancy.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cashdesk.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/members.lang
htdocs/langs/fr_FR/products.lang
|
2022-08-12 16:03:09 +02:00 |
|
Laurent Destailleur
|
059d0073ff
|
FIX Maxi debug v16
|
2022-08-12 15:54:50 +02:00 |
|
Laurent Destailleur
|
25e034721c
|
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-07-11 00:06:57 +02:00 |
|
Laurent Destailleur
|
24dc936000
|
Revert "default to create on card.php if $action is empty"
This reverts commit e0b664066b.
|
2022-07-11 00:05:50 +02:00 |
|
Christian Foellmann
|
e0b664066b
|
default to create on card.php if $action is empty
|
2022-07-11 00:01:42 +02:00 |
|
Christian Foellmann
|
aaca9bc03d
|
default to create on card.php if $action is empty
|
2022-07-08 09:16:02 +02:00 |
|
lmarcouiller
|
fd0bbf8ebc
|
fix coments
|
2022-06-22 12:25:59 +02:00 |
|
Hystepik
|
1821c62288
|
Merge branch 'develop' into develop#4
|
2022-06-22 12:12:12 +02:00 |
|
Laurent Destailleur
|
dd392143e1
|
Fix conf->projet conf->project
|
2022-06-14 17:53:17 +02:00 |
|
ptibogxiv
|
295f5eb3ea
|
Fix php 8 compatibilty
|
2022-06-12 14:23:24 +02:00 |
|
Frédéric France
|
3fdbce7a31
|
use isModEnabled function
|
2022-06-11 09:46:28 +02:00 |
|
Laurent Destailleur
|
1838baaa5c
|
Debug v16
|
2022-06-08 21:20:12 +02:00 |
|
Laurent Destailleur
|
c035ee6f2a
|
Look and feel v16
|
2022-04-11 19:21:04 +02:00 |
|
Laurent Destailleur
|
370965a0bb
|
Rename build_path_from_id_categ into buildPathFromId and set it private
|
2022-04-06 13:30:56 +02:00 |
|
Laurent Destailleur
|
71012a7933
|
FIX #19777 #20281
|
2022-04-04 15:25:29 +02:00 |
|
lmarcouiller
|
b18eac6c75
|
remove tests lines
|
2022-03-22 14:44:11 +01:00 |
|
lmarcouiller
|
8152a728a8
|
Fix : filemanagement in ecm and medias
|
2022-03-22 11:42:15 +01:00 |
|
Laurent Destailleur
|
cf13eb7ac7
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-03-15 18:22:37 +01:00 |
|
Laurent Destailleur
|
f789fc24f7
|
Fix filter
|
2022-03-14 16:20:57 +01:00 |
|
Laurent Destailleur
|
2142440b6c
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/index.php
htdocs/langs/en_US/errors.lang
|
2022-03-07 13:23:47 +01:00 |
|
Laurent Destailleur
|
378dab69a6
|
FIX #19777 #20281
|
2022-03-07 13:21:32 +01:00 |
|
Frédéric FRANCE
|
935482ee22
|
uniformize
|
2022-02-15 19:04:18 +01:00 |
|
Frédéric FRANCE
|
a613553f37
|
Merge branch 'hookgetnomurl' into patch-1
|
2022-02-15 18:44:06 +01:00 |
|
Laurent Destailleur
|
13510b9929
|
Clean sortfield, sortorder
|
2022-01-13 11:17:25 +01:00 |
|
Laurent Destailleur
|
5efa31204b
|
FIX ECM module was mixing contributions and vat and not showing salaries
|
2021-12-07 02:00:34 +01:00 |
|
Frédéric FRANCE
|
dc3bfcfb87
|
can modify tooltip by reference
|
2021-11-22 19:57:26 +01:00 |
|
Scrutinizer Auto-Fixer
|
5567310e44
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2021-10-25 20:07:31 +00:00 |
|
Laurent Destailleur
|
f5562177e7
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-10-25 13:06:33 +02:00 |
|
Maxime Kohlhaas
|
6abd4cc120
|
Fix #8716 : tasks were not shown in ecm auto tree
|
2021-10-24 11:38:45 +02:00 |
|
Nicolas Domenech
|
9772168067
|
fix: error sql creating folder in manual GED tree
|
2021-10-22 15:57:03 +02:00 |
|
Laurent Destailleur
|
b66155de4b
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/list.php
htdocs/filefunc.inc.php
|
2021-10-17 13:30:13 +02:00 |
|
Laurent Destailleur
|
ccf78a1af4
|
FIX Use of accent into filename of GED
|
2021-10-17 12:30:08 +02:00 |
|
Laurent Destailleur
|
7180f5eeff
|
css
|
2021-10-10 21:25:46 +02:00 |
|
Laurent Destailleur
|
874731af84
|
The 'action=delete&file=...' has been replaced with
'action=deletefile&file=...' to avoid confusion with deletion of object
lines.
|
2021-10-10 21:11:48 +02:00 |
|
Laurent Destailleur
|
902fed1f0d
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/ecm/index.php
|
2021-10-02 20:09:06 +02:00 |
|
Laurent Destailleur
|
d99b3d601a
|
FIX #18854
|
2021-10-02 20:07:09 +02:00 |
|
Laurent Destailleur
|
37603b451a
|
Fix token in url
|
2021-09-27 12:24:01 +02:00 |
|
Laurent Destailleur
|
4f6586d6a8
|
Fix token
|
2021-09-26 20:35:54 +02:00 |
|
Laurent Destailleur
|
8b7c677121
|
Merge pull request #18702 from Hystepik/develop#2
Close #18692 : Possibility to move directories in ecm
|
2021-09-24 13:36:25 +02:00 |
|
Laurent Destailleur
|
9d5f6fbc1b
|
Code comment
|
2021-09-23 13:39:48 +02:00 |
|
Laurent Destailleur
|
5397e2d9c3
|
Clean sql
|
2021-09-20 11:30:33 +02:00 |
|
lmarcouiller
|
df0a26550f
|
Update to match eldy's advices
|
2021-09-20 09:12:07 +02:00 |
|
lmarcouiller
|
324af09415
|
Close #18692 : Possibility to move directories in ecm
|
2021-09-13 15:57:21 +02:00 |
|
Laurent Destailleur
|
9e994e6373
|
Merge pull request #18579 from Hystepik/develop_v14#1
Fix #18443 : overwrite file works fine
|
2021-09-02 17:27:19 +02:00 |
|
Laurent Destailleur
|
b04ea59a51
|
More sql sanitizing
|
2021-09-02 13:58:42 +02:00 |
|
stickler-ci
|
e01ccabbd5
|
Fixing style errors.
|
2021-09-02 08:56:53 +00:00 |
|
lmarcouiller
|
ae38490042
|
Fix #18443 : overwrite file works fine
|
2021-09-02 10:53:22 +02:00 |
|
Laurent Destailleur
|
29abbbe2fb
|
Clean code
|
2021-08-28 01:45:53 +02:00 |
|
Laurent Destailleur
|
46d993c9a6
|
Clean code
|
2021-08-27 22:42:04 +02:00 |
|
Laurent Destailleur
|
2f225ee7e5
|
Clean code by adding cast int.
|
2021-08-27 16:33:03 +02:00 |
|
Christian Foellmann
|
d706c3b1ec
|
use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination
|
2021-08-20 14:41:30 +02:00 |
|
Laurent Destailleur
|
c7befd9acc
|
Fix php8 (related to #18019)
|
2021-06-29 19:49:37 +02:00 |
|
Laurent Destailleur
|
5cc86d2319
|
Fix #yogosha6370
|
2021-06-14 13:51:09 +02:00 |
|
Laurent Destailleur
|
fb46ece906
|
Fix yogosha 6347
|
2021-06-09 15:36:47 +02:00 |
|
Laurent Destailleur
|
a0418fc17d
|
FIX CWE-269 huntr - download of files of project
|
2021-05-21 18:53:09 +02:00 |
|
Laurent Destailleur
|
4df70dc3f4
|
Fix CWE-269 huntr
|
2021-05-21 16:22:45 +02:00 |
|
Laurent Destailleur
|
3aac68d65b
|
Update ecmfiles.class.php
|
2021-05-11 18:52:49 +02:00 |
|
stickler-ci
|
db9c423794
|
Fixing style errors.
|
2021-05-08 20:07:12 +00:00 |
|
kastoras
|
6fa85efd0f
|
Fix/FIX #17545 get documents, false data problem
Fix on getting wrong data for products comparing with like operator
|
2021-05-08 23:03:08 +03:00 |
|
Laurent Destailleur
|
575d335374
|
Debug generation of webp
|
2021-05-01 15:12:30 +02:00 |
|
Laurent Destailleur
|
d138e7410b
|
Clean code
|
2021-04-26 19:12:23 +02:00 |
|
Laurent Destailleur
|
a68a5b0c04
|
Look and feel v14
|
2021-04-14 15:11:26 +02:00 |
|
Alexandre SPANGARO
|
44133166de
|
Merge remote-tracking branch 'upstream/develop' into 14a36
|
2021-04-12 21:35:03 +02:00 |
|
Laurent Destailleur
|
8a62d97b89
|
Remove one thousand of useless files
|
2021-04-12 15:57:16 +02:00 |
|
Alexandre SPANGARO
|
2d77b9bdf0
|
Work on split module fournisseur
|
2021-04-12 06:15:47 +02:00 |
|
Alexandre SPANGARO
|
ce7c5a0c7b
|
Work on split module fournisseur
|
2021-04-11 04:24:21 +02:00 |
|
Frédéric FRANCE
|
f810fffc01
|
fix php8 wzrning
|
2021-03-18 18:50:38 +01:00 |
|
Laurent Destailleur
|
cc10106a21
|
Fix protection on int
|
2021-03-14 12:20:23 +01:00 |
|
Frédéric FRANCE
|
a4e25359e7
|
add missing rule
|
2021-03-01 20:37:16 +01:00 |
|
Frédéric FRANCE
|
125c7513da
|
code syntax ecm emailcollector directories
|
2021-02-25 22:26:26 +01:00 |
|
Laurent Destailleur
|
6f25f7c2cb
|
Clean code
|
2021-02-16 11:43:26 +01:00 |
|
Laurent Destailleur
|
32370bf63d
|
Look and feel v14
|
2021-02-15 20:13:38 +01:00 |
|
stickler-ci
|
cc6fd7952c
|
Fixing style errors.
|
2021-02-06 12:28:00 +00:00 |
|
Florian HENRY
|
df7f18d4d2
|
add hook to add directory into ECM auto files
|
2021-02-05 13:33:48 +01:00 |
|
Laurent Destailleur
|
cefd66c18f
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-12-29 16:56:39 +01:00 |
|
Laurent Destailleur
|
6421f757dc
|
FIX Can delete a directory created manually that can not be indexed
|
2020-12-27 21:21:13 +01:00 |
|
Laurent Destailleur
|
4a8e72c997
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/ecm/file_card.php
|
2020-12-27 21:00:07 +01:00 |
|
Laurent Destailleur
|
d1d4914684
|
Sanitize data
|
2020-12-27 20:49:54 +01:00 |
|
Laurent Destailleur
|
6b03a2d264
|
Sanitize data
|
2020-12-27 20:49:40 +01:00 |
|
Laurent Destailleur
|
a6cd34739e
|
Doxygen
|
2020-12-27 20:43:18 +01:00 |
|
Frédéric FRANCE
|
a2eab824c1
|
Merge remote-tracking branch 'upstream/develop' into patch-10
|
2020-12-04 20:42:22 +01:00 |
|
Frédéric FRANCE
|
4f52cd38b4
|
doxygen
|
2020-11-28 17:07:08 +01:00 |
|
Frédéric FRANCE
|
b9bac939e6
|
doxygen
|
2020-11-27 09:11:30 +01:00 |
|
Frédéric FRANCE
|
c09a6d1435
|
Merge remote-tracking branch 'upstream/develop' into patch-10
|
2020-11-25 12:59:32 +01:00 |
|
Frédéric FRANCE
|
154f0c7e8d
|
doxygen
|
2020-11-24 21:28:57 +01:00 |
|
Frédéric FRANCE
|
e68eb2a265
|
add note on ecm files
|
2020-11-24 19:05:51 +01:00 |
|
Frédéric FRANCE
|
21f3ac3405
|
add note on ecm files
|
2020-11-24 19:02:41 +01:00 |
|
Frédéric FRANCE
|
66ad0e5b13
|
add note on ecm files
|
2020-11-24 18:54:59 +01:00 |
|
Givriz
|
dca4cf5987
|
Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
|
2020-11-23 15:12:52 +01:00 |
|
Givriz
|
c48129e279
|
Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
|
2020-11-19 20:23:38 +01:00 |
|
Laurent Destailleur
|
ec283dc04f
|
Removed duplicated translation keys
|
2020-11-11 23:50:46 +01:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Laurent Destailleur
|
efce53abd1
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/boxes/box_services_contracts.php
htdocs/expensereport/class/expensereport.class.php
|
2020-10-26 18:17:23 +01:00 |
|
Laurent Destailleur
|
2c2142ddba
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-10-26 18:13:47 +01:00 |
|
Laurent Destailleur
|
adeddc70ca
|
FIX Deletion of expensereport + other generated object not complete.
|
2020-10-26 18:10:58 +01:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Scrutinizer Auto-Fixer
|
1512521d91
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-07 13:01:28 +00:00 |
|
Laurent Destailleur
|
459ebe2e56
|
css
|
2020-10-06 17:26:55 +02:00 |
|
Frédéric FRANCE
|
7afb62c55d
|
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields
|
2020-10-02 00:24:48 +02:00 |
|