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

• da2d48890f Merge pull request #1072 from PhpMadman/Boot-AutoSeoUrl Lucas CERDAN 2013-12-03 06:15:28 -08:00
• 22c09ac367 Merge pull request #1073 from studiokiwik/sk-ps15x-012 Gregory Roussac 2013-12-03 05:51:27 -08:00
• d81e81e4f3 [-] BO : Fix timeout handling on product images regeneration Mikael Blotin 2013-12-03 14:42:14 +01:00
• 98d02d94b9 [-] BO : carrier wizard range tab now overflow scroll Vincent Augagneur 2013-12-03 14:15:24 +01:00
• a9f2bd053a [-] BO : carrier wizard fixed when select zone and set no shipping fees Vincent Augagneur 2013-12-03 11:45:43 +01:00
• de456e45ec [*] Bo : removed empty filters from the cookie (thus limiting its size) Damien Metzger 2013-12-03 11:44:32 +01:00
• 8a72e4d810 // small fix rGaillard 2013-12-03 11:18:58 +01:00
• 0de9c3ac6c [*] BO : Added option to always rewrite friendly url of product PhpMadman 2013-12-03 10:57:25 +01:00
• 0a2ba0015b [-] BO : carrier wizard, remove fees when desabled zone Vincent Augagneur 2013-12-03 10:34:53 +01:00
• 08ef0667ca Revert "// update some css&tpl bugs" rGaillard 2013-12-02 19:25:21 +01:00
• 2931ebeeae [-] FO : fixed product comparator when there are no products anymore Damien Metzger 2013-12-02 19:21:54 +01:00
• e8088892b5 [-] FO : Added condition to display the phone number only if it is set up in the admin Damien Metzger 2013-12-02 19:12:36 +01:00
• 8bf49049eb // Prevent click event in tree toolbar buttons Jerome Nadaud 2013-12-02 19:07:28 +01:00
• 2316bb50ba // Fixed import button in AdminImport Damien Metzger 2013-12-02 18:53:37 +01:00
• 804fe56ba0 // Change order button language Jerome Nadaud 2013-12-02 18:20:42 +01:00
• 6edf14ed71 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-12-02 18:20:03 +01:00
• 102b99eb1c // small fix rGaillard 2013-12-02 18:15:37 +01:00
• 703d790910 // Changed hook in update Damien Metzger 2013-12-02 17:39:46 +01:00
• 01d5087067 // update some css&tpl bugs sLorenzini 2013-12-02 16:40:43 +01:00
• a88b2b6ab5 // fix footer actions Kevin Granger 2013-12-02 16:27:24 +01:00
• 9078290c01 // small fix rGaillard 2013-12-02 16:18:59 +01:00
• 78a6821b2f // handle img extensions in the end of query string in the dispatcher rGaillard 2013-12-02 16:14:27 +01:00
• 970449148c // Add footer toolbar to products panel Jerome Nadaud 2013-12-02 16:08:44 +01:00
• aea8f0285e [-] FO : Fix bug #PSCFV-11190 double escaping on customization gRoussac 2013-12-02 15:51:29 +01:00
• 6d473d5374 Merge pull request #1071 from TMMeilleur/bootstrap Rémi Gaillard 2013-12-02 06:49:24 -08:00
• f99140113b updated jqzoom and products compare page is responsive now TMMeilleur 2013-12-02 16:41:13 +02:00
• c8ca67eef5 // Fixed upgrade to 1.6.0.1 Damien Metzger 2013-12-02 15:27:47 +01:00
• 0d7a48095c // tweak product tabs Kevin Granger 2013-12-02 15:27:21 +01:00
• 0448ee697f // Merging PR 1070 from DevNet Jerome Nadaud 2013-12-02 15:23:29 +01:00
• 3cfafbfe10 // typo rGaillard 2013-12-02 15:20:12 +01:00
• 89329dc865 // small fix rGaillard 2013-12-02 15:15:17 +01:00
• bf3c27e864 // fix dropdown menu Kevin Granger 2013-12-02 14:13:41 +01:00
• 2ef8333e6a // tweak import Kevin Granger 2013-12-02 14:12:02 +01:00
• 79b1b07cce // tweak on login form : it’s a trap! Kevin Granger 2013-12-02 11:35:21 +01:00
• 909983bcbf Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-12-02 11:11:29 +01:00
• bca9048a6b // fix filter by category Kevin Granger 2013-12-02 11:11:16 +01:00
• 2bdca4668e Merge pull request #1063 from Shoprunners/patch-1 Jérôme Nadaud 2013-12-02 02:06:03 -08:00
• 5381e6007f // fix Tab selection in modules favorites view Jerome Nadaud 2013-12-02 10:47:15 +01:00
• c83761b420 // Module configuration bar fix Jerome Nadaud 2013-12-02 10:25:18 +01:00
• 6ef0910bfb [*] BO : Fixes issue with not beeing able to edit weight beacuse string is longer then max length PhpMadman 2013-12-02 10:17:26 +01:00
• 62a7a6a94f [-] FO : fixed cart rules cache id #PSCFV-11123 #PSCFV-11175 Damien Metzger 2013-12-02 10:06:24 +01:00
• 3386ad6517 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Francois Gaillard 2013-12-02 09:26:24 +01:00
• 34d56ead85 [-] Controller : ParentOrderController - Missing parenthesis Francois Gaillard 2013-12-02 09:26:04 +01:00
• 6230c6249e [-] FO : fixed potential error when you delete a best seller #PSCFV-11167 Damien Metzger 2013-12-02 09:25:28 +01:00
• d887dfc2f1 // Update cart rules fancybox Jerome Nadaud 2013-12-02 09:13:20 +01:00
• cd2246a9c3 Merge pull request #1068 from Dh42/bootstrap Jérôme Nadaud 2013-12-01 23:58:38 -08:00
• 6fcafbe4f2 Merge pull request #1067 from PrestaEdit/patch-61 Jérôme Nadaud 2013-12-01 22:06:30 -08:00
• f22fd92a95 [*] MO : blockviewed added title tag to image lesley paone 2013-12-01 23:22:01 -06:00
• 8de9a0ecda [*] MO: blockcontact Adds title tag on link lesley paone 2013-12-01 21:43:40 -06:00
• 06b68e3757 //use Tools methods instead of $_GET/$_POST PrestaEdit 2013-12-01 23:39:27 +01:00
• c813cc5176 [*] MO : Blockrss added title tag to links lesley paone 2013-11-30 20:03:29 -06:00
• 7ea1d73d67 MO:blocklayered Peter Schaeffer 2013-11-30 19:54:42 +01:00
• 7cd38d4461 // Changed base64 to urlencode in import (and fixed filename issue) Damien Metzger 2013-11-29 19:24:04 +01:00
• 8decc89750 // Fix color form item Jerome Nadaud 2013-11-29 18:39:26 +01:00
• 53b327ec46 // small fix Jerome Nadaud 2013-11-29 18:32:05 +01:00
• f39b621251 [-] BO : Fix bug #PSCFV-11162 AdminImport, Exception on ProductSupplier gRoussac 2013-11-29 18:29:50 +01:00
• 782975c708 [-] BO : better error display for forgotten password #PSCSX-58 Damien Metzger 2013-11-29 18:18:38 +01:00
• 0b147f626f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap rGaillard 2013-11-29 18:18:29 +01:00
• e0fd879037 [-] BO: Add some useful hooks to modify the listings/options/forms rGaillard 2013-11-29 18:18:17 +01:00
• 0a2a36f49b // Add text-success class to upload button Jerome Nadaud 2013-11-29 18:15:55 +01:00
• 8dae23891a // Remove add category on edit Jerome Nadaud 2013-11-29 18:08:01 +01:00
• fbf2c26093 // Fix when file is missing Jerome Nadaud 2013-11-29 18:07:50 +01:00
• a597881da7 // Fix simple uploader view Jerome Nadaud 2013-11-29 18:07:27 +01:00
• 3871ea32a4 // missing parenthesis gRoussac 2013-11-29 17:48:52 +01:00
• f8a94b1be9 // Catalog price rules bootstraping Jerome Nadaud 2013-11-29 17:31:28 +01:00
• c8f130670f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-29 17:19:04 +01:00
• 6a84f586af // add compass config.rb for theme default-bootstrap Kevin Granger 2013-11-29 17:18:50 +01:00
• 4c2190ddc5 [-] Core : integrated modified pull request https://github.com/ExploZe/PrestaShop/commit/40abb0aa72607ddfe912b364d8fc7d65733d2bd8 Damien Metzger 2013-11-29 17:18:03 +01:00
• b432fd5641 // Bootstraping cart rules Jerome Nadaud 2013-11-29 17:13:09 +01:00
• e0b28dd57b // AdminOutstanding is now bootstraped Damien Metzger 2013-11-29 17:10:11 +01:00
• 68ed6fac82 [*] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/582 gRoussac 2013-11-29 17:06:59 +01:00
• d8a1dca660 // demo mode rGaillard 2013-11-29 17:00:50 +01:00
• cbc79c6cf2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-29 16:54:47 +01:00
• 6da40e7159 // fix new tax rule button Jerome Nadaud 2013-11-29 16:54:33 +01:00
• 90e1a39025 // Rollback previous pull request merge (with a truncate) Damien Metzger 2013-11-29 16:49:28 +01:00
• 8ee61f8709 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap rGaillard 2013-11-29 16:40:14 +01:00
• 8ba251c996 // small clean rGaillard 2013-11-29 16:40:00 +01:00
• af3f7be5ac Merge pull request #1058 from Dh42/patch-20 Damien Metzger 2013-11-29 07:36:34 -08:00
• b23acae33e Merge pull request #1057 from Dh42/patch-19 Damien Metzger 2013-11-29 07:36:07 -08:00
• 6a5cebaff4 Merge pull request #1061 from TMMeilleur/bootstrap Rémi Gaillard 2013-11-29 07:19:48 -08:00
• b122291080 fixes 29.11.2013 TMMeilleur 2013-11-29 17:13:27 +02:00
• 8ad3166226 // Add save button to Localization tax rules Jerome Nadaud 2013-11-29 15:30:57 +01:00
• 10fa987832 // small fix rGaillard 2013-11-29 15:11:49 +01:00
• 4c2500fb35 // Remove unnecessary code Jerome Nadaud 2013-11-29 14:35:06 +01:00
• 9dc075ca39 [*] FO : Code cleaning, optimizations, new callstack available in the profiling tools Damien Metzger 2013-11-29 14:21:06 +01:00
• 5c3f43141b // small fix rGaillard 2013-11-29 14:20:06 +01:00
• badfef481c // Small fix Jerome Nadaud 2013-11-29 12:20:10 +01:00
• e1568a67a2 // Fix products attachments uploader Jerome Nadaud 2013-11-29 12:10:09 +01:00
• 85f445b7cc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-29 11:53:52 +01:00
• cc80e82431 // import (todo: add the link delete/view on items loaded with js) Kevin Granger 2013-11-29 11:53:43 +01:00
• 77e02f054f [*]MO: blockbanner added title and alt tag to image Dh42 2013-11-28 22:39:25 -06:00
• 9cf3fa2e8a [*]MO: Blockcategories changed title to use name Dh42 2013-11-28 22:17:40 -06:00
• 7fa882efca Merge pull request #1056 from Dh42/patch-18 Gregory Roussac 2013-11-28 10:26:36 -08:00
• 1d2f6c9b9d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-28 19:22:03 +01:00
• 0f74646524 // import Kevin Granger 2013-11-28 19:21:55 +01:00
• fae538c4e4 [MO]Blocktopmenu Dh42 2013-11-28 12:10:12 -06:00
• 9e6868ba97 // Change product attachment upload system Jerome Nadaud 2013-11-28 19:09:24 +01:00
• dbd1d17b93 // typo sorry gRoussac 2013-11-28 18:39:52 +01:00
• c254fd6366 // added addons module gRoussac 2013-11-28 18:33:18 +01:00
• 0b653fd20a Merge pull request #1055 from Dh42/patch-17 Gregory Roussac 2013-11-28 08:55:52 -08:00