dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] b85ed3: FIX: mail presend: can overwr


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] b85ed3: FIX: mail presend: can overwrite a file previously...
Date: Sat, 18 May 2019 17:15:07 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b85ed3e0b7aaff32ca892235b293cbbfb8c7ad89
      
https://github.com/Dolibarr/dolibarr/commit/b85ed3e0b7aaff32ca892235b293cbbfb8c7ad89
  Author: ATM-Marc <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/core/actions_sendmails.inc.php

  Log Message:
  -----------
  FIX: mail presend: can overwrite a file previously uploaded


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

  Changed paths:
    M htdocs/core/actions_sendmails.inc.php

  Log Message:
  -----------
  Merge pull request #11195 from ATM-Marc/FIX_7.0_presend_file_overwrite

FIX: mail presend: can overwrite a file previously uploaded (Issue #11056)


  Commit: 28a4785b3a85e3b3516b47988f03190dfa90a5ea
      
https://github.com/Dolibarr/dolibarr/commit/28a4785b3a85e3b3516b47988f03190dfa90a5ea
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/holiday/card.php

  Log Message:
  -----------
  Fix missing TOKEN


  Commit: ea1efa5e88462240a3d1100c1293a77c2d696966
      
https://github.com/Dolibarr/dolibarr/commit/ea1efa5e88462240a3d1100c1293a77c2d696966
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/holiday/class/holiday.class.php
    M htdocs/index.php

  Log Message:
  -----------
  Fix missing dashboard stats for holidays


  Commit: 6c195d7bdf1481f28c96184dd21dc232514972b8
      
https://github.com/Dolibarr/dolibarr/commit/6c195d7bdf1481f28c96184dd21dc232514972b8
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/admin/delais.php
    M htdocs/core/class/conf.class.php

  Log Message:
  -----------
  Add warning delay for holidays


  Commit: ea4dcbc77a213df8c3a398c3bd28a025f91804fe
      
https://github.com/Dolibarr/dolibarr/commit/ea4dcbc77a213df8c3a398c3bd28a025f91804fe
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/langs/en_US/holiday.lang

  Log Message:
  -----------
  Add translation


  Commit: 4f64250ad670517d315cc4a3d799f78d46ad5a4d
      
https://github.com/Dolibarr/dolibarr/commit/4f64250ad670517d315cc4a3d799f78d46ad5a4d
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/holiday/class/holiday.class.php

  Log Message:
  -----------
  Fix menu links for holidays


  Commit: 34b53993295007fc49a420be809f94458dfc6b40
      
https://github.com/Dolibarr/dolibarr/commit/34b53993295007fc49a420be809f94458dfc6b40
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/admin/delais.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/holiday/card.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/index.php
    M htdocs/langs/en_US/holiday.lang

  Log Message:
  -----------
  Merge pull request #11209 from atm-maxime/fix_holiday_missing_stats

Fix holiday missing stats


  Commit: 9b805f742b577fb26360fe3d83dec348ccdbcd5c
      
https://github.com/Dolibarr/dolibarr/commit/9b805f742b577fb26360fe3d83dec348ccdbcd5c
  Author: ATM-Marc <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/modulebuilder/template/class/myobject.class.php

  Log Message:
  -----------
  FIX: modulebuilder: hardcoded llx_


  Commit: 3e3ed6f9e7b897b84d39c28b2083a134ac1a1977
      
https://github.com/Dolibarr/dolibarr/commit/3e3ed6f9e7b897b84d39c28b2083a134ac1a1977
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/holiday/class/holiday.class.php

  Log Message:
  -----------
  Fix phpcs


  Commit: 1d980342ec6929516e0ab977477969cd181de22f
      
https://github.com/Dolibarr/dolibarr/commit/1d980342ec6929516e0ab977477969cd181de22f
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Fix #8344


  Commit: 83c38570e9d7deddfa8f05db3c0534c7b5f4d41a
      
https://github.com/Dolibarr/dolibarr/commit/83c38570e9d7deddfa8f05db3c0534c7b5f4d41a
  Author: ATM-Marc <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php

  Log Message:
  -----------
  FIX: invoice class: bad SQL request if product type not set


  Commit: 32485c27828e39810793b3f8c1e7cd103b6a8a49
      
https://github.com/Dolibarr/dolibarr/commit/32485c27828e39810793b3f8c1e7cd103b6a8a49
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/holiday/class/holiday.class.php

  Log Message:
  -----------
  Fix phpcs


  Commit: 234ad4c76ae75ae0cd36289be6de7c09dd498a59
      
https://github.com/Dolibarr/dolibarr/commit/234ad4c76ae75ae0cd36289be6de7c09dd498a59
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Merge pull request #11214 from atm-maxime/7.0

Fix #8344


  Commit: 684cbbdddb693b5a1bc3e7d6b356d0cd3ba3f3bf
      
https://github.com/Dolibarr/dolibarr/commit/684cbbdddb693b5a1bc3e7d6b356d0cd3ba3f3bf
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/modulebuilder/template/class/myobject.class.php

  Log Message:
  -----------
  Merge pull request #11212 from ATM-Marc/FIX_8.0_modulebuilder_foreignkey

FIX: modulebuilder: hardcoded llx_


  Commit: 2fd3eb8bdf2f2810d117915cecb14f210ef5783c
      
https://github.com/Dolibarr/dolibarr/commit/2fd3eb8bdf2f2810d117915cecb14f210ef5783c
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php

  Log Message:
  -----------
  Update facture.class.php


  Commit: 0f3ae6dc39ea6caaec68467ee4ec76fca0b9998c
      
https://github.com/Dolibarr/dolibarr/commit/0f3ae6dc39ea6caaec68467ee4ec76fca0b9998c
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php

  Log Message:
  -----------
  Merge pull request #11215 from ATM-Marc/FIX_8.0_invoice_default_product_type

FIX: invoice class: bad SQL request if product type not set


  Commit: 7738787729c085149267fcd6a3d2b615d4647cb3
      
https://github.com/Dolibarr/dolibarr/commit/7738787729c085149267fcd6a3d2b615d4647cb3
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0

Conflicts:
        htdocs/core/actions_sendmails.inc.php


  Commit: 71ef8c881b1f239c8cd942217563c1f2546d086c
      
https://github.com/Dolibarr/dolibarr/commit/71ef8c881b1f239c8cd942217563c1f2546d086c
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/modulebuilder/template/class/myobject.class.php

  Log Message:
  -----------
  Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0

Conflicts:
        htdocs/modulebuilder/template/class/myobject.class.php


  Commit: 2bbb04085ea52e7e8f400064e059aef0d250eebf
      
https://github.com/Dolibarr/dolibarr/commit/2bbb04085ea52e7e8f400064e059aef0d250eebf
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/admin/delais.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/holiday/card.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/index.php
    M htdocs/langs/en_US/holiday.lang
    M htdocs/modulebuilder/template/class/myobject.class.php

  Log Message:
  -----------
  Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop

Conflicts:
        htdocs/core/menus/standard/eldy.lib.php
        htdocs/modulebuilder/template/class/myobject.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/91fce6bd2b67...2bbb04085ea5



reply via email to

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