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

..

adodbtime

Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context

2015-12-16 13:32:44 +01:00

ccampbell/chromephp

Fix dos and bom and end of line

2016-03-12 18:30:19 +01:00

ckeditor/ckeditor

Upgrade to ckeditor 4.6.2.

2017-02-28 10:49:58 +01:00

evalmath

…

fonts

…

geoip

…

jquery

Add jquery-migrate to handle jquery 3.0 removes

2017-03-29 11:18:03 +02:00

jsgantt

Revert "change jsgantt to jsGanttImproved"

2016-07-26 13:59:08 +02:00

jstz

better includes externel library

2016-03-18 10:56:55 +01:00

mike42/escpos-php

Revert "Update escpos-php"

2016-05-18 13:18:55 +02:00

mobiledetect/mobiledetectlib

Fix dos and bom and end of line

2016-03-12 18:30:19 +01:00

nusoap/lib

Clean doc about changes in external libraries

2017-02-24 14:35:20 +01:00

OAuth

Fix oauth2 token generation for Google. The refresh token was not

2017-01-17 20:05:10 +01:00

odtphp

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-05-05 14:49:25 +02:00

parsedown

NEW Add function dolMd2Html

2017-03-21 16:03:13 +01:00

php-iban

Merge branch 'dolibarr-php7' of https://github.com/GPCsolutions/dolibarr

2015-11-11 19:03:36 +01:00

phpoffice/phpexcel

Merge remote-tracking branch 'origin/3.9' into 4.0

2016-07-16 19:54:57 +02:00

printipp

…

restler/framework/Luracast/Restler

Clean doc about changes in external libraries

2017-02-24 14:35:20 +01:00

swiftmailer/lib

Fix perms on file

2017-04-24 03:11:19 +02:00

tcpdi

FIX Avoid error 500 if phpexcel is disabled

2016-10-22 16:53:22 +02:00

tecnickcom/tcpdf

Removed not required directories

2016-04-22 11:11:24 +02:00

index.html

…