Commit Graph

Select branches

Hide Pull Requests

1.5

1.6

bootstrap

carrierwizard

development

export_excel

ignore_stock_without_combination

master

patch-1

1.5.0.0

1.5.0.1

1.5.0.13

1.5.0.15

1.5.0.17

1.5.0.2

1.5.0.3

1.5.0.5

1.5.0.9

1.5.1.0

1.5.2.0

1.5.3.0

1.5.3.1

1.5.4.0

1.5.4.1

1.5.5.0

1.5.6.0

1.5.6.1

1.6.0.1

Mono Color

• c1b0d32d32 [-] Carrier Wizard: fix PrestaEdit 2013-07-29 13:57:31 +02:00
• 0de4642d09 [*] BO : Proposition : IMPROVEMENT Admin Modules Positions Captain-FLAM 2013-07-29 12:35:02 +01:00
• 1dd7d6afcc [-] BO : Fixed incorrect error message in a_s_m [+] BO : Added support for Depends On Stock [-] BO : Added missing check if warehouse is set in csv PhpMadman 2013-07-29 11:54:15 +02:00
• ad9d3af3ad // Class index for Carrier Wizard Damien Metzger 2013-07-29 11:54:08 +02:00
• 155102da4b Merge pull request #603 from xBorderie/patch-1 Gregory Roussac 2013-07-29 02:49:48 -07:00
• 4291b23e23 Update CartRule.php Xavier 2013-07-29 11:41:35 +02:00
• e1b408f1f3 //added missing carrier wizard step img Vincent Augagneur 2013-07-29 11:36:44 +02:00
• 2ac6ada03d // update order tab sLorenzini 2013-07-29 11:01:48 +02:00
• 210d24343c [-] BO : fixed input action when set fees for all zones in carrier wizard Vincent Augagneur 2013-07-29 10:47:20 +02:00
• 909948bfb9 [+] BO : Added support to set A warehouse by id [*] BO : Import will clear any warehouses allready set PhpMadman 2013-07-29 10:27:31 +02:00
• 1c37fdbc23 // foloww up https://github.com/PrestaShop/PrestaShop/commit/2e6e5a2604be05da859154f5369ec026ee55e44d gRoussac 2013-07-29 10:24:36 +02:00
• 60d67a7798 Merge pull request #600 from PrestaEdit/carrier_wizard Vincent Augagneur 2013-07-29 01:04:17 -07:00
• 4857c8c788 [+] BO: Added support for Advanced Stock Management [*] BO: Fixed typos [*] BO: Auto remove product from DependsOnStock of Advanced Stock Management is disabled [*] BO: Added id to warehouse controller PhpMadman 2013-07-29 09:35:39 +02:00
• 95ca638ec9 [-] BO : FixBug #PSCFV-9895 Mal function in products suppliers accordion Jérôme Nadaud 2013-07-29 09:33:50 +02:00
• c089b1e69e [-] Carrier Wizard: Remove fatal error "Call-time pass-by-reference" PrestaEdit 2013-07-27 15:23:48 +02:00
• 85553525e9 Merge pull request #2 from PrestaShop/development PrestaEdit 2013-07-27 04:39:15 -07:00
• a786606c9a // small fix on carrierwizard Rémi Gaillard 2013-07-26 20:27:25 +02:00
• 77f4eec64f // Fix group association on carrierwizard Rémi Gaillard 2013-07-26 19:38:06 +02:00
• 159d0b3904 // improve exception Rémi Gaillard 2013-07-26 19:15:37 +02:00
• 06834e404d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jérôme Nadaud 2013-07-26 19:00:00 +02:00
• 52ff61719b [+] BO : Remove invoices button toolbar Jérôme Nadaud 2013-07-26 18:59:39 +02:00
• 94de4d3d2f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-07-26 18:55:18 +02:00
• 9f9c0ef416 [+] BO Orders Kevin Granger 2013-07-26 18:54:28 +02:00
• 0ef7578f26 [-] BO : Order template misplaced empty form Jérôme Nadaud 2013-07-26 18:43:40 +02:00
• 0d76af7f41 // debug deletion Rémi Gaillard 2013-07-26 18:29:01 +02:00
• c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers Rémi Gaillard 2013-07-26 18:27:21 +02:00
• 42c5335f27 [*] WS : order history add(POST) send customer email if sendemail=1 url parameter, thanks @gerdus gRoussac 2013-07-26 17:55:53 +02:00
• c0e2193d03 // small fix carrierwizard Rémi Gaillard 2013-07-26 17:45:21 +02:00
• f3ca8ec15b [+] BO : Handler invoice date generation button Jérôme Nadaud 2013-07-26 17:23:15 +02:00
• 85d5b6daed // ranges Rémi Gaillard 2013-07-26 17:20:55 +02:00
• 2704f52fe4 [-] Installer: update leftcolumn alias to enable live_edit on blockmyaccount gRoussac 2013-07-26 17:20:52 +02:00
• 076b6d11a2 [-] CORE: Copy live_edit bool when register alias hook gRoussac 2013-07-26 17:15:36 +02:00
• c1e4b812f9 // update "create order" tab sLorenzini 2013-07-26 16:33:19 +02:00
• 1a2b78b00f [+] BO Invoices Kevin Granger 2013-07-26 15:34:11 +02:00
• 3287ff5300 [+] BO : Product attachment "For" Jérôme Nadaud 2013-07-26 15:32:04 +02:00
• 1895ec8731 // Begining of Support for Advanved Stock Managment in CSV Import Madman 2013-07-26 15:30:54 +02:00
• 7db1fb89ec [+] BO : Products customization "For" Jérôme Nadaud 2013-07-26 15:09:14 +02:00
• 5c52ba31e9 [+] BO : Products quantities "For" and small template fix Jérôme Nadaud 2013-07-26 15:03:29 +02:00
• 1c28cdd8e7 // improve ranges Rémi Gaillard 2013-07-26 14:57:31 +02:00
• 3c035324f4 // update order tab sLorenzini 2013-07-26 12:14:48 +02:00
• 5d2e19fe3b [-] BO : FixBug Impossible to remove available date from product attribute Jérôme Nadaud 2013-07-26 12:14:00 +02:00
• 23e0467993 [-] MO dateofdelivery : FixBug #PNM-1478 Now take care of product available date Jérôme Nadaud 2013-07-26 11:48:18 +02:00
• 8b7c29dd18 [+] BO Scenes - Tags - Attachments Kevin Granger 2013-07-26 11:12:50 +02:00
• e80364984a // Fixed manufacturers addresses export Damien Metzger 2013-07-26 10:36:17 +02:00
• f361b2fcbe // small changes Rémi Gaillard 2013-07-26 10:31:58 +02:00
• 72b046d5f0 [+] BO Manufacturers Kevin Granger 2013-07-26 10:21:23 +02:00
• 30c689df22 Merge pull request #584 from Captain-FLAM/patch-3 Gregory Roussac 2013-07-26 00:58:00 -07:00
• 5015f88a46 Merge pull request #595 from codl/fix/too-many-packs Gregory Roussac 2013-07-26 00:51:08 -07:00
• 7d06d50d40 Merge pull request #597 from Captain-FLAM/patch-9 Gregory Roussac 2013-07-26 00:38:22 -07:00
• a35011e9a5 Update Module.php Captain FLAM 2013-07-25 19:16:46 +01:00
• 9e5bbac559 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-07-25 19:21:59 +02:00
• 9308c5c527 no message Kevin Granger 2013-07-25 19:18:54 +02:00
• c9e87d99da Merge pull request #551 from cinscaen/development Gregory Roussac 2013-07-25 09:23:07 -07:00
• ceee011d5c Merge pull request #555 from piotrmocko/patch-1 Gregory Roussac 2013-07-25 09:20:53 -07:00
• 07000c1f66 [-] BO : BugFix Cancel modification button error Jérôme Nadaud 2013-07-25 18:15:41 +02:00
• d2acb9dedb [-] MO : Fix sort order for combinations, report of pull request https://github.com/PrestaShop/PrestaShop/pull/364 gRoussac 2013-07-25 18:15:06 +02:00
• 9848468f3e [-] MO : blockviewed Fix bug adding last product to list, thanks @kluevandrew gRoussac 2013-07-25 17:58:22 +02:00
• ce5355415b [+] BO : Product "For" and combination button Jérôme Nadaud 2013-07-25 17:53:09 +02:00
• e6ecf0c177 // Added a more efficient index Damien Metzger 2013-07-25 15:38:47 +02:00
• eff81dfe05 // Moved a condition/function from SQL to PHP. Damien Metzger 2013-07-25 15:35:38 +02:00
• 832f5cf0dd // update order tab sLorenzini 2013-07-25 16:52:13 +02:00
• 76c87044de [+] BO : Product "For" Jérôme Nadaud 2013-07-25 16:44:52 +02:00
• 6531572c15 Merge pull request #596 from ChristopheBoucaut/patch-3 Gregory Roussac 2013-07-25 07:36:31 -07:00
• cc1fddd52d [+] BO : Product "For" and new carriers select list Jérôme Nadaud 2013-07-25 16:24:43 +02:00
• 488cf0919a // BO attributes Kevin Granger 2013-07-25 15:51:41 +02:00
• a9e233b209 Update Cart.php ChristopheBoucaut 2013-07-25 15:46:08 +02:00
• a54ac39632 Merge pull request #356 from arnolem/dev-wsSetProductTags Gregory Roussac 2013-07-25 06:17:15 -07:00
• 3896453c7c Merge pull request #352 from sdevilcry/development Gregory Roussac 2013-07-25 06:11:51 -07:00
• bff2844adf [*] MO : Added customer and product object to hook sending email gRoussac 2013-07-25 14:50:35 +02:00
• f8ff755067 [+] BO : Product "For" Jérôme Nadaud 2013-07-25 14:50:10 +02:00
• 53526304a5 [-] WS: Sanity check before creating packs Corentin Delcourt 2013-07-25 14:37:27 +02:00
• 3f83dd9222 [+] BO : Product "For" Jérôme Nadaud 2013-07-25 14:33:14 +02:00
• b4d3b631ad Merge pull request #594 from Shagshag/patch-6 Gregory Roussac 2013-07-25 05:18:41 -07:00
• d6b38635f9 [+] BO : Product "For" Jérôme Nadaud 2013-07-25 14:02:36 +02:00
• ae7ee01028 [*] FO : Fix bug #PSCFV-9611, autocomplete to off on opc page and other pages gRoussac 2013-07-25 12:26:57 +02:00
• 56aa91a3fa Merge pull request #296 from samy-r/dev-address-update Gregory Roussac 2013-07-25 03:05:36 -07:00
• 59aa781b0d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-07-25 11:55:58 +02:00
• b5ae321ea5 // fix input + switch Kevin Granger 2013-07-25 11:55:27 +02:00
• 2e7f3c296b [-] FO : Force browser language detection in Tools::setCookieLanguage gRoussac 2013-07-25 11:44:45 +02:00
• a470cd7d12 // oops Jérôme Nadaud 2013-07-25 11:28:40 +02:00
• 059872b1ba [-] BO : Add missing tmp directory Jérôme Nadaud 2013-07-25 11:24:43 +02:00
• 21cf113c44 twice class attribute in color input Shagshag 2013-07-25 10:26:53 +02:00
• 5ee247ad23 Merge pull request #592 from Captain-FLAM/patch-8 Gregory Roussac 2013-07-25 01:23:46 -07:00
• 312ad4eb37 // update order tab sLorenzini 2013-07-25 09:32:07 +02:00
• cfeaf0fa36 // norm Jérôme Nadaud 2013-07-25 08:51:22 +02:00
• 7b980217b5 // norm Jérôme Nadaud 2013-07-25 08:49:40 +02:00
• 541a4525b5 [-] FO : FixBug #PSCFV-9879 Email confirmation message not present Jérôme Nadaud 2013-07-24 19:24:22 +02:00
• ef22b9d5d4 Merge pull request #162 from bumbu/patch-2 Gregory Roussac 2013-07-24 10:07:56 -07:00
• ae7f47a275 [-] BO : FixBug #PSCFV-9042 Supply orders now accept 0 value to automatically load products Jérôme Nadaud 2013-07-24 18:52:47 +02:00
• aaaa5cb086 [-] WS: Enable feature request #PSCFV-5581, thanks @codl for pull request #593 gRoussac 2013-07-24 18:22:04 +02:00
• a406778e17 // norm gRoussac 2013-07-24 17:32:58 +02:00
• edc2113330 // fix merge Kevin Granger 2013-07-24 17:02:23 +02:00
• 77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-07-24 17:01:23 +02:00
• 08aa1f90c6 [-] BO : FixBug #PSCFV-9839 Update product warehouse on suply order - thanks @O'Donnell Jérôme Nadaud 2013-07-24 16:40:59 +02:00
• 71c0a483e1 // Small fix Damien Metzger 2013-07-24 16:16:40 +02:00
• 056ced75b5 // Fixed double module call Damien Metzger 2013-07-24 15:55:40 +02:00
• daec59d13d Update blocklayered.js Captain FLAM 2013-07-24 11:55:05 +01:00
• 063fd9941c Merge pull request #189 from PrestaEdit/patch-12 Gregory Roussac 2013-07-24 03:10:00 -07:00
• cfa6e61acb Merge pull request #351 from PrestaEdit/patch-23 Gregory Roussac 2013-07-24 03:08:23 -07:00
• f7d1743c8a // fix tags in helper Kevin Granger 2013-07-24 11:42:47 +02:00