Commit Graph

5 Commits

Author SHA1 Message Date
Laurent Destailleur
983f707553 Add comment 2017-01-16 11:35:25 +01:00
Laurent Destailleur
18a1f9033c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/api/class/api_generic.class.php
	htdocs/api/index.php
2016-11-27 16:25:38 +01:00
Laurent Destailleur
3cb13e16d1 Merge branch 'rest-api-add-accounts' of
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-rest-api-add-accounts

Conflicts:
	htdocs/api/index.php
	htdocs/commande/class/api_orders.class.php
2016-09-26 02:28:16 +02:00
Laurent Destailleur
100312aac2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/adherents/class/cotisation.class.php
2016-09-26 01:32:50 +02:00
Xebax
5ea526c29e REST API: update the API to have /login and /status.
Replace the GenericApi class by two classes, Login and Status, else the
endpoints would be /generic/login and /generic/status.
2016-06-20 17:56:33 +02:00