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

• 16dfa4e73d // missing file Rémi Gaillard 2013-10-04 15:12:08 +02:00
• 887b68d3f2 // Customers Groups View list resize Jerome Nadaud 2013-10-04 14:24:33 +02:00
• a4b7fc942f [-] CORE : #PSCFV-10389 Avoid eventual empty Specific Price Rule gRoussac 2013-10-04 14:11:42 +02:00
• fef8d2beac // Fix group reduction per category Rémi Gaillard 2013-10-04 14:00:42 +02:00
• 5b203cf789 // Remove languages select when only one language Jerome Nadaud 2013-10-04 13:51:38 +02:00
• 6dacc07e62 // sometimes, translations files could not exist Rémi Gaillard 2013-10-04 13:19:34 +02:00
• 805989da39 [-] BO : AdminImport add products available fields indesign47 2013-10-04 13:04:52 +02:00
• 9ae6546d90 // Features - Remove select language with one language and add autosize to textarea Jerome Nadaud 2013-10-04 12:23:01 +02:00
• 093bf9e065 [-] MO : Blocklayered - Fix expand/collapse tree problem Jerome Nadaud 2013-10-04 11:51:12 +02:00
• 75cb92c329 Update AdminImportController.php indesign47 2013-10-04 11:44:52 +02:00
• f28131fe9b Merge pull request #795 from indesign47/patch-3 Gregory Roussac 2013-10-04 02:40:29 -07:00
• 96646b5c7a [-] BO : AdminImport add products available fields indesign47 2013-10-04 10:56:41 +02:00
• 18ab409eeb [*] BO: #PNM-1472 Changed label and transparency range check to 1 PhpMadman 2013-10-04 10:38:03 +02:00
• a92ced814a [-] BO : AdminImport add combinations available fields indesign47 2013-10-04 10:26:38 +02:00
• 3d8591c588 [-] MO : Blocklayered - Fix empty fancy box after template edit Jerome NadaudandgRoussac 2013-10-03 18:58:09 +02:00
• 09ad15730b Merge pull request #794 from indesign47/release Gregory Roussac 2013-10-04 01:02:46 -07:00
• 6c9b71ee58 [-] BO : AdminImport add adresses required fields indesign47 2013-10-04 04:35:00 +02:00
• 0af24ab034 [-] BO : AdminImport add adresses required fields indesign47 2013-10-04 04:31:51 +02:00
• bb7dd876af // orders WIP Kevin Granger 2013-10-03 21:04:35 +02:00
• f100027e5d [-] FO: packages should be splitted with advanced stock management when carrier is not associated to multiple warehouse Rémi Gaillard 2013-10-03 19:21:49 +02:00
• 6a0c376a18 [-] MO : Blocklayered - Fix empty fancy box after template edit Jerome Nadaud 2013-10-03 18:58:09 +02:00
• 62d946ea68 [-] CORE : Fix bug #PSCFV-10179 Duplicate specific price records when updating a product gRoussac 2013-10-03 18:41:06 +02:00
• 31f421153d [-] BO : Fix bug #PSCFV-9323 supplier_reference can be unset gRoussac 2013-10-03 18:20:45 +02:00
• 874e17aa6f // remove javascript include from tpl Jerome Nadaud 2013-10-03 17:55:30 +02:00
• 1dc07ab2ba // Modules positions drag and drop Jerome Nadaud 2013-10-03 17:49:24 +02:00
• 39f0284aa3 // Modules positions drag and drop for bootstrap Jerome Nadaud 2013-10-03 17:47:09 +02:00
• c75cda2429 [*] BO : AdminImport, retrieve separators and lang selected gRoussac 2013-10-03 17:35:20 +02:00
• e7c860a3dd Merge pull request #792 from djfm/release Damien Metzger 2013-10-03 08:09:41 -07:00
• 8580dd0b39 // remove backup files djfm 2013-10-03 15:02:16 +00:00
• 9e837d1ecc // No more translation packs in the ZIP (except for FR and EN), only remotes! Damien Metzger 2013-10-03 16:32:44 +02:00
• cfd70bf660 Merge pull request #789 from PhpMadman/patch-2 Gregory Roussac 2013-10-03 07:30:14 -07:00
• 0662cd3b12 // don't need to clear smarty cache while installation Rémi Gaillard 2013-10-03 16:29:31 +02:00
• 6c4a69ea0b Merge pull request #790 from djfm/release Damien Metzger 2013-10-03 07:26:29 -07:00
• b92c9869a4 // added tab translations to Bengali installer djfm 2013-10-03 14:20:08 +00:00
• 992cc6b437 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release gRoussac 2013-10-03 16:10:37 +02:00
• 7f32e8d187 [-] BO : Fix bug #PSCFV-10064, could not import feature in multilang, thanks @E.Bigfoot gRoussac 2013-10-03 16:08:53 +02:00
• cafe2ed9d2 [-] BO : Fix bug #PSCFV-10064, could not import deature in multilang, thanks @E.Bigfoot gRoussac 2013-10-03 16:08:53 +02:00
• e38d808a85 [*] BO: wrong description on getIdOrderCarrier PhpMadman 2013-10-03 15:51:27 +02:00
• 86631202df Merge pull request #788 from PhpMadman/patch-1 Gregory Roussac 2013-10-03 06:37:58 -07:00
• d601844e82 Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-10-03 15:32:27 +02:00
• ea57b3fdd1 [-] MO watermark: original pictures are now protected through htaccess #PNM-109 Fabio Chelly 2013-10-03 15:32:10 +02:00
• f979cbef57 [*] BO: missing align on order for product warehouse PhpMadman 2013-10-03 15:26:09 +02:00
• 8b2215eec5 // remove warning gRoussac 2013-10-03 15:02:48 +02:00
• 0f288583ca [-] BO : Remove dead code in AdminImport gRoussac 2013-10-03 14:57:03 +02:00
• 309f4333a7 // Supply orders bootstraping Jerome Nadaud 2013-10-03 14:13:15 +02:00
• 8762c310b9 Merge pull request #787 from tucoinfo/development Gregory Roussac 2013-10-03 05:02:01 -07:00
• 6e0c3e1aa2 // addFeatureValueImport partial fix Damien Metzger 2013-10-03 12:24:35 +02:00
• 8f09d49ffc [*] FO : add variable $nofollow to mobile theme header.tpl tucoinfo 2013-10-03 12:19:10 +02:00
• 6059ad163b // Fix supply order state change save button Jerome Nadaud 2013-10-03 11:51:08 +02:00
• 3585bf33c8 // Fix supply order change state save button Jerome Nadaud 2013-10-03 11:49:16 +02:00
• 6610bd2067 [-] BO : Could noty save ImportMatchs gRoussac 2013-10-03 11:15:03 +02:00
• 43a60f1b57 [-] BO : FixBug #PSCFV-9044 - Missing state in new order, and now you can edit customer addresses Jerome Nadaud 2013-10-03 11:06:08 +02:00
• f2e39488b6 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Rémi Gaillard 2013-10-03 10:33:58 +02:00
• e190c8df9f // small fix on import Rémi Gaillard 2013-10-03 10:33:43 +02:00
• d1956572a5 //small fix on carrier wizard Vincent Augagneur 2013-10-03 10:29:40 +02:00
• ca1bc3daa8 Merge pull request #786 from kpodemski/patch-6 Gregory Roussac 2013-10-03 01:24:22 -07:00
• d87c816038 [*] CORE : Increasing the length of link_rewrite & name in Category.php Krystian Podemski 2013-10-03 10:20:45 +02:00
• 3b75dd6785 Merge pull request #785 from djfm/pstw Gregory Roussac 2013-10-03 00:54:48 -07:00
• e82f0feacf // Fixed customer tab Damien Metzger 2013-10-03 09:52:25 +02:00
• 89d86793b0 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Jerome Nadaud 2013-10-03 09:12:01 +02:00
• 33b5971a7a [-] BO : FixBug #PSCFV-10558 - Invalid HTML markup. Jerome Nadaud 2013-10-03 09:11:26 +02:00
• 711f5b0bdf [+] LO : Completed Traditional Chinese Installer djfm 2013-10-03 06:57:53 +00:00
• 4668d8ffa2 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into pstw djfm 2013-10-03 06:56:08 +00:00
• 90b203fde3 // Stock instant bootstraping Jerome Nadaud 2013-10-02 18:59:34 +02:00
• 75771e0723 // Supply order bootstraping Jerome Nadaud 2013-10-02 18:59:21 +02:00
• f891f64cc4 // Stock cover bootstraping Jerome Nadaud 2013-10-02 18:58:47 +02:00
• e9a3c98af9 [-] BO : Fix bug #PSCFV-8389 duplicates is SpecificPrice table gRoussac 2013-10-02 18:57:45 +02:00
• 3cfe76ec0c // Fixed mean age Damien Metzger 2013-10-02 18:10:29 +02:00
• da48cea96e [-] BO : AdminImport, tables are not truncated gRoussac 2013-10-02 17:54:48 +02:00
• b472aaed96 // Fix Stock Cover select submit Jerome Nadaud 2013-10-02 17:53:56 +02:00
• c88ea275ab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-02 17:50:50 +02:00
• 2a984186a9 // Fix output for ajax content Jerome Nadaud 2013-10-02 17:50:39 +02:00
• a40356d21c Merge pull request #784 from djfm/release Gregory Roussac 2013-10-02 08:50:29 -07:00
• 19af1cfda5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-02 17:39:03 +02:00
• f168dd7c50 // list icon backward compat Kevin Granger 2013-10-02 17:38:53 +02:00
• 3a0081912d // updated native translation packs djfm 2013-10-02 15:37:57 +00:00
• dc06ef9c6d // Stock movement fix export button on select filter Jerome Nadaud 2013-10-02 17:09:31 +02:00
• 81b9c01824 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-02 17:08:39 +02:00
• 7454d75fb9 // List simple header bootstraping Jerome Nadaud 2013-10-02 17:08:28 +02:00
• 84a251a575 [*] BO : you can noww override header and footer for each controller Damien Metzger 2013-10-02 17:04:07 +02:00
• a027dbd061 [*] BO : Add category id in AdminSpecificPriceRule gRoussac 2013-10-02 17:00:20 +02:00
• f63e1065b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-02 16:58:37 +02:00
• 04e5617d7d // Instant stock bootstraping Jerome Nadaud 2013-10-02 16:58:27 +02:00
• 5993c188c5 // update login page Sarah Lorenzini 2013-10-02 16:50:09 +02:00
• 3d1d178bba Merge pull request #783 from ellisium/upper Gregory Roussac 2013-10-02 07:34:00 -07:00
• 4bb4199f5a Merge pull request #783 from ellisium/upper Gregory Roussac 2013-10-02 07:34:00 -07:00
• 3e0c5e71f4 classname uppercase issue Eric Le Lay 2013-10-02 16:28:45 +02:00
• 791481e149 // update login page Sarah Lorenzini 2013-10-02 15:59:29 +02:00
• fe7035aae9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release gRoussac 2013-10-02 15:48:44 +02:00
• 96be4068f5 // norms gRoussac 2013-10-02 15:48:29 +02:00
• 250a9f17a2 [-] BO : managed decimal format in BO orders Damien Metzger 2013-10-02 15:47:02 +02:00
• bf6a0e0077 [-] BO : Fix bug #PSCFV-5060 could not import supplier_combinations in combinations import gRoussac 2013-10-02 15:46:11 +02:00
• 6974a88b59 Merge pull request #782 from 202-ecommerce/development Damien Metzger 2013-10-02 06:07:42 -07:00
• acb5bf77f6 // Remove comment Jerome Nadaud 2013-10-02 14:52:13 +02:00
• 68c5318706 // Icon change for list details button Jerome Nadaud 2013-10-02 14:49:42 +02:00
• 3ce163449e // Advanced stock management bootstraping Jerome Nadaud 2013-10-02 14:48:23 +02:00
• f4cadbdfd6 Merge pull request #770 from urecheatu007/development Rémi Gaillard 2013-10-02 05:47:17 -07:00
• dec213aecf //now use displayError() in modules Vincent Augagneur 2013-10-02 14:39:41 +02:00
• 1ccc25f56c Merge branch 'development' of github.com:202-ecommerce/PrestaShop into development thoma202 2013-10-02 14:38:44 +02:00
• 1cb7f27a21 // update login page bootsrap Sarah Lorenzini 2013-10-02 14:38:13 +02:00