[Dolibarr-git] [Dolibarr/dolibarr] cd11cc: Add Members to the REST API.

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: cd11ccbedba67536a09b64f41e91b8ae7536862c
      
https://github.com/Dolibarr/dolibarr/commit/cd11ccbedba67536a09b64f41e91b8ae7536862c
  Author: Xebax <address@hidden>
  Date:   2016-09-25 (Sun, 25 Sep 2016)

  Changed paths:
    A htdocs/adherents/class/api_members.class.php
    M htdocs/api/index.php

  Log Message:
  -----------
  Add Members to the REST API.


  Commit: d05c8d32b1bf8e8a2dfa0d95ce3842c7202b93b4
      
https://github.com/Dolibarr/dolibarr/commit/d05c8d32b1bf8e8a2dfa0d95ce3842c7202b93b4
  Author: Xebax <address@hidden>
  Date:   2016-09-25 (Sun, 25 Sep 2016)

  Changed paths:
    A htdocs/adherents/class/api_subscriptions.class.php
    M htdocs/adherents/class/cotisation.class.php

  Log Message:
  -----------
  Add Subscriptions to the REST API.


  Commit: ea09eb13dabaaef4fdf77b625817f18193379a2d
      
https://github.com/Dolibarr/dolibarr/commit/ea09eb13dabaaef4fdf77b625817f18193379a2d
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
    M htdocs/comm/action/card.php
    M htdocs/comm/propal/card.php
    M htdocs/commande/card.php
    M htdocs/compta/facture.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/html.formcontract.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/product/stock/card.php
    M htdocs/supplier_proposal/card.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php

  Log Message:
  -----------
  Uniformize code


  Commit: 17f3e09689a4abc99329b68eaa1b0852f2a4f83b
      
https://github.com/Dolibarr/dolibarr/commit/17f3e09689a4abc99329b68eaa1b0852f2a4f83b
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
    M htdocs/admin/system/about.php

  Log Message:
  -----------
  Fix link https


  Commit: 0809be6680a22192a8f9242e8e8dc6b5cc6bcb0f
      
https://github.com/Dolibarr/dolibarr/commit/0809be6680a22192a8f9242e8e8dc6b5cc6bcb0f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
    A htdocs/adherents/class/api_members.class.php
    A htdocs/adherents/class/api_subscriptions.class.php
    M htdocs/adherents/class/cotisation.class.php
    M htdocs/api/index.php

  Log Message:
  -----------
  Merge branch 'rest-api-add-members-and-subscriptions' of 
https://github.com/EuskalMoneta/dolibarr into 
EuskalMoneta-rest-api-add-members-and-subscriptions


  Commit: e9a073b22302308b0c0ce3940d92c91736634b30
      
https://github.com/Dolibarr/dolibarr/commit/e9a073b22302308b0c0ce3940d92c91736634b30
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
    A htdocs/adherents/class/api_members.class.php
    A htdocs/adherents/class/api_subscriptions.class.php
    M htdocs/adherents/class/cotisation.class.php
    M htdocs/api/index.php

  Log Message:
  -----------
  git push origin developMerge branch 
'EuskalMoneta-rest-api-add-members-and-subscriptions' into develop


  Commit: ac2c685e7df89be604d46495ce434df53dfa4fd2
      
https://github.com/Dolibarr/dolibarr/commit/ac2c685e7df89be604d46495ce434df53dfa4fd2
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
    M htdocs/adherents/class/cotisation.class.php

  Log Message:
  -----------
  Fix bad commit


  Commit: 100312aac239b38cc06f272b93aff43ba3cf482c
      
https://github.com/Dolibarr/dolibarr/commit/100312aac239b38cc06f272b93aff43ba3cf482c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
    A htdocs/adherents/admin/index.html
    A htdocs/adherents/canvas/default/index.html
    M htdocs/adherents/card.php
    R htdocs/adherents/card_subscriptions.php
    M htdocs/adherents/cartes/carte.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/class/adherent_type.class.php
    M htdocs/adherents/class/adherentstats.class.php
    M htdocs/adherents/class/api_members.class.php
    M htdocs/adherents/class/api_subscriptions.class.php
    R htdocs/adherents/class/cotisation.class.php
    A htdocs/adherents/class/subscription.class.php
    R htdocs/adherents/cotisations.php
    R htdocs/adherents/fiche_subscription.php
    M htdocs/adherents/htpasswd.php
    M htdocs/adherents/index.php
    R htdocs/adherents/info_subscription.php
    M htdocs/adherents/list.php
    A htdocs/adherents/stats/index.html
    A htdocs/adherents/subscription.php
    A htdocs/adherents/subscription/card.php
    A htdocs/adherents/subscription/index.html
    A htdocs/adherents/subscription/info.php
    A htdocs/adherents/subscription/list.php
    M htdocs/adherents/type.php
    M htdocs/api/class/api_login.class.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/api_orders.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/paiement/cheque/card.php
    M htdocs/compta/prelevement/create.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/boxes/box_members.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/lib/member.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/ecm/docdir.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/install/mysql/tables/llx_adherent_type.sql
    R htdocs/install/mysql/tables/llx_cotisation.key.sql
    R htdocs/install/mysql/tables/llx_cotisation.sql
    A htdocs/install/mysql/tables/llx_subscription.key.sql
    A htdocs/install/mysql/tables/llx_subscription.sql
    M htdocs/install/pgsql/functions/functions.sql
    M htdocs/public/members/public_list.php
    M htdocs/public/paybox/newpayment.php
    M htdocs/public/paypal/newpayment.php
    M htdocs/societe/societecontact.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into
develop

Conflicts:
        htdocs/adherents/class/cotisation.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/0ab37282768c...100312aac239