[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 7f57f7: New: Ping ldap server before
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 7f57f7: New: Ping ldap server before ldap_connect for avoi... |
|
Date: |
Mon, 25 Sep 2017 02:30:37 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 7f57f737b3fc194123e665b2d0bff7f227862d3d
https://github.com/Dolibarr/dolibarr/commit/7f57f737b3fc194123e665b2d0bff7f227862d3d
Author: Regis Houssin <address@hidden>
Date: 2017-09-15 (Fri, 15 Sep 2017)
Changed paths:
M htdocs/adherents/ldap.php
M htdocs/contact/ldap.php
M htdocs/core/class/ldap.class.php
M htdocs/user/group/ldap.php
M htdocs/user/ldap.php
Log Message:
-----------
New: Ping ldap server before ldap_connect for avoid waiting
Commit: 767240698f0d018202d613b24bfaa0e6c7538d87
https://github.com/Dolibarr/dolibarr/commit/767240698f0d018202d613b24bfaa0e6c7538d87
Author: Regis Houssin <address@hidden>
Date: 2017-09-15 (Fri, 15 Sep 2017)
Changed paths:
M htdocs/core/class/ldap.class.php
Log Message:
-----------
Fix: wrong var name
Commit: 9653280be950b8acdace160016534daf10dfa344
https://github.com/Dolibarr/dolibarr/commit/9653280be950b8acdace160016534daf10dfa344
Author: Regis Houssin <address@hidden>
Date: 2017-09-16 (Sat, 16 Sep 2017)
Changed paths:
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/api_memberstypes.class.php
M htdocs/adherents/index.php
M htdocs/adherents/list.php
M htdocs/adherents/type.php
M htdocs/langs/en_US/members.lang
Log Message:
-----------
New: big refactorization and uniformize code
Commit: f584212700339675d8b17e233ea9caf790c35ef3
https://github.com/Dolibarr/dolibarr/commit/f584212700339675d8b17e233ea9caf790c35ef3
Author: Regis Houssin <address@hidden>
Date: 2017-09-16 (Sat, 16 Sep 2017)
Changed paths:
M htdocs/adherents/class/adherent.class.php
Log Message:
-----------
Fix: use >0 instead !isnull
Commit: 4ab1f68102df45a099d10c8c4bd8212c4f715705
https://github.com/Dolibarr/dolibarr/commit/4ab1f68102df45a099d10c8c4bd8212c4f715705
Author: Regis Houssin <address@hidden>
Date: 2017-09-16 (Sat, 16 Sep 2017)
Changed paths:
M htdocs/core/class/ldap.class.php
M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
Log Message:
-----------
Fix: check connectivity for avoid ldap errors
Commit: 87b81fb2fda13f2bf507b4a1f8dc521b776626ee
https://github.com/Dolibarr/dolibarr/commit/87b81fb2fda13f2bf507b4a1f8dc521b776626ee
Author: Regis Houssin <address@hidden>
Date: 2017-09-16 (Sat, 16 Sep 2017)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/type.php
A htdocs/adherents/type_ldap.php
M htdocs/admin/ldap.php
M htdocs/admin/ldap_groups.php
A htdocs/admin/ldap_members_types.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/lib/ldap.lib.php
M htdocs/core/lib/member.lib.php
M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/ldap.lang
M htdocs/user/group/ldap.php
Log Message:
-----------
NEW add members types ldap group management
Commit: bdc425c20383aa9426cb4eeca1f1ec867457c9f0
https://github.com/Dolibarr/dolibarr/commit/bdc425c20383aa9426cb4eeca1f1ec867457c9f0
Author: Regis Houssin <address@hidden>
Date: 2017-09-16 (Sat, 16 Sep 2017)
Changed paths:
M build/makepack-dolibarrmodule.pl
M htdocs/accountancy/admin/accountmodel.php
M htdocs/accountancy/admin/categories_list.php
M htdocs/accountancy/admin/journals_list.php
M htdocs/accountancy/bookkeeping/listbyaccount.php
M htdocs/admin/bank.php
M htdocs/admin/compta.php
M htdocs/admin/dict.php
M htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
M htdocs/admin/dolistore/class/dolistore.class.php
M htdocs/admin/loan.php
M htdocs/admin/modules.php
M htdocs/admin/multicurrency.php
M htdocs/admin/payment.php
M htdocs/admin/stock.php
M htdocs/api/index.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/listactions.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/list.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/card.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/create.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/contrat/card.php
M htdocs/contrat/list.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/class/events.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/cheque/mod_chequereceipt_mint.php
M htdocs/core/modules/commande/mod_commande_marbre.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/contract/mod_contract_serpis.php
M htdocs/core/modules/expedition/mod_expedition_safor.php
M htdocs/core/modules/expensereport/mod_expensereport_jade.php
M htdocs/core/modules/facture/mod_facture_mars.php
M htdocs/core/modules/facture/mod_facture_terre.php
M htdocs/core/modules/fichinter/mod_pacific.php
M htdocs/core/modules/fichinter/modules_fichinter.php
M htdocs/core/modules/livraison/mod_livraison_jade.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/payment/mod_payment_cicada.php
M htdocs/core/modules/printing/printgcp.modules.php
M htdocs/core/modules/printing/printipp.modules.php
M htdocs/core/modules/project/mod_project_simple.php
M htdocs/core/modules/project/task/mod_task_simple.php
M htdocs/core/modules/propale/mod_propale_marbre.php
M htdocs/core/modules/societe/mod_codecompta_aquarium.php
M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
M htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
M htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
A htdocs/core/tpl/massactions_form.tpl.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/don/list.php
M htdocs/expensereport/card.php
M htdocs/expensereport/list.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/holiday/card.php
M htdocs/install/check.php
M htdocs/install/mysql/data/llx_c_action_trigger.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_actioncomm.sql
M htdocs/install/mysql/tables/llx_product.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/multicurrency.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/stocks.lang
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/opensurvey/results.php
M htdocs/opensurvey/wizard/create_survey.php
M htdocs/product/composition/card.php
M htdocs/product/inventory/tpl/inventory.tpl.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/product.php
M htdocs/projet/ganttchart.inc.php
M htdocs/resource/element_resource.php
M htdocs/societe/card.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
M htdocs/user/class/usergroup.class.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_ldap
Commit: d9b3a4e45673667a8d4a32cebef1c44fdf455607
https://github.com/Dolibarr/dolibarr/commit/d9b3a4e45673667a8d4a32cebef1c44fdf455607
Author: Regis Houssin <address@hidden>
Date: 2017-09-16 (Sat, 16 Sep 2017)
Changed paths:
M htdocs/core/class/ldap.class.php
Log Message:
-----------
Fix: phpcs
Commit: 1f88e624c26d95ec8abbdb87b2c9c97acffd4f9c
https://github.com/Dolibarr/dolibarr/commit/1f88e624c26d95ec8abbdb87b2c9c97acffd4f9c
Author: Regis Houssin <address@hidden>
Date: 2017-09-17 (Sun, 17 Sep 2017)
Changed paths:
M htdocs/admin/ldap.php
A scripts/members/sync_members_types_dolibarr2ldap.php
A scripts/members/sync_members_types_ldap2dolibarr.php
M test/phpunit/AdherentTest.php
Log Message:
-----------
Fix: add ldap import/export script
Commit: f550e275791389e5687d8aeaa578fe412135fad2
https://github.com/Dolibarr/dolibarr/commit/f550e275791389e5687d8aeaa578fe412135fad2
Author: Regis Houssin <address@hidden>
Date: 2017-09-18 (Mon, 18 Sep 2017)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M dev/examples/code/create_user.php
M dev/examples/code/get_contracts.php
M htdocs/accountancy/admin/accountmodel.php
M htdocs/accountancy/admin/export.php
M htdocs/accountancy/admin/index.php
M htdocs/accountancy/expensereport/list.php
M htdocs/adherents/cartes/carte.php
M htdocs/admin/agenda.php
M htdocs/admin/agenda_other.php
M htdocs/admin/dolistore/class/dolistore.class.php
R htdocs/admin/dolistore/class/init.php
M htdocs/admin/modules.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/mailing/card.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/list.php
M htdocs/commande/card.php
M htdocs/commande/list.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/list.php
M htdocs/contact/card.php
M htdocs/contrat/card.php
M htdocs/contrat/list.php
M htdocs/contrat/services.php
M htdocs/core/actions_fetchobject.inc.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/boxes/box_activity.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formsms.class.php
M htdocs/core/lib/accounting.lib.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/payments.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modAccounting.class.php
A htdocs/core/tpl/card_presend.tpl.php
M htdocs/core/tpl/massactions_form.tpl.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/don/card.php
A htdocs/don/tpl/linkedobjectblock.tpl.php
M htdocs/expensereport/card.php
M htdocs/expensereport/list.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/list.php
M htdocs/install/mysql/data/llx_c_action_trigger.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_c_action_trigger.sql
M htdocs/install/mysql/tables/llx_c_paiement.sql
M htdocs/install/mysql/tables/llx_c_payment_term.sql
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/users.lang
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/product/card.php
M htdocs/product/class/product.class.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/contrat.php
M htdocs/product/stats/facture.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/product/stats/propal.php
A htdocs/product/stats/supplier_proposal.php
M htdocs/projet/card.php
M htdocs/projet/tasks/comment.php
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/document.php
M htdocs/projet/tasks/note.php
M htdocs/projet/tasks/task.php
M htdocs/projet/tasks/time.php
M htdocs/societe/card.php
M htdocs/supplier_proposal/card.php
M htdocs/user/card.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_ldap
Commit: 1f59e4f7e9dc2c6f74e00b6751e7a2a52001ca74
https://github.com/Dolibarr/dolibarr/commit/1f59e4f7e9dc2c6f74e00b6751e7a2a52001ca74
Author: Regis Houssin <address@hidden>
Date: 2017-09-20 (Wed, 20 Sep 2017)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/bookkeeping/balance.php
M htdocs/admin/stock.php
M htdocs/admin/system/perf.php
M htdocs/api/admin/index.php
M htdocs/comm/mailing/advtargetemailing.php
M htdocs/comm/remx.php
M htdocs/compta/bank/index.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/create.php
M htdocs/compta/prelevement/factures.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/list.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/class/discount.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/js/timesheet.js
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/json.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modCashDesk.class.php
M htdocs/core/tools.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/holiday/class/holiday.class.php
M htdocs/includes/odtphp/Segment.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/repair.php
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/stocks.lang
M htdocs/langs/en_US/withdrawals.lang
M htdocs/main.inc.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/product/price.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/propal.php
M htdocs/product/stats/supplier_proposal.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/societe/price.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_ldap
Commit: 01f9d59e759d6daef533521f08a0508877169467
https://github.com/Dolibarr/dolibarr/commit/01f9d59e759d6daef533521f08a0508877169467
Author: Regis Houssin <address@hidden>
Date: 2017-09-21 (Thu, 21 Sep 2017)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/type.php
M htdocs/adherents/type_ldap.php
M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
Log Message:
-----------
Fix: use another method
Commit: 71fc5a99d6c08758f80c394122aa88be7c86ae0d
https://github.com/Dolibarr/dolibarr/commit/71fc5a99d6c08758f80c394122aa88be7c86ae0d
Author: Regis Houssin <address@hidden>
Date: 2017-09-21 (Thu, 21 Sep 2017)
Changed paths:
M htdocs/adherents/type.php
Log Message:
-----------
Fix: list already load in trigger
Commit: 791c385e5b59143bbfe25c5a0d77d29a191eb303
https://github.com/Dolibarr/dolibarr/commit/791c385e5b59143bbfe25c5a0d77d29a191eb303
Author: Regis Houssin <address@hidden>
Date: 2017-09-22 (Fri, 22 Sep 2017)
Changed paths:
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/ihm.php
M htdocs/admin/mails_templates.php
M htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/mailing/card.php
M htdocs/commande/card.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
A htdocs/compta/facture/invoicetemplate_list.php
M htdocs/contrat/card.php
M htdocs/contrat/list.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/tpl/card_presend.tpl.php
M htdocs/core/tpl/massactions_form.tpl.php
M htdocs/document.php
M htdocs/ecm/class/ecmfiles.class.php
M htdocs/ecm/docfile.php
M htdocs/ecm/index.php
M htdocs/includes/odtphp/Segment.php
M htdocs/install/mysql/data/llx_c_action_trigger.sql
A htdocs/install/mysql/data/llx_c_email_templates.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_ecm_files.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/ecm.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/website.lang
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/projet/card.php
M htdocs/projet/document.php
M htdocs/projet/element.php
M htdocs/projet/tasks/contact.php
M htdocs/public/payment/newpayment.php
M htdocs/public/payment/paymentko.php
M htdocs/public/payment/paymentok.php
M htdocs/societe/card.php
M htdocs/societe/list.php
A htdocs/theme/common/cheque.png
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M scripts/emailings/mailing-send.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_ldap
Conflicts:
htdocs/adherents/card.php
Commit: 06ee9f47750e181e592e9a867f21e570c6cc8e1e
https://github.com/Dolibarr/dolibarr/commit/06ee9f47750e181e592e9a867f21e570c6cc8e1e
Author: Regis Houssin <address@hidden>
Date: 2017-09-24 (Sun, 24 Sep 2017)
Changed paths:
M htdocs/admin/dolistore/ajax/image.php
M htdocs/admin/ihm.php
M htdocs/api/admin/index.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/facture/card.php
M htdocs/core/actions_setnotes.inc.php
M htdocs/core/boxes/box_activity.php
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/modulebuilder.lib.php
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/search_page.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/fourn/facture/card.php
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/modulebuilder/index.php
M htdocs/modulebuilder/template/ChangeLog.md
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/modulebuilder/template/doc/Specifications.asciidoc
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/product/class/html.formproduct.class.php
M htdocs/projet/element.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/websites/index.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_ldap
Commit: b48fe684d358c9cecaa793b51c51a95dde0eed60
https://github.com/Dolibarr/dolibarr/commit/b48fe684d358c9cecaa793b51c51a95dde0eed60
Author: Regis Houssin <address@hidden>
Date: 2017-09-24 (Sun, 24 Sep 2017)
Changed paths:
M htdocs/adherents/card.php
Log Message:
-----------
Fix: wrong return when cancel
Commit: 92ff974c5be6e5fdc7c7a733dc37d8fbe36153bd
https://github.com/Dolibarr/dolibarr/commit/92ff974c5be6e5fdc7c7a733dc37d8fbe36153bd
Author: Regis Houssin <address@hidden>
Date: 2017-09-25 (Mon, 25 Sep 2017)
Changed paths:
M ChangeLog
M htdocs/api/class/api.class.php
M htdocs/comm/action/card.php
M htdocs/comm/propal/card.php
M htdocs/comm/remx.php
M htdocs/commande/card.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/api_invoices.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/paiement/card.php
M htdocs/contrat/card.php
M htdocs/core/class/html.form.class.php
M htdocs/core/js/lib_head.js.php
R htdocs/core/js/select2_locale.js.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/security2.lib.php
M htdocs/cron/card.php
M htdocs/expedition/card.php
M htdocs/expensereport/card.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/orderstoinvoice.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/paiement/card.php
M htdocs/langs/en_US/errors.lang
M htdocs/livraison/card.php
M htdocs/loan/card.php
M htdocs/loan/payment/payment.php
M htdocs/main.inc.php
M htdocs/product/card.php
M htdocs/product/class/product.class.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/public/members/new.php
M htdocs/resource/list.php
M htdocs/supplier_proposal/card.php
M htdocs/user/note.php
M test/phpunit/AdherentTest.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_ldap
Commit: c3e6577609625b222afd254c741407d11c9a63fa
https://github.com/Dolibarr/dolibarr/commit/c3e6577609625b222afd254c741407d11c9a63fa
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-25 (Mon, 25 Sep 2017)
Changed paths:
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/api_memberstypes.class.php
M htdocs/adherents/index.php
M htdocs/adherents/ldap.php
M htdocs/adherents/list.php
M htdocs/adherents/type.php
A htdocs/adherents/type_ldap.php
M htdocs/admin/ldap.php
M htdocs/admin/ldap_groups.php
A htdocs/admin/ldap_members_types.php
M htdocs/contact/ldap.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/lib/ldap.lib.php
M htdocs/core/lib/member.lib.php
M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/ldap.lang
M htdocs/langs/en_US/members.lang
M htdocs/user/group/ldap.php
M htdocs/user/ldap.php
A scripts/members/sync_members_types_dolibarr2ldap.php
A scripts/members/sync_members_types_ldap2dolibarr.php
M test/phpunit/AdherentTest.php
Log Message:
-----------
Merge pull request #7416 from hregis/develop_ldap
NEW add members types ldap group management
Compare:
https://github.com/Dolibarr/dolibarr/compare/e3da4188e2fa...c3e657760962
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 7f57f7: New: Ping ldap server before ldap_connect for avoi...,
Laurent Destailleur <=