[Dolibarr-git] [Dolibarr/dolibarr] 2396ba: Ignore content of directory custom

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2396ba833cb3471fb6938f4d8c2121c10468a747
      
https://github.com/Dolibarr/dolibarr/commit/2396ba833cb3471fb6938f4d8c2121c10468a747
  Author: frederic34 <address@hidden>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    A htdocs/custom/.gitignore
    A htdocs/custom/index.html

  Log Message:
  -----------
  Ignore content of directory custom


  Commit: 52a1e8a0f34daa27d6ba0aadc6f0b27ef144b28e
      
https://github.com/Dolibarr/dolibarr/commit/52a1e8a0f34daa27d6ba0aadc6f0b27ef144b28e
  Author: frederic34 <address@hidden>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/agenda_xcal.php
    M htdocs/admin/commande.php
    M htdocs/admin/contract.php
    M htdocs/admin/expedition.php
    M htdocs/admin/facture.php
    M htdocs/admin/fichinter.php
    M htdocs/admin/livraison.php
    M htdocs/admin/propal.php
    M htdocs/admin/supplier_invoice.php
    M htdocs/admin/supplier_order.php
    M htdocs/categories/categorie.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/action/peruser.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/core/datepicker.php
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/custom/.gitignore
    M htdocs/fourn/ajax/getSupplierPrices.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/install.lang
    M htdocs/langs/fr_FR/errors.lang
    M htdocs/public/agenda/agendaexport.php
    M htdocs/public/test/test_arrays.php
    M htdocs/public/test/test_forms.php
    M htdocs/societe/agenda.php
    M htdocs/societe/info.php
    M htdocs/societe/soc.php
    A htdocs/theme/eldy/img/menus/README.md
    A htdocs/theme/eldy/img/menus/chart.png
    M htdocs/theme/eldy/style.css.php
    M test/phpunit/NumberingModulesTest.php

  Log Message:
  -----------
  Merge remote branch 'upstream/develop' into custom

Conflicts:
        htdocs/custom/.gitignore


  Commit: 32d7dec87d9bf2fd6e397a052ebb2d2fed6095a3
      
https://github.com/Dolibarr/dolibarr/commit/32d7dec87d9bf2fd6e397a052ebb2d2fed6095a3
  Author: frederic34 <address@hidden>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/accountancy/class/bookkeeping.class.php
    R htdocs/accountancy/customer/index.html
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/cashjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/admin/bank.php
    A htdocs/admin/bank_extrafields.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/peruser.php
    M htdocs/comm/card.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/impayees.php
    M htdocs/compta/journal/sellsjournal.php
    M htdocs/compta/paiement.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    M htdocs/compta/stats/cabyprodserv.php
    M htdocs/compta/stats/cabyuser.php
    M htdocs/compta/stats/casoc.php
    M htdocs/compta/stats/index.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/accounting.lib.php
    M htdocs/core/lib/bank.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/json.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/price.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/modSyslog.class.php
    M htdocs/core/modules/modUser.class.php
    M htdocs/core/modules/project/doc/pdf_baleine.modules.php
    M htdocs/core/modules/rapport/pdf_paiement.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    A htdocs/install/mysql/tables/llx_bank_account_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
    M htdocs/install/mysql/tables/llx_facture.sql
    M htdocs/install/mysql/tables/llx_facturedet.sql
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/main.inc.php
    M htdocs/societe/consumption.php
    M htdocs/societe/soc.php
    M htdocs/user/class/usergroup.class.php
    M scripts/accountancy/export-thirdpartyaccount.php

  Log Message:
  -----------
  Merge remote branch 'upstream/develop' into custom


  Commit: e640a7751a543942265bfff44a025fbe15c0f93e
      
https://github.com/Dolibarr/dolibarr/commit/e640a7751a543942265bfff44a025fbe15c0f93e
  Author: frederic34 <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M .travis.yml
    M htdocs/admin/mails.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/install/mysql/data/llx_const.sql
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql

  Log Message:
  -----------
  Merge remote branch 'upstream/develop' into custom


  Commit: 8ae48217fc35f9d1b9f48ef6b9969b6df23cea62
      
https://github.com/Dolibarr/dolibarr/commit/8ae48217fc35f9d1b9f48ef6b9969b6df23cea62
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M htdocs/custom/.gitignore
    A htdocs/custom/index.html

  Log Message:
  -----------
  Merge pull request #2239 from frederic34/custom

Ignore content of directory custom


Compare: 
https://github.com/Dolibarr/dolibarr/compare/83675daa8a68...8ae48217fc35