Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +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
f8ca44e42c
NEW Preview of images into the filemanager component
2019-01-15 15:48:28 +01:00
Laurent Destailleur
d9bb39970f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/barcode.php
2018-12-04 13:20:40 +01:00
Laurent Destailleur
5061a9b0c2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/install/mysql/tables/llx_paiementfourn.sql
2018-12-04 13:17:25 +01:00
Maxime Kohlhaas
5e2f3a53c9
Fix expense report in ecm auto dir
2018-12-01 19:39:00 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Laurent Destailleur
d4bc53660b
Code comment and debug filemanager
2018-10-18 21:22:30 +02:00
Laurent Destailleur
fde9c94b1c
Fix regression in media editor in websites
2018-08-28 14:21:58 +02:00
Frédéric FRANCE
d986909109
loadlangs
2018-05-26 23:52:52 +02:00
Laurent Destailleur
e19ca7b6d4
Work on generic filemanager
2017-11-20 18:19:41 +01:00
Laurent Destailleur
9b1470dab5
Work on generic filemanager component
2017-11-18 22:13:19 +01:00
Laurent Destailleur
beacf4225f
Work on filemanager
2017-11-10 15:44:43 +01:00
Laurent Destailleur
ab78007a54
Work on filemanager generic component
2017-11-10 13:45:38 +01:00
Laurent Destailleur
a066bbcd89
Debug filemanager
2017-11-05 02:50:02 +01:00
Laurent Destailleur
51c705a84b
NEW Reduce size of HTML page by removing duplicate tooltips
2017-11-05 01:00:15 +01:00
Laurent Destailleur
bbe1c9c494
NEW Can download PDF document from the payment page
2017-10-30 00:45:47 +01:00
Laurent Destailleur
083cb33a6c
Clean ecm code
2017-08-20 23:16:20 +02:00
Laurent Destailleur
c107a77722
NEW Can filter on document name in ECM module for automatic tree
2017-08-04 13:10:51 +02:00
Laurent Destailleur
71d49f1c6f
Fix pb in ecm
2017-08-01 18:44:34 +02:00
Laurent Destailleur
693b2fe3b4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/ajax/ajaxdirpreview.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/tpl/objectline_create.tpl.php
2017-06-23 11:20:29 +02:00
Laurent Destailleur
3ec0e6f7ef
FIX #6885
2017-06-20 12:31:08 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6
Escape hml tags
2017-06-18 19:42:59 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
8ac1aab45a
Uniformize look and feels
2017-03-07 18:34:57 +01:00
Laurent Destailleur
d2d0e66c5c
Fix style fo ECM module
2016-12-13 01:19:33 +01:00
aspangaro
337e9db046
New: Expense report documents are now available in ECM module
2016-10-24 05:26:19 +02:00
Laurent Destailleur
1f7bc1d518
FIX Bad sort link on ECM module for automatic tab
2016-07-11 02:06:46 +02:00
Maxime Kohlhaas
a5472b58d1
FIX #5108
2016-06-05 00:24:00 +02:00
Laurent Destailleur
7021f4fb01
Fix: Message show when dir is out of sync with database cache was wrong.
2014-09-03 16:09:14 +02:00
Maxime Kohlhaas
1b3efbb9a3
New : add attachments on user cards
2014-08-05 16:01:40 +02:00
Maxime Kohlhaas
90c397d1a4
New: Intervention documents are now available in ECM module
2014-08-05 15:24:49 +02:00
Raphaël Doursenaud
c48c3a9d91
Qual: remove PHP closing tag (again)
...
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Laurent Destailleur
19d71ffb38
Prepare fix to hide images generated by "preview" feature.
2014-04-29 21:14:55 +02:00
Laurent Destailleur
2d8214a940
Fix: The delete button into ecm module does not work when ajax disabled.
2014-01-05 18:37:26 +01:00
Marcos García
293fc89a9f
Missing copyright
2013-04-21 12:45:34 +02:00
Marcos García
17902a8455
Removed var_dump
2013-04-21 12:44:13 +02:00
Marcos García
7befeae371
ECM Refactor
2013-04-21 12:42:58 +02:00
fhenry
7881502b52
[ task #773 ] Add Project document in GED(ECM) modules
2013-03-25 09:56:07 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Laurent Destailleur
a7e35a9308
Fix: If we exclude dirs, we must also clean array to avoid to count
...
them.
2012-10-27 20:02:09 +02:00
Laurent Destailleur
4b27a9215b
Fix: Show message only when needed
2012-10-03 23:15:57 +02:00
Laurent Destailleur
59a33db53d
Fix: Add warning to ask refresh.
2012-10-03 20:10:29 +02:00
Laurent Destailleur
2927a58606
Fix: Some fix into ajax ecm.
...
New: The cache for nb of files into a dir is now implemented. By
default it is "not defined" and we refresh it when making a scan of a
dir for all subdirs.
2012-09-02 20:11:36 +02:00
Laurent Destailleur
f369c9d99b
New: ECM autodir works also for files joined to products and services
2012-09-02 15:03:55 +02:00