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
|
68e333879f
|
Fix var not sanitized
|
2017-05-16 13:27:32 +02:00 |
|
florian HENRY
|
0f0db5a3fb
|
fix: uniformize
|
2016-12-10 12:06:18 +01:00 |
|
aspangaro
|
4a899cd856
|
Typo
|
2015-07-15 19:13:23 +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
|
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 |
|
Marcos García
|
f3674317ec
|
Removed parenthesis from all require and replaced with single quotes
|
2012-08-22 23:24:21 +02:00 |
|
Marcos García
|
706d79986c
|
Removed parenthesis from all require_once and replaced with single quotes
|
2012-08-22 23:11:24 +02:00 |
|
Laurent Destailleur
|
c89fd4b1e7
|
New: Can conciliate several lines in one operation.
|
2012-02-15 12:16:33 +01:00 |
|