[Dolibarr-git] [Dolibarr/dolibarr] d65229: Work on website module

[Laurent Destailleur]

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

  Changed paths:
    A htdocs/install/mysql/tables/llx_website.sql
    A htdocs/install/mysql/tables/llx_website_pages.key.sql
    M htdocs/install/mysql/tables/llx_website_pages.sql

  Log Message:
  -----------
  Work on website module


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

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propalestats.class.php
    M htdocs/comm/propal/stats/index.php
    M htdocs/commande/card.php
    M htdocs/commande/stats/index.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modSupplierProposal.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/install/mysql/tables/llx_supplier_proposal.sql
    A htdocs/install/mysql/tables/llx_website.key.sql
    M htdocs/langs/en_US/propal.lang
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php

  Log Message:
  -----------
  NEW Module "Supplier commercial proposal" (price request) is set to
stable status.


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

  Changed paths:
    M htdocs/comm/propal/class/propalestats.class.php
    M htdocs/comm/propal/stats/index.php
    M htdocs/commande/stats/index.php
    M htdocs/core/class/html.formpropal.class.php
    M htdocs/core/modules/modSupplierProposal.class.php
    M htdocs/fichinter/card.php
    A htdocs/fichinter/class/fichinterstats.class.php
    A htdocs/fichinter/stats/index.php
    M htdocs/install/mysql/tables/llx_propal.sql
    M htdocs/install/mysql/tables/llx_supplier_proposal.sql
    M htdocs/langs/en_US/interventions.lang
    M htdocs/langs/en_US/propal.lang

  Log Message:
  -----------
  NEW Add statistics for interventions module


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

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix sql injection #4341


  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: feb114625dabb7f80cea24297b951ca97e12ea92
      
https://github.com/Dolibarr/dolibarr/commit/feb114625dabb7f80cea24297b951ca97e12ea92
  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.6' into 3.7


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

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.7' into 3.8


  Commit: 0f70ccad50bc495392f792f879e1516c6b0b5907
      
https://github.com/Dolibarr/dolibarr/commit/0f70ccad50bc495392f792f879e1516c6b0b5907
  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.8' into 3.9


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

  Changed paths:
    M htdocs/index.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php

  Log Message:
  -----------
  Task lit to assign when entering timesheet is on top. This is more
convenient and save spaces.


  Commit: 8d41cc3660b56ac175674ae8410751e2c422ee89
      
https://github.com/Dolibarr/dolibarr/commit/8d41cc3660b56ac175674ae8410751e2c422ee89
  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.9' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/ba833dc41257...8d41cc3660b5