Laurent Destailleur c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/filefunc.inc.php

2017-09-25 19:55:52 +02:00

..

box_actions.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_activity.php

Fix wrap on lites_total

2017-09-23 09:28:31 +02:00

box_bookmarks.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_clients.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_commandes.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_comptes.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_contacts.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_contracts.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_external_rss.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_factures_fourn_imp.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_factures_fourn.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_factures_imp.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_factures.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_ficheinter.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_fournisseurs.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_goodcustomers.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_graph_invoices_permonth.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_graph_invoices_supplier_permonth.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_graph_orders_permonth.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_graph_orders_supplier_permonth.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_graph_product_distribution.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_graph_propales_permonth.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_lastlogin.php

Work on 6.0 look and feel

2017-03-31 17:41:20 +02:00

box_members.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_produits_alerte_stock.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_produits.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_project.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_propales.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_prospect.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_services_contracts.php

Missing space in request

2017-09-25 10:49:56 +02:00

box_services_expired.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_supplier_orders.php

Merge 5.0

2017-06-12 18:22:51 +02:00

box_task.php

Merge 5.0

2017-06-12 18:22:51 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

modules_boxes.php

Fix css

2017-09-23 02:46:33 +02:00