dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] dddbc3: Enable option clone target em


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] dddbc3: Enable option clone target emailing
Date: Thu, 01 May 2014 02:08:06 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: dddbc37d35ecae2f2fcb63082d2c4e254aa4714d
      
https://github.com/Dolibarr/dolibarr/commit/dddbc37d35ecae2f2fcb63082d2c4e254aa4714d
  Author: Florian HENRY <address@hidden>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/core/modules/mailings/modules_mailings.php

  Log Message:
  -----------
  Enable option clone target emailing


  Commit: 7a46bdfc558df836c11ec8e1f32aa3cc2f57f50b
      
https://github.com/Dolibarr/dolibarr/commit/7a46bdfc558df836c11ec8e1f32aa3cc2f57f50b
  Author: Florian HENRY <address@hidden>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    A .scrutinizer.yml
    M ChangeLog
    M build/makepack-dolibarr.pl
    R doc/images/dolibarr_screenshot10.png
    A doc/images/dolibarr_screenshot10_1280x800.png
    R doc/images/dolibarr_screenshot11.png
    R doc/images/dolibarr_screenshot12.png
    R doc/images/dolibarr_screenshot5.png
    A doc/images/dolibarr_screenshot5_1280x800.png
    R doc/images/dolibarr_screenshot6.png
    R doc/images/dolibarr_screenshot7.png
    A doc/images/dolibarr_screenshot7_1280x800.png
    R doc/images/dolibarr_screenshot8.png
    A doc/images/dolibarr_screenshot8_1280x800.png
    M htdocs/adherents/canvas/actions_adherentcard_common.class.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/class/cotisation.class.php
    M htdocs/adherents/fiche.php
    M htdocs/admin/const.php
    M htdocs/barcode/printsheet.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/fiche.php
    A htdocs/categories/traduction.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/compta/hrm.php
    M htdocs/conf/conf.php.example
    M htdocs/contact/canvas/actions_contactcard_common.class.php
    M htdocs/contact/fiche.php
    M htdocs/contrat/fiche.php
    M htdocs/core/ajax/row.php
    M htdocs/core/boxes/box_factures_fourn.php
    M htdocs/core/boxes/box_factures_fourn_imp.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/cookie.class.php
    M htdocs/core/class/discount.class.php
    M htdocs/core/class/dolprintipp.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/fileupload.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formadmin.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/html.formsms.class.php
    M htdocs/core/class/infobox.class.php
    M htdocs/core/class/ldap.class.php
    M htdocs/core/class/link.class.php
    M htdocs/core/class/menubase.class.php
    M htdocs/core/class/rssparser.class.php
    M htdocs/core/class/stats.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/db/DoliDB.class.php
    M htdocs/core/db/mssql.class.php
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/db/sqlite.class.php
    M htdocs/core/filemanagerdol/connectors/php/util.php
    M htdocs/core/js/lib_head.js
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/categories.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/contract.lib.php
    M htdocs/core/lib/cron.lib.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/ecm.lib.php
    M htdocs/core/lib/fichinter.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/images.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/price.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/login/functions_ldap.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/auguria_menu.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/eldy_menu.php
    M htdocs/core/menus/standard/empty.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/barcode/mod_barcode_product_standard.php
    M htdocs/core/modules/commande/mod_commande_marbre.php
    M htdocs/core/modules/commande/modules_commande.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/contract/mod_contract_serpis.php
    M htdocs/core/modules/contract/modules_contract.php
    M htdocs/core/modules/dons/modules_don.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/mod_expedition_safor.php
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/modules/export/export_excel.modules.php
    M htdocs/core/modules/export/export_excel2007.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/facture/mod_facture_mars.php
    M htdocs/core/modules/facture/mod_facture_terre.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.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/livraison/mod_livraison_saphir.php
    M htdocs/core/modules/livraison/modules_livraison.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/member/modules_cards.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modCron.class.php
    M htdocs/core/modules/modECM.class.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/core/modules/modSkype.class.php
    M htdocs/core/modules/product/mod_codeproduct_elephant.php
    M htdocs/core/modules/product/mod_codeproduct_leopard.php
    M htdocs/core/modules/project/mod_project_simple.php
    M htdocs/core/modules/project/task/mod_task_simple.php
    M htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/propale/mod_propale_marbre.php
    M htdocs/core/modules/propale/modules_propale.php
    M htdocs/core/modules/rapport/pdf_paiement.class.php
    M htdocs/core/modules/societe/mod_codeclient_elephant.php
    M htdocs/core/modules/societe/mod_codeclient_leopard.php
    M htdocs/core/modules/societe/mod_codeclient_monkey.php
    M htdocs/core/modules/societe/mod_codecompta_panicum.php
    M htdocs/core/modules/societe/modules_societe.class.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
    M htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
    M htdocs/core/modules/supplier_order/modules_commandefournisseur.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/modules/syslog/mod_syslog_chromephp.php
    M htdocs/core/modules/syslog/mod_syslog_firephp.php
    M htdocs/core/search_page.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/objectline_add.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    M htdocs/cron/class/cronjob.class.php
    M htdocs/ecm/index.php
    A htdocs/ecm/index_auto.php
    R htdocs/ecm/tpl/builddatabase.tpl.php
    A htdocs/ecm/tpl/enablefiletreeajax.tpl.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/class/expeditionbatch.class.php
    M htdocs/expedition/fiche.php
    M htdocs/externalsite/frames.php
    M htdocs/imports/import.php
    M htdocs/install/mysql/data/llx_c_action_trigger.sql
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/install/mysql/tables/llx_bank_account.sql
    A htdocs/install/mysql/tables/llx_c_email_template.sql
    A htdocs/install/mysql/tables/llx_categorie_lang.key.sql
    A htdocs/install/mysql/tables/llx_categorie_lang.sql
    M htdocs/install/mysql/tables/llx_document_model.sql
    R htdocs/install/mysql/tables/llx_domain.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/langs/ca_ES/companies.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/errors.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/stocks.lang
    M htdocs/langs/en_US/users.lang
    M htdocs/langs/es_ES/companies.lang
    M htdocs/langs/fr_FR/errors.lang
    M htdocs/langs/pt_PT/companies.lang
    M htdocs/main.inc.php
    M htdocs/product/composition/fiche.php
    M htdocs/product/fiche.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/task.php
    M htdocs/public/paybox/paymentok.php
    M htdocs/public/paypal/paymentok.php
    M htdocs/public/test/test_arrays.php
    M htdocs/support/index.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/fiche.php
    M htdocs/webservices/server_productorservice.php

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

