dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] 4c90ba: FIX attached files list with


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 4c90ba: FIX attached files list with link file was broked
Date: Fri, 10 May 2019 08:45:38 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4c90ba1a64f2f21c8b9dbd7a2da777043bd843c4
      
https://github.com/Dolibarr/dolibarr/commit/4c90ba1a64f2f21c8b9dbd7a2da777043bd843c4
  Author: atm-arnaud <address@hidden>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php

  Log Message:
  -----------
  FIX attached files list with link file was broked


  Commit: bf3de83c5d1ff49c088e62f889b897c969125ed6
      
https://github.com/Dolibarr/dolibarr/commit/bf3de83c5d1ff49c088e62f889b897c969125ed6
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  Fix typo


  Commit: 1e970fa8d7b33c8facc63907cc1043c72b87bc68
      
https://github.com/Dolibarr/dolibarr/commit/1e970fa8d7b33c8facc63907cc1043c72b87bc68
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php

  Log Message:
  -----------
  Merge pull request #11151 from 
atm-arnaud/FIX_linkedfiles_in_attached_files_was_broked

FIX attached files list with link file was broked


  Commit: d53117da3f7d755c68a2460ed1eddfb27e75b897
      
https://github.com/Dolibarr/dolibarr/commit/d53117da3f7d755c68a2460ed1eddfb27e75b897
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update log


  Commit: 6b626ab12cdc1e0f1bd0cd44d0dbd8dd010f0914
      
https://github.com/Dolibarr/dolibarr/commit/6b626ab12cdc1e0f1bd0cd44d0dbd8dd010f0914
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php

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


  Commit: 2b182c1cc15281bc64a43a18342b3e82d42d5afb
      
https://github.com/Dolibarr/dolibarr/commit/2b182c1cc15281bc64a43a18342b3e82d42d5afb
  Author: Juanjo Menent <address@hidden>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M htdocs/admin/holiday.php
    M htdocs/core/modules/holiday/mod_holiday_immaculate.php

  Log Message:
  -----------
  FIX: #11097


  Commit: e36df726a1f43185861f7373d6a09cf56b7eef99
      
https://github.com/Dolibarr/dolibarr/commit/e36df726a1f43185861f7373d6a09cf56b7eef99
  Author: Juanjo Menent <address@hidden>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl
    M htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
    M htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
    M htdocs/accountancy/class/lettering.class.php
    M htdocs/admin/dolistore/class/dolistore.class.php
    M htdocs/admin/emailcollector_card.php
    M htdocs/admin/emailcollector_list.php
    M htdocs/admin/multicurrency.php
    M htdocs/admin/tools/dolibarr_export.php
    M htdocs/admin/tools/export.php
    M htdocs/cashdesk/tpl/facturation1.tpl.php
    M htdocs/comm/action/index.php
    M htdocs/comm/propal/card.php
    M htdocs/comm/remx.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/list.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/actions_massactions.inc.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/class/utils.class.php
    M htdocs/core/js/timesheet.js
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/sendings.lib.php
    M htdocs/core/lib/website.lib.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modService.class.php
    M htdocs/core/modules/product/doc/pdf_standard.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/stock/doc/pdf_standard.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    M htdocs/core/tpl/card_presend.tpl.php
    M htdocs/core/tpl/massactions_pre.tpl.php
    M htdocs/core/tpl/notes.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    M htdocs/core/website.inc.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/orderstoinvoice.php
    M htdocs/fourn/facture/card.php
    M htdocs/index.php
    M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
    M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
    M htdocs/install/mysql/tables/llx_actioncomm.sql
    M htdocs/install/mysql/tables/llx_payment_salary.sql
    M htdocs/install/mysql/tables/llx_payment_various.sql
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/contracts.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/website.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/product/stock/tpl/stockcorrection.tpl.php
    M htdocs/product/stock/tpl/stocktransfer.tpl.php
    M htdocs/projet/card.php
    M htdocs/projet/element.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/consumption.php
    M htdocs/stripe/class/stripe.class.php
    M htdocs/supplier_proposal/card.php
    M htdocs/user/class/user.class.php
    M htdocs/viewimage.php
    M htdocs/website/index.php

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/9.0' into 9.0


  Commit: 2df026b903ed8d983f474ae7071915a7bdba44a5
      
