florian HENRY
|
e2d13c0e1f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
|
2019-02-13 09:23:52 +01:00 |
|
florian HENRY
|
5c059c897d
|
fix travis (mosty for dev no conerne by my changes)
|
2019-02-13 09:21:14 +01:00 |
|
Laurent Destailleur
|
f1500281ef
|
Fix phpcs
|
2019-02-12 19:00:50 +01:00 |
|
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
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +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
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Frédéric FRANCE
|
b00164ca39
|
test phpcs v3
|
2018-08-09 11:03:50 +02:00 |
|
Frédéric FRANCE
|
3f4db55614
|
test include
|
2018-07-26 11:34:51 +02:00 |
|
Laurent Destailleur
|
72e149e1a6
|
FIX SEC Improve CSRF protection. Reduce usage of NOCSRFCHECK.
|
2016-09-08 12:12:00 +02:00 |
|
Laurent Destailleur
|
a258370f8a
|
Prepare code for generic solution where all path are forged using
get_exdir.
|
2015-05-18 22:25:51 +02:00 |
|
Laurent Destailleur
|
9768550696
|
Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
|
2014-10-12 02:54:34 +02:00 |
|
Florian HENRY
|
96c5771718
|
Fix web service category
|
2014-09-26 16:18:32 +02:00 |
|
Raphaël Doursenaud
|
b9954f5b2b
|
PHP 5.6 compatibility
$HTTP_RAW_POST_DATA is now DEPRECATED
Replaced all usages by the recommended file_get_contents("php://input")
|
2014-09-16 21:21:34 +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
|
c41a955cbe
|
Fix: Permissions on files
|
2013-08-06 00:36:04 +02:00 |
|
Laurent Destailleur
|
8f214a77c5
|
Fix: Fix error with linux rules
|
2013-04-30 21:31:35 +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 |
|
Laurent Destailleur
|
72608e7a72
|
Fix: Checkstyle
|
2012-11-19 23:43:14 +01:00 |
|
jfefe
|
324b11ebb9
|
Add comment
|
2012-11-18 13:20:27 +01:00 |
|
jfefe
|
f47ce7b220
|
New webservice to fetch categories
|
2012-11-18 13:15:19 +01:00 |
|