[Dolibarr-git] [Dolibarr/dolibarr] a61827: Allow modify API key from user card

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a6182747607ec7774f0ed1a8f0c336d91f9cc20c
      
https://github.com/Dolibarr/dolibarr/commit/a6182747607ec7774f0ed1a8f0c336d91f9cc20c
  Author: jfefe <address@hidden>
  Date:   2015-05-29 (Fri, 29 May 2015)

  Changed paths:
    M htdocs/langs/en_US/admin.lang
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Allow modify API key from user card


  Commit: 190ee35e86c3e84828a2a87320bdb664385eeb01
      
https://github.com/Dolibarr/dolibarr/commit/190ee35e86c3e84828a2a87320bdb664385eeb01
  Author: jfefe <address@hidden>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M .travis.yml
    M ChangeLog
    M build/makepack-dolibarr.pl
    M build/makepack-howto.txt
    M dev/ansible/README.md
    M dev/codesniffer/ruleset.xml
    M dev/fixaltlanguages.sh
    A dev/multitail/.multitailrc
    M dev/skeletons/modMyModule.class.php
    M dev/skeletons/skeleton_class.class.php
    M dev/skeletons/skeleton_page.php
    M dev/translation/strip_language_file.php
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/accountancy/supplier/index.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/adherents/canvas/actions_adherentcard_common.class.php
    M htdocs/adherents/card.php
    M htdocs/adherents/class/adherent_type.class.php
    M htdocs/adherents/list.php
    M htdocs/admin/company.php
    M htdocs/admin/dict.php
    M htdocs/admin/ihm.php
    M htdocs/admin/mails.php
    M htdocs/admin/modules.php
    M htdocs/admin/tools/index.php
    M htdocs/admin/tools/purge.php
    M htdocs/api/class/api.class.php
    M htdocs/api/class/api_access.class.php
    M htdocs/cashdesk/admin/cashdesk.php
    M htdocs/cashdesk/facturation_dhtml.php
    M htdocs/cashdesk/javascript/dhtml.js
    M htdocs/cashdesk/tpl/facturation1.tpl.php
    M htdocs/categories/card.php
    M htdocs/categories/categorie.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/edit.php
    M htdocs/categories/viewcat.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/document.php
    M htdocs/comm/askpricesupplier/card.php
    M htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
    M htdocs/comm/card.php
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/document.php
    M htdocs/comm/propal/list.php
    M htdocs/comm/propal/note.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/apercu.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/deplacement/class/deplacement.class.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/class/facturestats.class.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/facture/mergepdftool.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/index.php
    M htdocs/compta/localtax/clients.php
    M htdocs/compta/localtax/quadri_detail.php
    M htdocs/compta/paiement.php
    M htdocs/compta/paiement/class/paiement.class.php
    A htdocs/compta/salaries/document.php
    M htdocs/compta/sociales/charges.php
    M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
    M htdocs/contact/canvas/actions_contactcard_common.class.php
    M htdocs/contact/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/document.php
    M htdocs/contact/list.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/list.php
    M htdocs/core/actions_extrafields.inc.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/commonobjectline.class.php
    M htdocs/core/class/commonorder.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/dolprintipp.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formadmin.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmail.class.php
    A htdocs/core/class/html.formmargin.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/db/DoliDB.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/contact.lib.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/donation.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/geturl.lib.php
    M htdocs/core/lib/images.lib.php
    M htdocs/core/lib/json.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/report.lib.php
    M htdocs/core/lib/salaries.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/login/functions_dolibarr.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/askpricesupplier/modules_askpricesupplier.php
    M htdocs/core/modules/commande/modules_commande.php
    M htdocs/core/modules/contract/modules_contract.php
    M htdocs/core/modules/dons/html_cerfafr.modules.php
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/modules/facture/mod_facture_mars.php
    M htdocs/core/modules/facture/mod_facture_terre.php
    M htdocs/core/modules/facture/modules_facture.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/modules_livraison.php
    M htdocs/core/modules/mailings/example.modules.php
    M htdocs/core/modules/mailings/fraise.modules.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modDon.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/modGravatar.class.php
    M htdocs/core/modules/modMailmanSpip.class.php
    M htdocs/core/modules/modPrinting.class.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/core/modules/modSalaries.class.php
    M htdocs/core/modules/modSyncSupplierWebServices.class.php
    M htdocs/core/modules/printing/printgcp.modules.php
    M htdocs/core/modules/project/modules_project.php
    M htdocs/core/modules/project/task/modules_task.php
    M htdocs/core/modules/propale/modules_propale.php
    M htdocs/core/modules/supplier_order/modules_commandefournisseur.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/document_actions_pre_headers.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/resource_add.tpl.php
    M htdocs/core/tpl/resource_view.tpl.php
    M htdocs/core/triggers/dolibarrtriggers.class.php
    M htdocs/cron/card.php
    M htdocs/cron/info.php
    M htdocs/cron/list.php
    M htdocs/don/admin/donation.php
    M htdocs/don/card.php
    M htdocs/don/class/don.class.php
    M htdocs/don/class/paymentdonation.class.php
    A htdocs/don/document.php
    M htdocs/don/info.php
    M htdocs/don/payment/payment.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/index.php
    M htdocs/expensereport/list.php
    M htdocs/fichinter/card.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/index.php
    M htdocs/includes/printipp/BasicIPP.php
    M htdocs/index.php
    M htdocs/install/mysql/data/llx_10_c_regions.sql
    M htdocs/install/mysql/data/llx_20_c_departements.sql
    M htdocs/install/mysql/data/llx_c_forme_juridique.sql
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_actioncomm.sql
    M htdocs/install/mysql/tables/llx_cronjob.sql
    M htdocs/install/mysql/tables/llx_product.sql
    M htdocs/install/mysql/tables/llx_societe_rib.sql
    M htdocs/install/mysql/tables/llx_stock_mouvement.sql
    M htdocs/install/upgrade2.php
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/ar_SA/install.lang
    M htdocs/langs/ca_ES/accountancy.lang
    M htdocs/langs/ca_ES/trips.lang
    M htdocs/langs/cs_CZ/accountancy.lang
    M htdocs/langs/cs_CZ/admin.lang
    M htdocs/langs/cs_CZ/agenda.lang
    M htdocs/langs/cs_CZ/bills.lang
    M htdocs/langs/cs_CZ/boxes.lang
    M htdocs/langs/cs_CZ/cashdesk.lang
    M htdocs/langs/cs_CZ/categories.lang
    M htdocs/langs/cs_CZ/commercial.lang
    M htdocs/langs/cs_CZ/companies.lang
    M htdocs/langs/cs_CZ/compta.lang
    M htdocs/langs/cs_CZ/contracts.lang
    M htdocs/langs/cs_CZ/cron.lang
    M htdocs/langs/cs_CZ/deliveries.lang
    M htdocs/langs/cs_CZ/donations.lang
    M htdocs/langs/cs_CZ/ecm.lang
    M htdocs/langs/cs_CZ/externalsite.lang
    M htdocs/langs/cs_CZ/holiday.lang
    M htdocs/langs/cs_CZ/install.lang
    M htdocs/langs/cs_CZ/interventions.lang
    M htdocs/langs/cs_CZ/languages.lang
    M htdocs/langs/cs_CZ/link.lang
    M htdocs/langs/cs_CZ/mails.lang
    M htdocs/langs/cs_CZ/main.lang
    M htdocs/langs/cs_CZ/margins.lang
    M htdocs/langs/cs_CZ/opensurvey.lang
    M htdocs/langs/cs_CZ/orders.lang
    M htdocs/langs/cs_CZ/other.lang
    M htdocs/langs/cs_CZ/paybox.lang
    M htdocs/langs/cs_CZ/paypal.lang
    M htdocs/langs/cs_CZ/printipp.lang
    M htdocs/langs/cs_CZ/productbatch.lang
    M htdocs/langs/cs_CZ/products.lang
    M htdocs/langs/cs_CZ/projects.lang
    M htdocs/langs/cs_CZ/propal.lang
    M htdocs/langs/cs_CZ/resource.lang
    M htdocs/langs/cs_CZ/salaries.lang
    M htdocs/langs/cs_CZ/sendings.lang
    M htdocs/langs/cs_CZ/stocks.lang
    M htdocs/langs/cs_CZ/suppliers.lang
    M htdocs/langs/cs_CZ/trips.lang
    M htdocs/langs/cs_CZ/users.lang
    M htdocs/langs/cs_CZ/withdrawals.lang
    M htdocs/langs/cs_CZ/workflow.lang
    M htdocs/langs/de_AT/main.lang
    M htdocs/langs/de_AT/other.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/de_DE/agenda.lang
    M htdocs/langs/de_DE/banks.lang
    M htdocs/langs/de_DE/bills.lang
    M htdocs/langs/de_DE/bookmarks.lang
    M htdocs/langs/de_DE/boxes.lang
    M htdocs/langs/de_DE/cashdesk.lang
    M htdocs/langs/de_DE/categories.lang
    M htdocs/langs/de_DE/commercial.lang
    M htdocs/langs/de_DE/companies.lang
    M htdocs/langs/de_DE/compta.lang
    M htdocs/langs/de_DE/contracts.lang
    M htdocs/langs/de_DE/cron.lang
    M htdocs/langs/de_DE/dict.lang
    M htdocs/langs/de_DE/errors.lang
    M htdocs/langs/de_DE/exports.lang
    M htdocs/langs/de_DE/externalsite.lang
    M htdocs/langs/de_DE/holiday.lang
    M htdocs/langs/de_DE/install.lang
    M htdocs/langs/de_DE/link.lang
    M htdocs/langs/de_DE/mails.lang
    M htdocs/langs/de_DE/main.lang
    M htdocs/langs/de_DE/members.lang
    M htdocs/langs/de_DE/opensurvey.lang
    M htdocs/langs/de_DE/orders.lang
    M htdocs/langs/de_DE/other.lang
    M htdocs/langs/de_DE/paybox.lang
    M htdocs/langs/de_DE/printipp.lang
    M htdocs/langs/de_DE/products.lang
    M htdocs/langs/de_DE/projects.lang
    M htdocs/langs/de_DE/propal.lang
    M htdocs/langs/de_DE/sendings.lang
    M htdocs/langs/de_DE/stocks.lang
    M htdocs/langs/de_DE/suppliers.lang
    M htdocs/langs/de_DE/trips.lang
    M htdocs/langs/de_DE/users.lang
    M htdocs/langs/de_DE/withdrawals.lang
    M htdocs/langs/de_DE/workflow.lang
    A htdocs/langs/en_GB/categories.lang
    A htdocs/langs/en_GB/sendings.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/languages.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/salaries.lang
    M htdocs/langs/en_US/users.lang
    M htdocs/langs/en_US/withdrawals.lang
    A htdocs/langs/es_AR/categories.lang
    A htdocs/langs/es_AR/sendings.lang
    A htdocs/langs/es_CO/categories.lang
    A htdocs/langs/es_CO/sendings.lang
    M htdocs/langs/es_MX/admin.lang
    M htdocs/langs/es_MX/banks.lang
    M htdocs/langs/es_MX/bills.lang
    M htdocs/langs/es_MX/categories.lang
    A htdocs/langs/es_MX/commercial.lang
    R htdocs/langs/es_MX/companies.lang
    A htdocs/langs/es_MX/cron.lang
    A htdocs/langs/es_MX/interventions.lang
    A htdocs/langs/es_MX/mails.lang
    M htdocs/langs/es_MX/main.lang
    A htdocs/langs/es_MX/orders.lang
    A htdocs/langs/es_MX/other.lang
    A htdocs/langs/es_MX/productbatch.lang
    A htdocs/langs/es_MX/sendings.lang
    M htdocs/langs/es_MX/stocks.lang
    A htdocs/langs/es_MX/suppliers.lang
    A htdocs/langs/es_MX/trips.lang
    M htdocs/langs/et_EE/accountancy.lang
    M htdocs/langs/et_EE/cashdesk.lang
    M htdocs/langs/et_EE/companies.lang
    M htdocs/langs/et_EE/install.lang
    M htdocs/langs/et_EE/main.lang
    M htdocs/langs/et_EE/products.lang
    M htdocs/langs/fr_CA/admin.lang
    A htdocs/langs/fr_CA/banks.lang
    A htdocs/langs/fr_CA/bills.lang
    A htdocs/langs/fr_CA/categories.lang
    A htdocs/langs/fr_CA/commercial.lang
    R htdocs/langs/fr_CA/companies.lang
    A htdocs/langs/fr_CA/cron.lang
    A htdocs/langs/fr_CA/interventions.lang
    A htdocs/langs/fr_CA/mails.lang
    M htdocs/langs/fr_CA/main.lang
    A htdocs/langs/fr_CA/orders.lang
    A htdocs/langs/fr_CA/other.lang
    A htdocs/langs/fr_CA/productbatch.lang
    A htdocs/langs/fr_CA/sendings.lang
    A htdocs/langs/fr_CA/suppliers.lang
    A htdocs/langs/fr_CA/trips.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/banks.lang
    M htdocs/langs/fr_FR/members.lang
    M htdocs/langs/fr_FR/orders.lang
    M htdocs/langs/fr_FR/other.lang
    M htdocs/langs/fr_FR/productbatch.lang
    M htdocs/langs/fr_FR/projects.lang
    M htdocs/langs/it_IT/accountancy.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/it_IT/agenda.lang
    M htdocs/langs/it_IT/bills.lang
    M htdocs/langs/it_IT/categories.lang
    M htdocs/langs/it_IT/donations.lang
    M htdocs/langs/it_IT/errors.lang
    M htdocs/langs/it_IT/orders.lang
    M htdocs/langs/it_IT/other.lang
    M htdocs/langs/lv_LV/admin.lang
    M htdocs/langs/lv_LV/bills.lang
    M htdocs/langs/lv_LV/boxes.lang
    M htdocs/langs/lv_LV/commercial.lang
    M htdocs/langs/lv_LV/dict.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nb_NO/agenda.lang
    M htdocs/langs/nb_NO/bills.lang
    M htdocs/langs/nb_NO/boxes.lang
    M htdocs/langs/nb_NO/commercial.lang
    M htdocs/langs/nb_NO/contracts.lang
    M htdocs/langs/nb_NO/cron.lang
    M htdocs/langs/nb_NO/deliveries.lang
    M htdocs/langs/nb_NO/errors.lang
    M htdocs/langs/nb_NO/install.lang
    M htdocs/langs/nb_NO/languages.lang
    M htdocs/langs/nb_NO/mailmanspip.lang
    M htdocs/langs/nb_NO/main.lang
    M htdocs/langs/nb_NO/opensurvey.lang
    M htdocs/langs/nb_NO/orders.lang
    M htdocs/langs/nb_NO/productbatch.lang
    M htdocs/langs/nb_NO/products.lang
    M htdocs/langs/nb_NO/propal.lang
    M htdocs/langs/nb_NO/salaries.lang
    M htdocs/langs/nb_NO/suppliers.lang
    M htdocs/langs/nb_NO/trips.lang
    A htdocs/langs/pt_BR/productbatch.lang
    M htdocs/langs/pt_PT/productbatch.lang
    M htdocs/langs/tr_TR/bills.lang
    M htdocs/livraison/card.php
    M htdocs/livraison/class/livraison.class.php
    M htdocs/loan/class/paymentloan.class.php
    M htdocs/main.inc.php
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/opensurvey/wizard/index.php
    M htdocs/product/admin/product_tools.php
    M htdocs/product/canvas/product/actions_card_product.class.php
    M htdocs/product/canvas/product/tpl/card_create.tpl.php
    M htdocs/product/canvas/service/actions_card_service.class.php
    M htdocs/product/canvas/service/tpl/card_create.tpl.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/list.php
    M htdocs/product/price.php
    M htdocs/product/reassort.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/product.php
    M htdocs/projet/activity/index.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/element.php
    M htdocs/projet/list.php
    M htdocs/projet/tasks/contact.php
    M htdocs/projet/tasks/task.php
    M htdocs/projet/tasks/time.php
    M htdocs/public/api/index.php
    M htdocs/public/demo/index.php
    R htdocs/public/donations/therm.php
    M htdocs/public/members/public_card.php
    M htdocs/public/members/public_list.php
    M htdocs/public/test/test_arrays.php
    M htdocs/public/test/test_forms.php
    A htdocs/public/theme/common/index.php
    A htdocs/public/theme/common/nophoto.jpg
    A htdocs/public/theme/common/user_anonymous.png
    A htdocs/public/theme/common/user_man.png
    A htdocs/public/theme/common/user_woman.png
    A htdocs/public/theme/index.php
    M htdocs/resource/add.php
    M htdocs/resource/card.php
    M htdocs/resource/class/resource.class.php
    M htdocs/resource/element_resource.php
    M htdocs/resource/list.php
    M htdocs/societe/canvas/actions_card_common.class.php
    M htdocs/societe/class/client.class.php
    M htdocs/societe/class/companybankaccount.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/price.php
    M htdocs/societe/rib.php
    M htdocs/societe/soc.php
    M htdocs/societe/societe.php
    A htdocs/theme/amarok/img/object_gravatar.png
    A htdocs/theme/amarok/img/title_accountancy.png
    A htdocs/theme/amarok/img/title_bank.png
    A htdocs/theme/amarok/img/title_commercial.png
    A htdocs/theme/amarok/img/title_companies.png
    A htdocs/theme/amarok/img/title_generic.png
    A htdocs/theme/amarok/img/title_home.png
    A htdocs/theme/amarok/img/title_products.png
    A htdocs/theme/amarok/img/title_project.png
    A htdocs/theme/amarok/img/title_setup.png
    A htdocs/theme/auguria/img/object_gravatar.png
    A htdocs/theme/auguria/img/title_accountancy.png
    A htdocs/theme/auguria/img/title_bank.png
    A htdocs/theme/auguria/img/title_commercial.png
    A htdocs/theme/auguria/img/title_companies.png
    A htdocs/theme/auguria/img/title_generic.png
    A htdocs/theme/auguria/img/title_home.png
    A htdocs/theme/auguria/img/title_products.png
    A htdocs/theme/auguria/img/title_project.png
    A htdocs/theme/auguria/img/title_setup.png
    A htdocs/theme/bureau2crea/img/object_gravatar.png
    A htdocs/theme/bureau2crea/img/title_accountancy.png
    A htdocs/theme/bureau2crea/img/title_bank.png
    A htdocs/theme/bureau2crea/img/title_commercial.png
    A htdocs/theme/bureau2crea/img/title_companies.png
    A htdocs/theme/bureau2crea/img/title_generic.png
    A htdocs/theme/bureau2crea/img/title_home.png
    A htdocs/theme/bureau2crea/img/title_products.png
    A htdocs/theme/bureau2crea/img/title_project.png
    A htdocs/theme/bureau2crea/img/title_setup.png
    A htdocs/theme/cameleo/img/object_gravatar.png
    A htdocs/theme/cameleo/img/title_accountancy.png
    A htdocs/theme/cameleo/img/title_bank.png
    A htdocs/theme/cameleo/img/title_commercial.png
    A htdocs/theme/cameleo/img/title_companies.png
    A htdocs/theme/cameleo/img/title_generic.png
    A htdocs/theme/cameleo/img/title_home.png
    A htdocs/theme/cameleo/img/title_products.png
    A htdocs/theme/cameleo/img/title_project.png
    A htdocs/theme/cameleo/img/title_setup.png
    M htdocs/theme/common/ical.gif
    A htdocs/theme/common/logo_cerfa.png
    R htdocs/theme/common/nophoto.jpg
    M htdocs/theme/common/rss.gif
    M htdocs/theme/common/vcal.gif
    M htdocs/theme/eldy/img/delete.png
    M htdocs/theme/eldy/img/help.png
    M htdocs/theme/eldy/img/info.png
    A htdocs/theme/eldy/img/info_black.png
    A htdocs/theme/eldy/img/object_gravatar.png
    A htdocs/theme/eldy/img/object_printer.png
    M htdocs/theme/eldy/img/printer.png
    M htdocs/theme/eldy/style.css.php
    A htdocs/theme/md_exp/img/object_gravatar.png
    M htdocs/user/agenda_extsites.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/class/usergroup.class.php
    M htdocs/user/hierarchy.php
    M htdocs/user/home.php
    M htdocs/user/index.php
    M htdocs/user/info.php
    M htdocs/user/note.php
    M htdocs/user/param_ihm.php
    M htdocs/user/perms.php
    M htdocs/viewimage.php
    M htdocs/webservices/server_contact.php
    M htdocs/webservices/server_invoice.php
    M htdocs/webservices/server_order.php
    M htdocs/webservices/server_thirdparty.php
    A scripts/product/migrate_picture_path.php
    M test/phpunit/FilesLibTest.php
    M test/phpunit/WebservicesInvoicesTest.php
    M test/phpunit/WebservicesThirdpartyTest.php

  Log Message:
  -----------
  Merge branch 'develop' into api_rest

Conflicts:
        htdocs/user/card.php
        htdocs/user/class/user.class.php


  Commit: 3bf1b60be8c9dcdbff5984e12b4fb8247a4aed95
      
https://github.com/Dolibarr/dolibarr/commit/3bf1b60be8c9dcdbff5984e12b4fb8247a4aed95
  Author: jfefe <address@hidden>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  Add test if module enabled before showing API information


  Commit: c56c228c7ffd89f9b62e531ef6b1f9f61a97e295
      
https://github.com/Dolibarr/dolibarr/commit/c56c228c7ffd89f9b62e531ef6b1f9f61a97e295
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M htdocs/langs/en_US/admin.lang
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Merge pull request #2924 from aternatik/api_rest

Allow modify API key from user card


Compare: 
https://github.com/Dolibarr/dolibarr/compare/cbac2dd63cb4...c56c228c7ffd