[Dolibarr-git] [Dolibarr/dolibarr] ebb8f0: Subscription to ML can also be done according to m...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ebb8f05f0996ce3822c865c9388b9e3f0599604f
      
https://github.com/Dolibarr/dolibarr/commit/ebb8f05f0996ce3822c865c9388b9e3f0599604f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M htdocs/admin/mailman.php
    M htdocs/admin/spip.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/mailmanspip/class/mailmanspip.class.php

  Log Message:
  -----------
  Subscription to ML can also be done according to member type


  Commit: e25651204c86d0fb9257370ff911acfce2ae28b7
      
https://github.com/Dolibarr/dolibarr/commit/e25651204c86d0fb9257370ff911acfce2ae28b7
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M .gitignore
    M htdocs/adherents/card_subscriptions.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/fiche.php
    M htdocs/adherents/stats/byproperties.php
    M htdocs/adherents/stats/geo.php
    M htdocs/adherents/stats/index.php
    M htdocs/admin/boxes.php
    M htdocs/admin/clicktodial.php
    M htdocs/admin/commande.php
    M htdocs/admin/facture.php
    M htdocs/admin/system/phpinfo.php
    M htdocs/admin/triggers.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/index.php
    M htdocs/categories/viewcat.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/fiche.php
    M htdocs/comm/action/index.php
    M htdocs/comm/index.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/class/propalestats.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/class/commandestats.class.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/bankid_fr.php
    M htdocs/compta/bank/bilan.php
    M htdocs/compta/bank/budget.php
    M htdocs/compta/bank/categ.php
    M htdocs/compta/bank/fiche.php
    M htdocs/compta/bank/graph.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/bank/info.php
    M htdocs/compta/bank/rappro.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/bank/search.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/deplacement/stats/index.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/stats/index.php
    M htdocs/compta/paiement/cheque/fiche.php
    M htdocs/compta/paiement/cheque/index.php
    M htdocs/compta/paiement/cheque/liste.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/compta/prelevement/bon.php
    M htdocs/compta/prelevement/bons.php
    M htdocs/compta/prelevement/create.php
    M htdocs/compta/prelevement/demandes.php
    M htdocs/compta/prelevement/factures.php
    M htdocs/compta/prelevement/fiche-rejet.php
    M htdocs/compta/prelevement/fiche-stat.php
    M htdocs/compta/prelevement/fiche.php
    M htdocs/compta/prelevement/index.php
    M htdocs/compta/prelevement/ligne.php
    M htdocs/compta/prelevement/lignes.php
    M htdocs/compta/prelevement/liste.php
    M htdocs/compta/prelevement/rejets.php
    M htdocs/compta/prelevement/stats.php
    M htdocs/compta/tva/fiche.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/note.php
    M htdocs/core/boxes/box_activity.php
    M htdocs/core/boxes/box_graph_invoices_permonth.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formactions.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/barcode.lib.php
    M htdocs/core/lib/contact.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/invoice2.lib.php
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/auguria_menu.php
    M htdocs/core/menus/standard/eldy_menu.php
    M htdocs/core/menus/standard/empty.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/export/export_csv.modules.php
    M htdocs/core/modules/export/export_excel.modules.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/modOpenSurvey.class.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
    M htdocs/core/search_page.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/cron/list.php
    M htdocs/exports/index.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/fourn/fiche.php
    M htdocs/imports/import.php
    M htdocs/imports/index.php
    M htdocs/install/upgrade2.php
    M htdocs/mailmanspip/class/mailmanspip.class.php
    M htdocs/main.inc.php
    M htdocs/opensurvey/admin/index.php
    M htdocs/opensurvey/adminstuds.php
    M htdocs/opensurvey/adminstuds_preview.php
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/opensurvey/fonctions.php
    M htdocs/opensurvey/index.php
    M htdocs/opensurvey/list.php
    M htdocs/opensurvey/public/choix_autre.php
    M htdocs/opensurvey/public/choix_date.php
    M htdocs/opensurvey/public/create_survey.php
    M htdocs/opensurvey/public/exportcsv.php
    M htdocs/opensurvey/public/index.php
    M htdocs/opensurvey/public/studs.php
    M htdocs/product/class/product.class.php
    M htdocs/projet/activity/index.php
    M htdocs/public/demo/index.php
    M htdocs/public/emailing/mailing-read.php
    M htdocs/public/emailing/mailing-unsubscribe.php
    M htdocs/public/offline.php
    M htdocs/public/paybox/paymentko.php
    M htdocs/public/paybox/paymentok.php
    M htdocs/public/paypal/paymentko.php
    M htdocs/public/paypal/paymentok.php
    M htdocs/societe/checkvat/checkVatPopup.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php
    M htdocs/support/index.php
    M htdocs/theme/amarok/graph-color.php
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/class/user.class.php
    M htdocs/user/clicktodial.php
    M htdocs/user/logout.php
    M htdocs/user/param_ihm.php
    M htdocs/user/passwordforgotten.php
    M htdocs/user/perms.php
    M htdocs/viewimage.php
    M htdocs/webservices/README
    M htdocs/webservices/server_supplier_invoice.php
    M scripts/bank/export-bank-receipts.php
    M scripts/company/export-contacts-xls-example.php
    M scripts/contracts/email_expire_services_to_customers.php
    M scripts/contracts/email_expire_services_to_representatives.php
    M scripts/cron/cron_run_jobs.php
    M scripts/emailings/mailing-send.php
    M scripts/invoices/email_unpaid_invoices_to_customers.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php
    M scripts/invoices/rebuild_merge_pdf.php
    M scripts/members/sync_members_ldap2dolibarr.php
    M scripts/user/sync_groups_ldap2dolibarr.php
    M scripts/user/sync_users_ldap2dolibarr.php
    M test/phpunit/AdherentTest.php
    M test/phpunit/CategorieTest.php
    M test/phpunit/NumberingModulesTest.php
    M test/phpunit/UserTest.php

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

Conflicts:
        htdocs/core/lib/admin.lib.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/07d64d472e1b...e25651204c86