[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 3f6b3b: Fix css
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 3f6b3b: Fix css |
|
Date: |
Thu, 21 Dec 2017 05:35:45 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 3f6b3b51caf0b35842951b2da88232cea36aa193
https://github.com/Dolibarr/dolibarr/commit/3f6b3b51caf0b35842951b2da88232cea36aa193
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-20 (Wed, 20 Dec 2017)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Fix css
Commit: 4a5988accbb770b74105baacd5a034689272128c
https://github.com/Dolibarr/dolibarr/commit/4a5988accbb770b74105baacd5a034689272128c
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-21 (Thu, 21 Dec 2017)
Changed paths:
M htdocs/adherents/subscription/info.php
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/cashdesk/tpl/liste_articles.tpl.php
M htdocs/cashdesk/tpl/menu.tpl.php
M htdocs/cashdesk/tpl/ticket.tpl.php
M htdocs/cashdesk/tpl/validation1.tpl.php
M htdocs/cashdesk/tpl/validation2.tpl.php
M htdocs/comm/multiprix.php
M htdocs/fourn/index.php
M htdocs/main.inc.php
Log Message:
-----------
FIX security vulnerability reported by ADLab of Venustech
Commit: 62f895e2ecadd533683dbb3a9cfa070a741045ec
https://github.com/Dolibarr/dolibarr/commit/62f895e2ecadd533683dbb3a9cfa070a741045ec
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-21 (Thu, 21 Dec 2017)
Changed paths:
M htdocs/core/actions_builddoc.inc.php
Log Message:
-----------
Fix: avoid infinite loop
Commit: 6a62e139604dbbd5729e57df2433b37a5950c35c
https://github.com/Dolibarr/dolibarr/commit/6a62e139604dbbd5729e57df2433b37a5950c35c
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-21 (Thu, 21 Dec 2017)
Changed paths:
M htdocs/accountancy/tpl/export_journal.tpl.php
M htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
M htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
M htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
M htdocs/adherents/tpl/linkedobjectblock.tpl.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
M htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
M htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
M htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
M htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/core/tpl/admin_extrafields_edit.tpl.php
M htdocs/core/tpl/admin_extrafields_view.tpl.php
M htdocs/core/tpl/ajax/fileupload_main.tpl.php
M htdocs/core/tpl/ajax/fileupload_view.tpl.php
M htdocs/core/tpl/ajaxrow.tpl.php
M htdocs/core/tpl/bloc_showhide.tpl.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/extrafields_view.tpl.php
M htdocs/core/tpl/login.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/tpl/objectline_view.tpl.php
M htdocs/core/tpl/originproductline.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/core/tpl/resource_add.tpl.php
M htdocs/core/tpl/resource_view.tpl.php
M htdocs/ecm/tpl/enablefiletreeajax.tpl.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/expensereport/tpl/linkedobjectblock.tpl.php
M htdocs/fichinter/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
M htdocs/main.inc.php
M htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php
M htdocs/product/canvas/product/tpl/card_create.tpl.php
M htdocs/product/canvas/product/tpl/card_edit.tpl.php
M htdocs/product/canvas/product/tpl/card_view.tpl.php
M htdocs/product/canvas/product/tpl/list.tpl.php
M htdocs/product/canvas/service/tpl/card_create.tpl.php
M htdocs/product/canvas/service/tpl/card_edit.tpl.php
M htdocs/product/canvas/service/tpl/card_view.tpl.php
M htdocs/product/canvas/service/tpl/list.tpl.php
M htdocs/product/inventory/tpl/inventory.tpl.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
M htdocs/product/stock/tpl/stocktransfer.tpl.php
M htdocs/societe/canvas/company/tpl/card_create.tpl.php
M htdocs/societe/canvas/company/tpl/card_edit.tpl.php
M htdocs/societe/canvas/company/tpl/card_view.tpl.php
M htdocs/societe/canvas/individual/tpl/card_create.tpl.php
M htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
M htdocs/societe/tpl/linesalesrepresentative.tpl.php
M htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
FIX security vulnerability reported by ADLab of Venustech
Commit: eab44f62b163b6897a91d52cc5514f834d471a33
https://github.com/Dolibarr/dolibarr/commit/eab44f62b163b6897a91d52cc5514f834d471a33
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-21 (Thu, 21 Dec 2017)
Changed paths:
M htdocs/accountancy/tpl/export_journal.tpl.php
M htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
M htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
M htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
M htdocs/adherents/subscription/info.php
M htdocs/adherents/tpl/linkedobjectblock.tpl.php
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/cashdesk/tpl/liste_articles.tpl.php
M htdocs/cashdesk/tpl/menu.tpl.php
M htdocs/cashdesk/tpl/ticket.tpl.php
M htdocs/cashdesk/tpl/validation1.tpl.php
M htdocs/cashdesk/tpl/validation2.tpl.php
M htdocs/comm/multiprix.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
M htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
M htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
M htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
M htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
M htdocs/core/actions_builddoc.inc.php
M htdocs/core/class/html.form.class.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/core/tpl/admin_extrafields_edit.tpl.php
M htdocs/core/tpl/admin_extrafields_view.tpl.php
M htdocs/core/tpl/ajax/fileupload_main.tpl.php
M htdocs/core/tpl/ajax/fileupload_view.tpl.php
M htdocs/core/tpl/ajaxrow.tpl.php
M htdocs/core/tpl/bloc_showhide.tpl.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/extrafields_view.tpl.php
M htdocs/core/tpl/login.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/tpl/objectline_view.tpl.php
M htdocs/core/tpl/originproductline.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/core/tpl/resource_add.tpl.php
M htdocs/core/tpl/resource_view.tpl.php
M htdocs/ecm/tpl/enablefiletreeajax.tpl.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/expensereport/tpl/linkedobjectblock.tpl.php
M htdocs/fichinter/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/index.php
M htdocs/main.inc.php
M htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php
M htdocs/product/canvas/product/tpl/card_create.tpl.php
M htdocs/product/canvas/product/tpl/card_edit.tpl.php
M htdocs/product/canvas/product/tpl/card_view.tpl.php
M htdocs/product/canvas/product/tpl/list.tpl.php
M htdocs/product/canvas/service/tpl/card_create.tpl.php
M htdocs/product/canvas/service/tpl/card_edit.tpl.php
M htdocs/product/canvas/service/tpl/card_view.tpl.php
M htdocs/product/canvas/service/tpl/list.tpl.php
M htdocs/product/inventory/tpl/inventory.tpl.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
M htdocs/product/stock/tpl/stocktransfer.tpl.php
M htdocs/societe/canvas/company/tpl/card_create.tpl.php
M htdocs/societe/canvas/company/tpl/card_edit.tpl.php
M htdocs/societe/canvas/company/tpl/card_view.tpl.php
M htdocs/societe/canvas/individual/tpl/card_create.tpl.php
M htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
M htdocs/societe/tpl/linesalesrepresentative.tpl.php
M htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/54d7d85d90fe...eab44f62b163