[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr/dolibarr] b82023: Merge pull request #2 from Dolibarr/develop
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr/dolibarr] b82023: Merge pull request #2 from Dolibarr/develop |
|
Date: |
Sun, 01 Dec 2019 09:56:22 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: b82023487026d703f3dd31d950118d3ed49b51fd
https://github.com/Dolibarr/dolibarr/commit/b82023487026d703f3dd31d950118d3ed49b51fd
Author: Tobias Sekan <address@hidden>
Date: 2019-11-29 (Fri, 29 Nov 2019)
Changed paths:
M ChangeLog
A dev/initdemo/documents_demo/categorie/2/3/32/photos/Fruits.jpg
A dev/initdemo/documents_demo/categorie/2/3/32/photos/thumbs/Fruits_mini.jpg
A
dev/initdemo/documents_demo/categorie/2/3/32/photos/thumbs/Fruits_small.jpg
A dev/initdemo/documents_demo/categorie/3/3/33/photos/Vegetables.jpg
A
dev/initdemo/documents_demo/categorie/3/3/33/photos/thumbs/Vegetables_mini.jpg
A
dev/initdemo/documents_demo/categorie/3/3/33/photos/thumbs/Vegetables_small.jpg
A dev/initdemo/documents_demo/categorie/4/3/34/photos/Pies.jpg
A dev/initdemo/documents_demo/categorie/4/3/34/photos/thumbs/Pies_mini.jpg
A dev/initdemo/documents_demo/categorie/4/3/34/photos/thumbs/Pies_small.jpg
A dev/initdemo/documents_demo/categorie/5/3/35/photos/Other.jpg
A dev/initdemo/documents_demo/categorie/5/3/35/photos/thumbs/Other_mini.jpg
A dev/initdemo/documents_demo/categorie/5/3/35/photos/thumbs/Other_small.jpg
R dev/initdemo/documents_demo/facture/(PROV149)/(PROV149).pdf
A dev/initdemo/documents_demo/produit/COMP-XP4548/compxp4548product.jpg
A
dev/initdemo/documents_demo/produit/COMP-XP4548/thumbs/compxp4548product_mini.jpg
A
dev/initdemo/documents_demo/produit/COMP-XP4548/thumbs/compxp4548product_small.jpg
A
dev/initdemo/documents_demo/produit/DOLIDROID/DOLIDROID-dolidroid_114x114.png
A
dev/initdemo/documents_demo/produit/DOLIDROID/DOLIDROID-dolidroid_180x120_en.png
A
dev/initdemo/documents_demo/produit/DOLIDROID/DOLIDROID-dolidroid_screenshot_stats_720x1280.png
R dev/initdemo/documents_demo/produit/DOLIDROID/dolidroid_114x114.png
R dev/initdemo/documents_demo/produit/DOLIDROID/dolidroid_512x512_en.png
R
dev/initdemo/documents_demo/produit/DOLIDROID/dolidroid_screenshot_home_720x1280.png
A
dev/initdemo/documents_demo/produit/DOLIDROID/thumbs/DOLIDROID-dolidroid_114x114_mini.png
A
dev/initdemo/documents_demo/produit/DOLIDROID/thumbs/DOLIDROID-dolidroid_114x114_small.png
A
dev/initdemo/documents_demo/produit/DOLIDROID/thumbs/DOLIDROID-dolidroid_180x120_en_mini.png
A
dev/initdemo/documents_demo/produit/DOLIDROID/thumbs/DOLIDROID-dolidroid_180x120_en_small.png
A
dev/initdemo/documents_demo/produit/DOLIDROID/thumbs/DOLIDROID-dolidroid_screenshot_stats_720x1280_mini.png
A
dev/initdemo/documents_demo/produit/DOLIDROID/thumbs/DOLIDROID-dolidroid_screenshot_stats_720x1280_small.png
R
dev/initdemo/documents_demo/produit/DOLIDROID/thumbs/dolidroid_114x114_mini.png
R
dev/initdemo/documents_demo/produit/DOLIDROID/thumbs/dolidroid_512x512_en_mini.png
R
dev/initdemo/documents_demo/produit/DOLIDROID/thumbs/dolidroid_screenshot_home_720x1280_mini.png
A dev/initdemo/documents_demo/produit/POS-APPLE/POS-APPLE-Apple.jpg
A
dev/initdemo/documents_demo/produit/POS-APPLE/thumbs/POS-APPLE-Apple_mini.jpg
A
dev/initdemo/documents_demo/produit/POS-APPLE/thumbs/POS-APPLE-Apple_small.jpg
A dev/initdemo/documents_demo/produit/POS-CAR/FR-CAR-Carrot.jpg
A dev/initdemo/documents_demo/produit/POS-CAR/thumbs/FR-CAR-Carrot_mini.jpg
A dev/initdemo/documents_demo/produit/POS-CAR/thumbs/FR-CAR-Carrot_small.jpg
A dev/initdemo/documents_demo/produit/POS-Chips/POS-Chips-Chips.jpg
A
dev/initdemo/documents_demo/produit/POS-Chips/thumbs/POS-Chips-Chips_mini.jpg
A
dev/initdemo/documents_demo/produit/POS-Chips/thumbs/POS-Chips-Chips_small.jpg
A dev/initdemo/documents_demo/produit/POS-Eggs/POS-Eggs-Eggs.jpg
A dev/initdemo/documents_demo/produit/POS-Eggs/thumbs/POS-Eggs-Eggs_mini.jpg
A
dev/initdemo/documents_demo/produit/POS-Eggs/thumbs/POS-Eggs-Eggs_small.jpg
A dev/initdemo/documents_demo/produit/POS-KIWI/POS-KIWI-Kiwi.jpg
A dev/initdemo/documents_demo/produit/POS-KIWI/thumbs/POS-KIWI-Kiwi_mini.jpg
A
dev/initdemo/documents_demo/produit/POS-KIWI/thumbs/POS-KIWI-Kiwi_small.jpg
A dev/initdemo/documents_demo/produit/POS-ORANGE/POS-ORANGE-Orange.jpg
A
dev/initdemo/documents_demo/produit/POS-ORANGE/thumbs/POS-ORANGE-Orange_mini.jpg
A
dev/initdemo/documents_demo/produit/POS-ORANGE/thumbs/POS-ORANGE-Orange_small.jpg
A dev/initdemo/documents_demo/produit/POS-PEACH/POS-PEACH-Peach.jpg
A
dev/initdemo/documents_demo/produit/POS-PEACH/thumbs/POS-PEACH-Peach_mini.jpg
A
dev/initdemo/documents_demo/produit/POS-PEACH/thumbs/POS-PEACH-Peach_small.jpg
A dev/initdemo/mysqldump_dolibarr_11.0.0.sql
R dev/initdemo/mysqldump_dolibarr_3.0.0.sql
R dev/initdemo/mysqldump_dolibarr_3.1.0.sql
R dev/initdemo/mysqldump_dolibarr_3.2.0.sql
R dev/initdemo/mysqldump_dolibarr_3.3.0.sql
R dev/initdemo/mysqldump_dolibarr_3.4.0.sql
R dev/initdemo/mysqldump_dolibarr_3.5.0.sql
R dev/initdemo/mysqldump_dolibarr_3.6.0.sql
R dev/initdemo/mysqldump_dolibarr_3.7.0.sql
R dev/initdemo/mysqldump_dolibarr_3.8.0.sql
R dev/initdemo/mysqldump_dolibarr_3.9.0.sql
R dev/initdemo/mysqldump_dolibarr_4.0.0.sql
R dev/initdemo/mysqldump_dolibarr_5.0.0.sql
R dev/initdemo/mysqldump_dolibarr_6.0.0.sql
R dev/initdemo/mysqldump_dolibarr_7.0.0.sql
R dev/initdemo/mysqldump_dolibarr_8.0.0.sql
R dev/initdemo/mysqldump_dolibarr_9.0.0.sql
M htdocs/accountancy/bookkeeping/balance.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/admin/emailcollector_card.php
M htdocs/admin/expensereport_rules.php
M htdocs/admin/holiday.php
M htdocs/admin/index.php
M htdocs/admin/mails.php
M htdocs/admin/mails_senderprofile_list.php
M htdocs/admin/system/os.php
M htdocs/api/class/api_documents.class.php
M htdocs/api/class/api_setup.class.php
M htdocs/asset/card.php
M htdocs/asset/document.php
M htdocs/asset/note.php
M htdocs/bom/bom_agenda.php
M htdocs/bom/bom_card.php
M htdocs/bom/bom_document.php
M htdocs/bom/bom_note.php
M htdocs/categories/class/categorie.class.php
M htdocs/categories/photos.php
M htdocs/comm/action/card.php
M htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
M htdocs/comm/propal/list.php
M htdocs/comm/remx.php
M htdocs/commande/class/api_orders.class.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/document.php
M htdocs/commande/list.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/bank/graph.php
M htdocs/compta/bank/various_payment/list.php
M htdocs/compta/facture/card.php
M htdocs/compta/sociales/list.php
M htdocs/contact/agenda.php
M htdocs/core/actions_addupdatedelete.inc.php
A htdocs/core/boxes/box_shipments.php
M htdocs/core/boxes/box_task.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/emailsenderprofile.class.php
M htdocs/core/class/events.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formcron.class.php
M htdocs/core/class/html.formticket.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/images.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/lib/takepos.lib.php
M htdocs/core/modules/member/doc/pdf_standard.class.php
M htdocs/core/modules/modBom.class.php
M htdocs/core/modules/modExpedition.class.php
M htdocs/core/modules/modHoliday.class.php
M htdocs/emailcollector/class/emailcollector.class.php
M htdocs/expedition/card.php
M htdocs/expedition/document.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/filefunc.inc.php
M htdocs/fourn/commande/orderstoinvoice.php
M htdocs/fourn/facture/card.php
M htdocs/holiday/class/holiday.class.php
R htdocs/includes/jquery/plugins/multiselect/jquery.multi-select.js
R htdocs/includes/jquery/plugins/multiselect/jquery.multi-select.min.js
M htdocs/install/doctemplates/websites/website_template-corporate.zip
M htdocs/install/doctemplates/websites/website_template-stellar.zip
M htdocs/install/index.php
M htdocs/install/mysql/migration/10.0.0-11.0.0.sql
M htdocs/install/mysql/tables/llx_holiday.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/boxes.lang
M htdocs/langs/en_US/commercial.lang
M htdocs/langs/en_US/deliveries.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/langs/en_US/ticket.lang
M htdocs/main.inc.php
M
htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
M htdocs/modulebuilder/template/myobject_agenda.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_document.php
M htdocs/modulebuilder/template/myobject_note.php
M htdocs/mrp/mo_agenda.php
M htdocs/mrp/mo_card.php
M htdocs/mrp/mo_document.php
M htdocs/mrp/mo_note.php
M htdocs/mrp/mo_production.php
M htdocs/product/class/api_products.class.php
M htdocs/product/document.php
M htdocs/product/inventory/card.php
M htdocs/product/inventory/inventory.php
M htdocs/product/price.php
M htdocs/product/stock/card.php
M htdocs/product/stock/class/entrepot.class.php
M htdocs/product/stock/replenish.php
M htdocs/product/stock/replenishorders.php
M htdocs/product/stock/valo.php
M htdocs/projet/class/task.class.php
M htdocs/projet/info.php
M htdocs/projet/list.php
M htdocs/public/members/new.php
M htdocs/public/ticket/create_ticket.php
M htdocs/reception/card.php
M htdocs/reception/list.php
M htdocs/resource/list.php
M htdocs/salaries/list.php
M htdocs/stripe/admin/stripe.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/supplier_proposal/list.php
R htdocs/takepos/admin/about.php
A htdocs/takepos/admin/index.html
M htdocs/takepos/admin/setup.php
M htdocs/takepos/admin/terminal.php
M htdocs/takepos/ajax/ajax.php
M htdocs/takepos/css/pos.css
R htdocs/takepos/lib/takepos.lib.php
M htdocs/takepos/pay.php
A htdocs/takepos/smpcb.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/theme/md/theme_vars.inc.php
M htdocs/ticket/agenda.php
M htdocs/ticket/card.php
M htdocs/ticket/messaging.php
M htdocs/ticket/tpl/linkedobjectblock.tpl.php
M htdocs/user/class/api_users.class.php
M htdocs/user/class/user.class.php
M htdocs/user/document.php
M htdocs/user/group/perms.php
M htdocs/variants/class/ProductAttribute.class.php
M htdocs/variants/class/ProductCombination.class.php
M htdocs/variants/combinations.php
M htdocs/variants/generator.php
M htdocs/website/index.php
M htdocs/website/websiteaccount_card.php
M htdocs/zapier/hook_agenda.php
M htdocs/zapier/hook_card.php
M htdocs/zapier/hook_document.php
M htdocs/zapier/hook_note.php
Log Message:
-----------
Merge pull request #2 from Dolibarr/develop
merge with current
Commit: f304dd424bc3a21feeb446928126ca5895ff883c
https://github.com/Dolibarr/dolibarr/commit/f304dd424bc3a21feeb446928126ca5895ff883c
Author: Tobias Sekan <address@hidden>
Date: 2019-11-29 (Fri, 29 Nov 2019)
Changed paths:
M htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php
Log Message:
-----------
Fix can't create files on shared folder (Windows)
Commit: a0f1e76f93f026d9396a5b7d5d134d8927b1ea34
https://github.com/Dolibarr/dolibarr/commit/a0f1e76f93f026d9396a5b7d5d134d8927b1ea34
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-01 (Sun, 01 Dec 2019)
Changed paths:
M htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php
Log Message:
-----------
Merge pull request #12556 from TobiasSekan/FixCantCreateFiles
Fix can't create files on shared folder (Windows)
Compare:
https://github.com/Dolibarr/dolibarr/compare/7407df2fa3a0...a0f1e76f93f0
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr/dolibarr] b82023: Merge pull request #2 from Dolibarr/develop,
Laurent Destailleur <=