wdammak
|
388efb6773
|
Wrapping for stock movements
|
2019-01-28 04:36:26 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Laurent Destailleur
|
eed4d9509b
|
Merge pull request #10243 from AXeL-dev/patch-3
fix executable files security check regex
|
2018-12-17 21:09:32 +01:00 |
|
Laurent Destailleur
|
623afd1020
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/website.lang
|
2018-12-17 18:50:06 +01:00 |
|
Laurent Destailleur
|
4e940ebaf1
|
FIX Download of files with hashp when files are into user dir
|
2018-12-17 15:35:20 +01:00 |
|
AXeL-dev
|
7f014d76cc
|
fix executable files security check regex
|
2018-12-17 12:31:12 +01:00 |
|
BENKE Charlene
|
60d0a5efab
|
massfilesarea feature for plugin modules
|
2018-12-01 14:44:34 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Laurent Destailleur
|
2c1e8d6535
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/expedition/class/expeditionbatch.class.php
htdocs/public/payment/newpayment.php
htdocs/stripe/config.php
|
2018-10-16 18:47:11 +02:00 |
|
Laurent Destailleur
|
e1e1599a6d
|
FIX shared link ko on proposals
|
2018-10-11 11:59:14 +02:00 |
|
Laurent Destailleur
|
f2d53e80e5
|
Optimize performance of cron that rotate logs
|
2018-09-26 01:45:24 +02:00 |
|
Philippe GRAND
|
18f4755a90
|
Standardize and update code
|
2018-09-14 10:20:21 +02:00 |
|
Laurent Destailleur
|
700e3b9748
|
Standardize code for modulepart=mycompany like others modulepart.
|
2018-09-09 12:53:30 +02:00 |
|
Laurent Destailleur
|
ba71648c2d
|
Code comment
|
2018-09-08 14:10:29 +02:00 |
|
Frédéric FRANCE
|
b03f4004ea
|
PSR2 FunctionClosingBrace
|
2018-08-29 21:25:22 +02:00 |
|
Laurent Destailleur
|
ab22c9d0de
|
Work on import
|
2018-08-16 21:48:16 +02:00 |
|
Laurent Destailleur
|
7af42c66cc
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/comm/propal/list.php
|
2018-07-27 12:54:45 +02:00 |
|
Laurent Destailleur
|
83ae27d122
|
FIX Deletion of files in migration
|
2018-07-27 12:33:36 +02:00 |
|
Laurent Destailleur
|
b6180fcb58
|
Fix fetch index in ecm when using multicompany
|
2018-07-10 12:00:09 +02:00 |
|
Laurent Destailleur
|
30b04c0d3d
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/lib/files.lib.php
|
2018-06-05 18:16:32 +02:00 |
|
Laurent Destailleur
|
4c21ad4e4e
|
FIX: dol_delete_file must work in a context without db handler loaded
Conflicts:
htdocs/core/lib/files.lib.php
|
2018-06-05 18:12:14 +02:00 |
|
Laurent Destailleur
|
1671c8b6cc
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-06-05 18:06:30 +02:00 |
|
Laurent Destailleur
|
9c32e49bd3
|
FIX: dol_delete_file must work in a context without db handler loaded
|
2018-06-05 18:05:33 +02:00 |
|
Laurent Destailleur
|
6b2bd93469
|
NEW Add dol_is_link function
|
2018-04-25 17:59:05 +02:00 |
|
Laurent Destailleur
|
e9a2894727
|
Fix PSR2
|
2018-04-22 20:59:29 +02:00 |
|
Laurent Destailleur
|
0d0da234b1
|
Lowercase NULL, TRUE, FALSE according to PSR2
|
2018-04-16 13:51:16 +02:00 |
|
All-3kcis
|
21df700325
|
Add option to save file with product batch ref
+ use batch number like ref instead of id
+ debug access to shared link
|
2018-04-12 15:55:08 +02:00 |
|
All-3kcis
|
f7e58f3c73
|
Add files management on products lot
|
2018-04-12 15:10:37 +02:00 |
|
Laurent Destailleur
|
7e5c3cc807
|
Code comment
|
2018-03-21 13:30:30 +01:00 |
|
Laurent Destailleur
|
5b8006a6bb
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/public/payment/paymentok.php
htdocs/public/paypal/paymentok.php
|
2018-03-08 16:37:17 +01:00 |
|
Laurent Destailleur
|
af9fff4f83
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-03-08 16:35:12 +01:00 |
|
Laurent Destailleur
|
3762ed12c7
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/class/html.formfile.class.php
|
2018-03-08 16:33:51 +01:00 |
|
Laurent Destailleur
|
eac1b2efe9
|
FIX Infinite loop on deletion of temp file when there is symbolic links
|
2018-03-03 11:23:23 +01:00 |
|
Laurent Destailleur
|
f0c9cd3acc
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-03-03 11:22:31 +01:00 |
|
Laurent Destailleur
|
d6b782e5ef
|
FIX Infinite loop on deletion of temp file when there is symbolic links
|
2018-03-03 11:22:15 +01:00 |
|
Regis Houssin
|
093ea49cc6
|
Fix: use "multidir_output" instead "dir_output"
|
2018-02-26 11:35:30 +01:00 |
|
Laurent Destailleur
|
d8bf553ea9
|
Add option THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD for logo indexing
|
2018-02-23 19:55:15 +01:00 |
|
Laurent Destailleur
|
60fe1fa503
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/mails.php
|
2018-02-17 01:19:17 +01:00 |
|
Laurent Destailleur
|
9bed2ce8e2
|
Fix ignore file integrity check on filefunc.inc.php for deb/rpm package
|
2018-02-16 22:03:13 +01:00 |
|
Laurent Destailleur
|
1a4aa89489
|
NEW Can share any file from the "Document" tab.
|
2018-02-13 13:55:36 +01:00 |
|
Laurent Destailleur
|
d3a6342034
|
Fix regeneration of PDF after creation of payment.
|
2018-02-02 10:37:10 +01:00 |
|
Laurent Destailleur
|
7c480f76e3
|
Fix thumbs of pdf at wrong place
Fix param not provided
Fix css
|
2018-01-13 16:09:05 +01:00 |
|
Laurent Destailleur
|
8d793c680e
|
Fix dol_delete_preview
|
2018-01-13 15:48:30 +01:00 |
|
Laurent Destailleur
|
7bfcfd4574
|
Fix recursive path when dir is '0'
|
2018-01-12 17:12:38 +01:00 |
|
Laurent Destailleur
|
6f107e3fee
|
Fix API to download/build doc
|
2017-12-27 15:48:20 +01:00 |
|
Laurent Destailleur
|
2163db446b
|
NEW Can test signature of a version from API
|
2017-12-16 17:24:23 +01:00 |
|
Laurent Destailleur
|
48aada6090
|
Export of website
|
2017-12-11 21:27:43 +01:00 |
|
Laurent Destailleur
|
f2e429e28f
|
Fix file integrity checker (exclude files excluded from package)
|
2017-12-11 15:03:34 +01:00 |
|
Laurent Destailleur
|
304819a726
|
Work on module builder
|
2017-11-19 16:26:39 +01:00 |
|
Laurent Destailleur
|
01a41237bf
|
CSS
|
2017-11-11 14:20:08 +01:00 |
|
Laurent Destailleur
|
e7abc92f97
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/transfer.php
htdocs/core/lib/functions.lib.php
|
2017-11-06 21:37:19 +01:00 |
|
Laurent Destailleur
|
864af9cc3b
|
Fix error not returned if output directory not writable
|
2017-11-06 11:47:03 +01:00 |
|
Laurent Destailleur
|
05ee3e3825
|
Fix show message "files uploaded" only once even when n files.
|
2017-11-05 01:06:34 +01:00 |
|
Laurent Destailleur
|
afdc176f47
|
Fix scrutinizer
|
2017-10-16 08:52:00 +02:00 |
|
Scrutinizer Auto-Fixer
|
328d39bc71
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2017-10-07 11:09:31 +00:00 |
|
Laurent Destailleur
|
f9d9642340
|
FIX #6981
|
2017-10-06 14:07:28 +02:00 |
|
Laurent Destailleur
|
888e5ed2c5
|
Fix sanitize uploaded filename
|
2017-10-03 10:54:09 +02:00 |
|
Laurent Destailleur
|
793f1318de
|
Fix sanitize uploaded filename
|
2017-10-03 09:35:45 +02:00 |
|
Laurent Destailleur
|
bd45ea5a03
|
Split page for invoice template into card + list. Add more filters.
|
2017-09-22 11:28:53 +02:00 |
|
Laurent Destailleur
|
beac7a7439
|
Work on direct download links
|
2017-09-20 21:29:27 +02:00 |
|
Laurent Destailleur
|
8dfa87fcf6
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-09-19 19:30:28 +02:00 |
|
Laurent Destailleur
|
70b11f18b5
|
FIX #7367
|
2017-09-18 16:06:58 +02:00 |
|
Laurent Destailleur
|
630dc92a13
|
NEW Mass PDF Merging is available on contracts
|
2017-09-16 15:39:52 +02:00 |
|
Laurent Destailleur
|
a4665e17d4
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
|
2017-09-12 13:26:25 +02:00 |
|
Regis Houssin
|
762b4eb876
|
Fix: some problems with medias in multicompany
|
2017-09-09 17:48:04 +02:00 |
|
Laurent Destailleur
|
4b9f54e571
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
|
2017-09-01 17:34:57 +02:00 |
|
Laurent Destailleur
|
eebaff95cf
|
Fix pb with imagick
|
2017-08-29 13:41:44 +02:00 |
|
Laurent Destailleur
|
f2a437fa89
|
Enhance modulebuilder
|
2017-08-26 15:22:13 +02:00 |
|
Regis Houssin
|
e86d3d7905
|
Fix: Travis error "Missing parameter name"
|
2017-08-22 09:47:33 +02:00 |
|
Laurent Destailleur
|
68c31c55c5
|
FIX delete dir when there is symlinks
|
2017-08-21 01:26:22 +02:00 |
|
Laurent Destailleur
|
eedf5e0a22
|
FIX delete dir when there is symlinks
|
2017-08-21 01:24:34 +02:00 |
|
Laurent Destailleur
|
ac3a270e17
|
FIX Do not delete files into sym links
Conflicts:
htdocs/core/lib/files.lib.php
|
2017-08-21 00:43:52 +02:00 |
|
Laurent Destailleur
|
b9511fd4c6
|
FIX Do not delete files into sym links
|
2017-08-21 00:40:32 +02:00 |
|
Laurent Destailleur
|
260beed512
|
NEW Generated files are now indexed in database
|
2017-08-18 23:19:55 +02:00 |
|
Laurent Destailleur
|
097b660c41
|
Mutualize code
|
2017-08-18 16:25:00 +02:00 |
|
Laurent Destailleur
|
71d49f1c6f
|
Fix pb in ecm
|
2017-08-01 18:44:34 +02:00 |
|
Laurent Destailleur
|
25b107defb
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
|
2017-07-23 19:09:00 +02:00 |
|
Laurent Destailleur
|
44023606c6
|
Fix pb in dolGetFirstLineOfText. Add PHPunit
|
2017-07-22 12:47:35 +02:00 |
|
Laurent Destailleur
|
f64a9968a9
|
Debug modulebuilder
|
2017-07-22 01:00:43 +02:00 |
|
Laurent Destailleur
|
d832bfc056
|
Some fix into dol_compress_dir function.
|
2017-07-17 11:05:38 +02:00 |
|
Laurent Destailleur
|
330f3af74d
|
Fix pb in recursive dol_dir_list return.
|
2017-07-17 10:26:36 +02:00 |
|
Laurent Destailleur
|
23fbef3dae
|
Fix the delete dir functions does not return real nb of deleted files.
|
2017-07-13 00:26:05 +02:00 |
|
Laurent Destailleur
|
ec9bbe2b52
|
Help/Need debug of some online instances with the log view
|
2017-06-20 16:54:37 +02:00 |
|
Laurent Destailleur
|
08a86fa03d
|
Start #6981
|
2017-06-20 12:17:13 +02:00 |
|
Laurent Destailleur
|
996ec4926b
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/lib/files.lib.php
htdocs/don/card.php
|
2017-06-18 22:16:34 +02:00 |
|
Laurent Destailleur
|
0ef507ae7f
|
Fix rename of file to remove .noexe extension.
|
2017-06-18 21:52:51 +02:00 |
|
Laurent Destailleur
|
c8856182a6
|
Fix look and feel v6
|
2017-06-13 15:34:18 +02:00 |
|
Laurent Destailleur
|
ba3a74576c
|
Merge 5.0
|
2017-06-12 18:22:51 +02:00 |
|
atm-ph
|
946e72f269
|
Fix 6982 missing parameter to get more informations about files
|
2017-06-11 12:26:51 +02:00 |
|
Laurent Destailleur
|
a63050bf46
|
FIX Warnings
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/core/lib/images.lib.php
|
2017-06-09 00:38:30 +02:00 |
|
Laurent Destailleur
|
75624376a5
|
FIX Warnings
|
2017-06-09 00:27:19 +02:00 |
|
Regis Houssin
|
2df33d1df3
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_mc
|
2017-06-03 11:45:15 +02:00 |
|
Laurent Destailleur
|
77df19009d
|
Removed duplicated code
|
2017-06-01 12:11:45 +02:00 |
|
Laurent Destailleur
|
c39ca4cff8
|
NEW Introduce function dol_compress_dir
|
2017-05-31 00:20:35 +02:00 |
|
Regis Houssin
|
5c5663c5ae
|
New: getEntity function use true $shared value by default
|
2017-05-30 18:50:54 +02:00 |
|
Laurent Destailleur
|
fa6bc03765
|
Fix typo
|
2017-05-30 01:34:20 +02:00 |
|
Laurent Destailleur
|
c4f09b8894
|
Work on modulebuilder
|
2017-05-28 14:43:17 +02:00 |
|
Laurent Destailleur
|
c651f1da45
|
Work on modulebuilder tool
|
2017-05-27 19:05:36 +02:00 |
|
Laurent Destailleur
|
3e37185b74
|
FIX download attached file on resource
|
2017-05-23 13:44:18 +02:00 |
|
Laurent Destailleur
|
ecce1c2037
|
Remove conf
|
2017-05-21 23:58:19 +02:00 |
|
Laurent Destailleur
|
090a7028d7
|
Fix constant usage
|
2017-05-21 23:41:04 +02:00 |
|
Laurent Destailleur
|
6aa6ef1f9f
|
Fix travis error
|
2017-05-21 18:30:43 +02:00 |
|
Laurent Destailleur
|
52b5a8ece7
|
More powerfull dol_move function.
|
2017-05-21 14:06:43 +02:00 |
|
Laurent Destailleur
|
601f3ea75e
|
Fix dol_check_secure_access_document in write mode, add phpunit tests
|
2017-05-20 11:31:03 +02:00 |
|
Laurent Destailleur
|
06b37d0e82
|
Work on dol_check_secure_access_document to support write question
|
2017-05-19 20:17:33 +02:00 |
|
Laurent Destailleur
|
4a46480ef5
|
Fix preview of PDF contract
|
2017-05-18 12:40:20 +02:00 |
|
Laurent Destailleur
|
b09300ab61
|
NEW Can edit background color for odd and even lines in tables
|
2017-05-11 13:02:29 +02:00 |
|
Laurent Destailleur
|
d3917b6065
|
FIX Bad return code of dolCpyDir
|
2017-05-11 12:25:53 +02:00 |
|
Laurent Destailleur
|
11b1a2adac
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
|
2017-05-05 14:49:25 +02:00 |
|
Laurent Destailleur
|
2120b9af85
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/theme/eldy/style.css.php
|
2017-05-05 14:14:21 +02:00 |
|
Laurent Destailleur
|
68b63927e0
|
Maxi miscellaneous debug
|
2017-05-05 12:33:49 +02:00 |
|
Laurent Destailleur
|
39d9a0f979
|
Support of pdf preview on supplier orders
|
2017-05-04 19:11:19 +02:00 |
|
Laurent Destailleur
|
a8c775dcbd
|
Fix compatibility with the removal of "constant".
|
2017-04-29 18:48:30 +02:00 |
|
fappels
|
18981ab0c9
|
Fix download donation document
|
2017-04-28 11:39:33 +02:00 |
|
Laurent Destailleur
|
cfde27820e
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
|
2017-04-27 17:20:40 +02:00 |
|
Laurent Destailleur
|
d390acc888
|
FIX A non admin user can not download files attached to user.
|
2017-04-27 02:03:59 +02:00 |
|
Laurent Destailleur
|
95788c9699
|
FIX A non admin user can not download files attached to user.
|
2017-04-27 00:53:13 +02:00 |
|
fappels
|
c69a1205c0
|
Fix download delivery document
|
2017-04-26 19:06:41 +02:00 |
|
Laurent Destailleur
|
4c056d68d8
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
|
2017-04-15 17:02:05 +02:00 |
|
Laurent Destailleur
|
3e9ccc186a
|
NEW Small PDF template for products
|
2017-04-13 10:26:12 +02:00 |
|
Laurent Destailleur
|
26a9999fbf
|
Support of preview for pdf with several pages
|
2017-04-12 11:38:55 +02:00 |
|
BENKE Charlie
|
20202871eb
|
expedition->dir_output is used by livraison
not livraison->dir_output who not exist
|
2017-04-10 15:54:02 +02:00 |
|
Laurent Destailleur
|
0a47245ba5
|
NEW Add mass actions (pdf merge and delete) for interventions
|
2017-04-09 14:31:56 +02:00 |
|
Laurent Destailleur
|
ddd101757e
|
FIX Bulk pdf merge on supplier proposals
|
2017-04-09 13:26:26 +02:00 |
|
Laurent Destailleur
|
52c86cb3f5
|
NEW Bulk actions available on supplier orders
|
2017-04-09 13:12:25 +02:00 |
|
Laurent Destailleur
|
979bcd3a9b
|
NEW Can add a background image on login page
|
2017-03-31 11:40:31 +02:00 |
|
Laurent Destailleur
|
b5b0eba470
|
Several enhancement for 6.0
|
2017-03-28 12:47:48 +02:00 |
|
Laurent Destailleur
|
df59a595de
|
Fix link to files
|
2017-03-25 01:29:19 +01:00 |
|
Laurent Destailleur
|
df17de9d48
|
Merge pull request #6543 from laudeco/feature/expenseNoteFusionPdf
add 'fusion pdf' in mass action of expense report
|
2017-03-24 22:50:54 +01:00 |
|
Laurent Destailleur
|
8199ac9f89
|
FIX Can't download delivery receipts (function
dol_check_secure_access_document)
|
2017-03-22 19:49:58 +01:00 |
|
Laurent Destailleur
|
4831fb4dcb
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
|
2017-03-19 11:26:49 +01:00 |
|
De Coninck Laurent
|
a05ebb6c65
|
add 'fusion pdf' in mass action of expense report
Add a mass action 'fusion pdf (build doc)' in expense report list
|
2017-03-18 11:51:45 +01:00 |
|
Laurent Destailleur
|
a40142460d
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-03-13 02:30:00 +01:00 |
|
Laurent Destailleur
|
6aeae12775
|
Fix medias could not be loaded
|
2017-03-13 02:28:58 +01:00 |
|
Laurent Destailleur
|
c72e7c1057
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/files.lib.php
|
2017-03-10 14:54:35 +01:00 |
|
Laurent Destailleur
|
e7ad91d5a3
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-03-10 14:50:23 +01:00 |
|
Laurent Destailleur
|
277fa7dbe1
|
FIX #6444
|
2017-03-10 14:08:53 +01:00 |
|
Laurent Destailleur
|
fbbcec2ba3
|
FIX #6444
|
2017-03-10 14:04:06 +01:00 |
|
Laurent Destailleur
|
f7b387513f
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/lib/files.lib.php
|
2017-03-10 13:55:28 +01:00 |
|
Laurent Destailleur
|
e6f294d18d
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
|
2017-03-10 13:42:55 +01:00 |
|
Laurent Destailleur
|
1a57d1864a
|
FIX #6443
|
2017-03-10 13:39:11 +01:00 |
|
Laurent Destailleur
|
3f69b1fdf5
|
Revert "Fix remove a line that look useless"
This reverts commit 1610926ccd.
|
2017-03-10 13:14:02 +01:00 |
|
Laurent Destailleur
|
1610926ccd
|
Fix remove a line that look useless
|
2017-03-10 13:11:12 +01:00 |
|
Laurent Destailleur
|
fbb80b54df
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-03-10 12:23:09 +01:00 |
|
Laurent Destailleur
|
bf34543085
|
FIX #6443
|
2017-03-10 12:19:50 +01:00 |
|
Laurent Destailleur
|
d12caab69a
|
The hook getNodeList has been replaced by a normalized 'addreplace' hook
getDirList.
|
2017-02-27 02:04:47 +01:00 |
|
Laurent Destailleur
|
08915d88d0
|
FIX the dolCopyDir fails if target dir does not exists.
|
2017-02-25 11:53:50 +01:00 |
|
Laurent Destailleur
|
1e45e64a9a
|
Files sent from ECM module are also indexed in database.
|
2017-02-22 20:35:42 +01:00 |
|
Laurent Destailleur
|
b66ba6c57c
|
Fix warning
|
2017-02-22 19:48:15 +01:00 |
|
arnaud
|
4ec664029d
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment
|
2017-02-17 16:40:14 +01:00 |
|
arnaud
|
977c18513d
|
FIX pdf supplier payment work
|
2017-02-14 12:00:56 +01:00 |
|
Laurent Destailleur
|
7e3785d446
|
FIX the dolCopyDir fails if target dir does not exists.
|
2017-02-11 15:42:57 +01:00 |
|
Laurent Destailleur
|
3fa19f84e3
|
FIX the dolCopyDir fails if target dir does not exists.
|
2017-02-11 15:40:25 +01:00 |
|
Laurent Destailleur
|
9220a638b5
|
NEW Filechecker can include custom dir and report added files.
|
2017-02-06 15:29:07 +01:00 |
|
Laurent Destailleur
|
412be59f78
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2017-01-20 12:09:39 +01:00 |
|
Laurent Destailleur
|
4047de82bd
|
Fix navigation on projects
|
2017-01-20 10:27:37 +01:00 |
|
Laurent Destailleur
|
f46ce68d08
|
NEW Can sort thumbs visible on product card
|
2016-12-31 16:16:20 +01:00 |
|
Laurent Destailleur
|
f1961b0207
|
Work on sorting/indexing upload files
|
2016-12-31 03:43:22 +01:00 |
|
Laurent Destailleur
|
26098082d0
|
NEW Uploaded files are indexed into database
|
2016-12-20 22:14:27 +01:00 |
|
Laurent Destailleur
|
ed0ffd6f5a
|
NEW Uploaded files are indexed into database
|
2016-12-20 19:42:25 +01:00 |
|
Laurent Destailleur
|
e1a5a90f0a
|
NEW Uploaded files are indexed into database
|
2016-12-13 00:15:21 +01:00 |
|
Laurent Destailleur
|
e26cb0f238
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
|
2016-12-12 13:00:20 +01:00 |
|
Juanjo Menent
|
99542de935
|
Fix: fails to load image to redim into photo resize
|
2016-12-10 14:47:18 +01:00 |
|
Laurent Destailleur
|
3396dfc7f6
|
NEW Index upload files into database.
|
2016-12-08 22:12:45 +01:00 |
|
Laurent Destailleur
|
5acd09b2d5
|
Fix require_once instead of require.
|
2016-11-24 17:03:18 +01:00 |
|
Laurent Destailleur
|
7c1b74133a
|
Debug accountancy module
|
2016-10-13 22:29:49 +02:00 |
|
Laurent Destailleur
|
db3e3642b0
|
NEW Can generate SEPA mandate for each bank account of your customers
|
2016-10-06 00:14:25 +02:00 |
|
Laurent Destailleur
|
ee252f549a
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
dev/skeletons/skeleton_list.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/lib/cron.lib.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
|
2016-10-01 18:42:50 +02:00 |
|
Laurent Destailleur
|
91a9cb4178
|
Fix solution to avoid the .noexe
|
2016-10-01 14:02:24 +02:00 |
|
Laurent Destailleur
|
3e84d227b3
|
Remove not used function calculate_byte. Use dol_print_size instead.
|
2016-08-31 19:57:17 +02:00 |
|
Laurent Destailleur
|
034b08ce56
|
NEW Add option "Hide images in Top menu".
|
2016-08-05 23:40:00 +02:00 |
|
Laurent Destailleur
|
890e6f59c8
|
NEW Support mass actions for proposals
|
2016-08-05 13:08:23 +02:00 |
|
Laurent Destailleur
|
f0a3a5ce02
|
NEW Mutualize mass action. So "Send by email" is also avavilable on
orders.
|
2016-07-25 21:50:41 +02:00 |
|
Laurent Destailleur
|
07d0f457b4
|
Fix: files generated by mass action could not be loaded
|
2016-07-23 12:44:28 +02:00 |
|
Laurent Destailleur
|
2767df2e01
|
FIX Solve problem of sending joinded files of another email when several
tabs are opened on form to send emails.
|
2016-06-24 16:10:52 +02:00 |
|
Laurent Destailleur
|
4a408e76e7
|
Fix download of mass generated files.
|
2016-06-22 21:06:08 +02:00 |
|
Laurent Destailleur
|
f59f3032c6
|
NEW: Rename path for generic medias files into '/medias' instead of
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
|
2016-05-01 16:34:50 +02:00 |
|
Marcos García de La Fuente
|
e2c86d3fd8
|
NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
|
2016-04-17 15:24:22 +02:00 |
|
Laurent Destailleur
|
5b55af4d66
|
NEW Mutualize code: Use one call of function "addThumbs", when possible,
to generate thumbs files instead of several call of "vignette" function.
|
2016-04-09 14:12:21 +02:00 |
|
Laurent Destailleur
|
10f639507f
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/lib/files.lib.php
|
2016-04-02 15:54:51 +02:00 |
|
Laurent Destailleur
|
066c793de2
|
FIX image extension must be in lower case
Conflicts:
htdocs/core/lib/files.lib.php
|
2016-04-02 15:46:01 +02:00 |
|
Laurent Destailleur
|
c12541f4f2
|
FIX image extension must be in lower case
|
2016-04-02 15:00:58 +02:00 |
|
Laurent Destailleur
|
c0b2d7405a
|
FIX Generated thumbs must always use the png format so using thumbs can
work.
|
2016-04-02 14:46:04 +02:00 |
|
Laurent Destailleur
|
be8384389f
|
FIX Creation of thumb image for size "small" was not done.
Conflicts:
htdocs/core/lib/files.lib.php
|
2016-04-02 14:20:21 +02:00 |
|
Laurent Destailleur
|
66f9f0d046
|
FIX Creation of thumb image for size "small" was not done.
|
2016-04-02 14:15:38 +02:00 |
|
Laurent Destailleur
|
7aaae143fc
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/expedition/card.php
|
2016-02-15 02:01:58 +01:00 |
|
Raphaël Doursenaud
|
d038ca1875
|
FIX #4597 PHP 7 Uniform Variable Syntax
PHP7 compatibility with the new Uniform Variable Syntax.
This change is compatible with both PHP 5 and PHP 7.
See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes
|
2016-02-11 20:01:51 +01:00 |
|
Laurent Destailleur
|
426e9297ea
|
Prepare code to match cron rule: 0 if ok, !=0 if error
|
2016-01-31 14:20:02 +01:00 |
|
Laurent Destailleur
|
4df584e57b
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/lib/files.lib.php
|
2016-01-23 11:51:56 +01:00 |
|
Laurent Destailleur
|
dbaa43f3be
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/fourn/commande/card.php
htdocs/holiday/card.php
htdocs/holiday/list.php
htdocs/user/card.php
|
2016-01-23 11:45:39 +01:00 |
|
Laurent Destailleur
|
fedf1f3288
|
Fix view of product image when using old path
Fix size of image uploaded on user.
|
2016-01-22 14:02:48 +01:00 |
|
phf
|
2f5f6c9ead
|
NEW hidden conf to use input file multiple from mail form
|
2015-12-10 13:48:37 +01:00 |
|
philippe grand
|
4f280f63d0
|
[Qual] Uniformize code
|
2015-11-19 13:59:58 +01:00 |
|