Conflicts:
        ChangeLog


  Commit: 79fabb05b56361e84642fec82175087b84e00621
      
https://github.com/Dolibarr/dolibarr/commit/79fabb05b56361e84642fec82175087b84e00621
  Author: Florian HENRY <address@hidden>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  changelog


  Commit: 91505fdebe72083254ecb497f9e1d59e0e3b17fc
      
https://github.com/Dolibarr/dolibarr/commit/91505fdebe72083254ecb497f9e1d59e0e3b17fc
  Author: Florian HENRY <address@hidden>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  changelog


  Commit: 596be3ae44924b8fe1936795d1644b6d71fb2873
      
https://github.com/Dolibarr/dolibarr/commit/596be3ae44924b8fe1936795d1644b6d71fb2873
  Author: Florian HENRY <address@hidden>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M htdocs/contact/fiche.php
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/fr_FR/mails.lang

  Log Message:
  -----------
  Trad contact card


  Commit: 569d4cfd4153c6c97ac0398c62bc1c4be52d9f49
      
https://github.com/Dolibarr/dolibarr/commit/569d4cfd4153c6c97ac0398c62bc1c4be52d9f49
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/contact/fiche.php
    M htdocs/core/modules/mailings/modules_mailings.php
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/fr_FR/mails.lang

  Log Message:
  -----------
  Merge pull request #1556 from FHenry/develop

        Enable option clone target emailing


Compare: 
https://github.com/Dolibarr/dolibarr/compare/3b97e1ae1c2c...569d4cfd4153

reply via email to

[Prev in Thread] Current Thread [Next in Thread]