https://github.com/Dolibarr/dolibarr/commit/2df026b903ed8d983f474ae7071915a7bdba44a5
  Author: Juanjo Menent <address@hidden>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M htdocs/product/list.php

  Log Message:
  -----------
  FIX: #11032


  Commit: 5625c94c44b9f28474584835b603dcbba184f800
      
https://github.com/Dolibarr/dolibarr/commit/5625c94c44b9f28474584835b603dcbba184f800
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-10 (Fri, 10 May 2019)

  Changed paths:
    M htdocs/comm/propal/list.php
    M htdocs/commande/list.php
    M htdocs/compta/facture/list.php

  Log Message:
  -----------
  Fix missing label on project tooltip


  Commit: 14b11b3cc5578233c81576a0f3955ef1a2489643
      
https://github.com/Dolibarr/dolibarr/commit/14b11b3cc5578233c81576a0f3955ef1a2489643
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-10 (Fri, 10 May 2019)

  Changed paths:
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Prepare 9.0.4


  Commit: 22c548e80b2d350c963e4f2d36a3cb974129e558
      
https://github.com/Dolibarr/dolibarr/commit/22c548e80b2d350c963e4f2d36a3cb974129e558
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-10 (Fri, 10 May 2019)

  Changed paths:
    M htdocs/comm/propal/list.php

  Log Message:
  -----------
  Fix sql


  Commit: 95326c3d63883e829311108b7427d2373e260a67
      
https://github.com/Dolibarr/dolibarr/commit/95326c3d63883e829311108b7427d2373e260a67
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-10 (Fri, 10 May 2019)

  Changed paths:
    M htdocs/product/list.php

  Log Message:
  -----------
  Update list.php


  Commit: 46ecdb8d4d454cdb45670d4d7481d45174c4e547
      
https://github.com/Dolibarr/dolibarr/commit/46ecdb8d4d454cdb45670d4d7481d45174c4e547
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-10 (Fri, 10 May 2019)

  Changed paths:
    M htdocs/admin/holiday.php
    M htdocs/core/modules/holiday/mod_holiday_immaculate.php
    M htdocs/product/list.php

  Log Message:
  -----------
  Merge pull request #11155 from simnandez/9.0

FIX: #11097


  Commit: 069df823805f8fec1a5519ea13ce37d82685b169
      
https://github.com/Dolibarr/dolibarr/commit/069df823805f8fec1a5519ea13ce37d82685b169
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-10 (Fri, 10 May 2019)

  Changed paths:
    M htdocs/core/class/doleditor.class.php

  Log Message:
  -----------
  FIX javascript error when ckeditor module not enabled


  Commit: eed2b97913b3456527f3f38743768fb8bbec3dc9
      
https://github.com/Dolibarr/dolibarr/commit/eed2b97913b3456527f3f38743768fb8bbec3dc9
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-10 (Fri, 10 May 2019)

  Changed paths:
    M htdocs/admin/holiday.php
    M htdocs/core/modules/holiday/mod_holiday_immaculate.php
    M htdocs/product/list.php

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


  Commit: aaeb7dc9d664e18fdcead595f3720df3fd756090
      
https://github.com/Dolibarr/dolibarr/commit/aaeb7dc9d664e18fdcead595f3720df3fd756090
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-10 (Fri, 10 May 2019)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl
    M htdocs/admin/holiday.php
    M htdocs/comm/propal/list.php
    M htdocs/compta/facture/list.php
    M htdocs/core/class/doleditor.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/modules/holiday/mod_holiday_immaculate.php
    M htdocs/product/list.php

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

Conflicts:
        htdocs/admin/holiday.php
        htdocs/comm/propal/list.php
        htdocs/commande/list.php
        htdocs/filefunc.inc.php
        htdocs/product/list.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/24aa7a84d683...aaeb7dc9d664



reply via email to

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