dolibarr-git
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] a2c820: Prepare 3.6.5

From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] a2c820: Prepare 3.6.5
Date: Fri, 05 Feb 2016 03:13:44 -0800 
  Branch: refs/heads/3.6_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a2c820854106c2cb4e644b64ef393e0566a56a9b
      
https://github.com/Dolibarr/dolibarr/commit/a2c820854106c2cb4e644b64ef393e0566a56a9b
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-27 (Sun, 27 Dec 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Prepare 3.6.5


  Commit: c004342976ae1cf5fe9d3c994b6a7637ae603d81
      
https://github.com/Dolibarr/dolibarr/commit/c004342976ae1cf5fe9d3c994b6a7637ae603d81
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-31 (Thu, 31 Dec 2015)

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

  Log Message:
  -----------
  FIX #3694


  Commit: a234482d085dfde843851941a7c8d27fa57d34e6
      
https://github.com/Dolibarr/dolibarr/commit/a234482d085dfde843851941a7c8d27fa57d34e6
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-31 (Thu, 31 Dec 2015)

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

  Log Message:
  -----------
  FIX #3694


  Commit: 35ce670bf260f63ab8b3df391d7857f8144cb026
      
https://github.com/Dolibarr/dolibarr/commit/35ce670bf260f63ab8b3df391d7857f8144cb026
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-02 (Sat, 02 Jan 2016)

  Changed paths:
    M htdocs/install/upgrade.php

  Log Message:
  -----------
  Fix to allow phpunit of migration process for 3.4 to 3.5


  Commit: b46aec8e7e9eca19cb1739f94fe99267298b4a26
      
https://github.com/Dolibarr/dolibarr/commit/b46aec8e7e9eca19cb1739f94fe99267298b4a26
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-02 (Sat, 02 Jan 2016)

  Changed paths:
    M htdocs/install/upgrade.php

  Log Message:
  -----------
  Fix to allow phpunit of migration process for 3.5 to 3.6


  Commit: 0cad938e095358a08848e033accc6aab133daf01
      
https://github.com/Dolibarr/dolibarr/commit/0cad938e095358a08848e033accc6aab133daf01
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-02 (Sat, 02 Jan 2016)

  Changed paths:
    M htdocs/install/upgrade.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
        htdocs/install/upgrade.php


  Commit: f2178f0369981dce326e4d67e44ae7493539d550
      
https://github.com/Dolibarr/dolibarr/commit/f2178f0369981dce326e4d67e44ae7493539d550
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M htdocs/admin/agenda_extsites.php

  Log Message:
  -----------
  FIX #4291 Correctly filter external calendar GETPOSTs


  Commit: 36dc8b1ce79c972c867b804778c5b780caea8a56
      
https://github.com/Dolibarr/dolibarr/commit/36dc8b1ce79c972c867b804778c5b780caea8a56
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  FIX #4341


  Commit: c2b8be9aaf654193dc8afc9a296c744354552841
      
https://github.com/Dolibarr/dolibarr/commit/c2b8be9aaf654193dc8afc9a296c744354552841
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M htdocs/admin/agenda_extsites.php

  Log Message:
  -----------
  Merge pull request #4355 from GPCsolutions/3.6-4291

FIX #4291 Correctly filter external calendar GETPOSTs


  Commit: a26a6c2449f89e8e2a426864c9a2c77dd95873c9
      
https://github.com/Dolibarr/dolibarr/commit/a26a6c2449f89e8e2a426864c9a2c77dd95873c9
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix sql injection even when code is on several lines


  Commit: 5414cb6f12ce4bf1d804d22b4ac5fe72e6eaf25f
      
https://github.com/Dolibarr/dolibarr/commit/5414cb6f12ce4bf1d804d22b4ac5fe72e6eaf25f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M htdocs/admin/agenda_extsites.php

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


  Commit: da637db162be2131c03366513796579e97280183
      
https://github.com/Dolibarr/dolibarr/commit/da637db162be2131c03366513796579e97280183
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-01-18 (Mon, 18 Jan 2016)

  Changed paths:
    M htdocs/core/class/html.form.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/price.php

  Log Message:
  -----------
  FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays


  Commit: 9fd56df03fd6485a40a0c1e5665b429e80455190
      
https://github.com/Dolibarr/dolibarr/commit/9fd56df03fd6485a40a0c1e5665b429e80455190
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-22 (Fri, 22 Jan 2016)

  Changed paths:
    M htdocs/core/class/html.form.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Merge pull request #4444 from marcosgdf/bug-4440-2

FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays


  Commit: 83263e242e72effdcd4038e59971f3780895ed0c
      
https://github.com/Dolibarr/dolibarr/commit/83263e242e72effdcd4038e59971f3780895ed0c
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-01-23 (Sat, 23 Jan 2016)

  Changed paths:
    M htdocs/product/class/product.class.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Corrected typo of PR #4444


  Commit: 0814fa76f870b3afaa1559ca648769453e5fbb03
      
https://github.com/Dolibarr/dolibarr/commit/0814fa76f870b3afaa1559ca648769453e5fbb03
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  FIX CVE CVE-2015-8685


  Commit: ed16699de65f7c4799aa2c5cae1d035d92f3adc9
      
https://github.com/Dolibarr/dolibarr/commit/ed16699de65f7c4799aa2c5cae1d035d92f3adc9
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    M htdocs/admin/agenda_extsites.php

  Log Message:
  -----------
  FIX #4291 Correctly filter external calendar GETPOSTs


  Commit: c1b6630c16af823b94e4a95de425b98bef58412f
      
https://github.com/Dolibarr/dolibarr/commit/c1b6630c16af823b94e4a95de425b98bef58412f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
        htdocs/main.inc.php


  Commit: b27e31b3ae73d312781fd0390fb6853e7e80202f
      
https://github.com/Dolibarr/dolibarr/commit/b27e31b3ae73d312781fd0390fb6853e7e80202f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-30 (Sat, 30 Jan 2016)

  Changed paths:
    M htdocs/product/class/product.class.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Merge pull request #4483 from marcosgdf/bug-4440-3

Corrected typo of PR #4444


  Commit: d9e089256e3f4af66baefdff07e372d2c3b9c352
      
https://github.com/Dolibarr/dolibarr/commit/d9e089256e3f4af66baefdff07e372d2c3b9c352
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-31 (Sun, 31 Jan 2016)

  Changed paths:
    M build/debian/copyright

  Log Message:
  -----------
  Fix path to copyrighted files


  Commit: 1b23ede8576a2a9c92195e18636f664d59808842
      
https://github.com/Dolibarr/dolibarr/commit/1b23ede8576a2a9c92195e18636f664d59808842
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-31 (Sun, 31 Jan 2016)

  Changed paths:
    M build/debian/copyright

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6


  Commit: 67e521aaa2c3f7b2bfa77e3a0bb9e0513b822ad0
      
https://github.com/Dolibarr/dolibarr/commit/67e521aaa2c3f7b2bfa77e3a0bb9e0513b822ad0
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M ChangeLog
    M build/debian/copyright
    M htdocs/admin/agenda_extsites.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/install/upgrade.php
    M htdocs/main.inc.php
    M htdocs/product/class/product.class.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.6' into 3.6_backported


Compare: 
https://github.com/Dolibarr/dolibarr/compare/926f7cc54e3d...67e521aaa2c3
reply via email to
[Prev in Thread] Current Thread [Next in Thread]