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

• f8fc02ac4b Merge pull request #1054 from Dh42/patch-16 Gregory Roussac 2013-11-28 08:54:22 -08:00
• 5591f5c399 Prevents crawlers from creating carts Dh42 2013-11-28 10:46:33 -06:00
• b6023cc9f7 Needs to be a non followed url Dh42 2013-11-28 10:39:29 -06:00
• 66947b5354 //multiple small fix on carrier wizard Vincent Augagneur 2013-11-28 17:38:05 +01:00
• d46feffcf1 [*] CORE : Throw Exception when no theme selected only in front office gRoussac 2013-11-28 16:14:30 +01:00
• 7261490381 // Fix Categories image problem Jerome Nadaud 2013-11-28 15:35:17 +01:00
• 336e784ca5 [*] CORE : Throw Exception when no theme selected gRoussac 2013-11-28 15:32:19 +01:00
• e722a5c817 // Dashgoals tooltip improved Damien Metzger 2013-11-28 15:03:29 +01:00
• b66f8ea75a // Allow list disabled categories Jerome Nadaud 2013-11-28 14:49:41 +01:00
• a0a3e95e1c // Remove stacked option to dashgoals Damien Metzger 2013-11-28 14:42:50 +01:00
• 18059a24a3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-28 14:35:41 +01:00
• 51bd377a67 // Dashgoals improvements Damien Metzger 2013-11-28 14:29:23 +01:00
• 35fc864e0b // Fixed potential warning Damien Metzger 2013-11-27 18:20:47 +01:00
• 8848ff08d8 // test git Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-28 14:29:34 +01:00
• cb9d00352f [-] BO : Adminimport reset selected csv if not exists gRoussac 2013-11-28 14:19:23 +01:00
• 8f5bac0e90 Merge pull request #1042 from Dh42/patch-14 Jérôme Nadaud 2013-11-28 03:30:03 -08:00
• 58da52b808 Merge pull request #1047 from djfm/development Jérôme Nadaud 2013-11-28 03:26:04 -08:00
• 6729d97534 // import WIP Kevin Granger 2013-11-28 12:22:39 +01:00
• 8e71c90b4a [*] BO : AdminImport, check choosen csv exists gRoussac 2013-11-28 12:12:08 +01:00
• 88d46bd0b9 [*] BO : AdminImport, check choosen scv exists gRoussac 2013-11-28 12:00:41 +01:00
• 37afb369c3 // Fix already defined Core class Jerome Nadaud 2013-11-28 11:46:32 +01:00
• 9b241d5e1d // Add interface restriction in Autoload Jerome Nadaud 2013-11-28 11:46:03 +01:00
• 0585b8d723 // small fix rGaillard 2013-11-28 11:29:27 +01:00
• dde8540a86 //carrier wizard logo location fixed Vincent Augagneur 2013-11-28 11:27:34 +01:00
• 8370c18fe8 [-] CORE : Remove notices on ob clean gRoussac 2013-11-28 11:11:49 +01:00
• ddf00b3e98 //small fix #PSCSX-50 Vincent Augagneur 2013-11-28 11:06:46 +01:00
• 484501169a //added move up/down on selected item on blocktopmenu Vincent Augagneur 2013-11-28 10:52:17 +01:00
• 56afe10128 //added gapi logo in dashactivity Vincent Augagneur 2013-11-28 10:18:54 +01:00
• 510b71054a // Add Drag and Drop to uploader helper Jerome Nadaud 2013-11-28 09:55:22 +01:00
• ccc388fab9 Merge pull request #1044 from prestamodule/development Jérôme Nadaud 2013-11-28 00:08:54 -08:00
• 82022c337a [-] FO : CCC do not withdraw \t+ and \s+ gRoussac 2013-11-27 19:49:07 +01:00
• cc3a1379d1 // Import WIP (still broken for first upload) Kevin Granger 2013-11-27 19:33:36 +01:00
• 65106c6a24 [*] MO : Merge of https://github.com/PrestaShop/PrestaShop/pull/721 gRoussac 2013-11-27 19:21:57 +01:00
• 76f115ac22 // Small Fix in Import controller Jerome Nadaud 2013-11-27 18:12:45 +01:00
• 17294618e1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-27 17:57:31 +01:00
• 724d52e019 // Adding timestamp filename to csv import Jerome Nadaud 2013-11-27 17:57:19 +01:00
• 8dc4eb5c03 [-] BO : Category code cleaning, fixing, moving and multistore-ing Damien Metzger 2013-11-27 17:40:22 +01:00
• 8c4e2a9a93 // Removed useless lines Damien Metzger 2013-11-25 19:37:16 +01:00
• 621ad532d7 // typo rGaillard 2013-11-27 17:00:13 +01:00
• b58e8b6bb7 // One step csv uploader Jerome Nadaud 2013-11-27 16:35:58 +01:00
• 5e718394e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap gRoussac 2013-11-27 16:27:04 +01:00
• 068b7100c4 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/854 again gRoussac 2013-11-27 16:26:22 +01:00
• 0eeb353742 // Natives modules moved Francois Gaillard 2013-11-27 16:23:48 +01:00
• 2b210e0732 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/854 gRoussac 2013-11-27 16:20:20 +01:00
• cc8f4696b1 // Small Fix in product image upload Jerome Nadaud 2013-11-27 15:56:15 +01:00
• dd99d13dc4 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/766 gRoussac 2013-11-27 15:42:11 +01:00
• 8f51fee67a // load jquery-timeago.js Kevin Granger 2013-11-27 15:15:30 +01:00
• 6d9f71a8db Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-27 14:39:41 +01:00
• e1ae484c10 // add jquery.timeago.js + jquery. validatio,.js Kevin Granger 2013-11-27 14:39:09 +01:00
• 66f8b55fc2 // import WIP (broken for now) Kevin Granger 2013-11-27 14:35:47 +01:00
• 9bc020ce9e Merge pull request #1051 from TMMeilleur/bootstrap Rémi Gaillard 2013-11-27 05:13:46 -08:00
• 44549d650f fixes 27.11.2013 TMMeilleur 2013-11-27 14:02:26 +02:00
• ef6dd3bfed [-] MO : display_column_left not assigned to smarty in modules initContent() + ssl on loyalty front controller gRoussac 2013-11-27 12:32:01 +01:00
• dd36a9e8b7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-27 11:35:41 +01:00
• dbd5f9d32f // added country name to Tunisia localization pack fram 2013-11-27 10:44:46 +01:00
• 27397ab839 // updated Slovenia VAT rate fram 2013-11-27 10:39:44 +01:00
• 11f530b54f // updated Singapore localization pack fram 2013-11-27 10:34:59 +01:00
• 6c271e037c // corrected spelling of Saudi Arabia fram 2013-11-27 10:27:52 +01:00
• 964a0a4601 // updated Poland VAT rate fram 2013-11-27 10:20:04 +01:00
• 9737709ee6 // added country name to Philippines localization pack fram 2013-11-27 10:12:02 +01:00
• 70144c7cef // added country name to Peru localization pack fram 2013-11-27 10:11:05 +01:00
• 0442da817c // added country name to Panama localization pack fram 2013-11-27 10:07:14 +01:00
• 9d63514220 // updated Norway VAT rate fram 2013-11-27 10:00:04 +01:00
• 6959e71bec [*] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/729 gRoussac 2013-11-27 00:09:41 +01:00
• 10dac5a45b [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/816 gRoussac 2013-11-27 00:06:44 +01:00
• 5f5b9bd1de [-] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/718 gRoussac 2013-11-26 23:43:49 +01:00
• 5d511c1ac7 // remove notice in ModuleGraph.php gRoussac 2013-11-26 23:39:28 +01:00
• ef466ac47c [+] CORE : Merg of https://github.com/PrestaShop/PrestaShop/pull/775 gRoussac 2013-11-26 23:33:24 +01:00
• 1855ffa584 [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/813 gRoussac 2013-11-26 23:18:00 +01:00
• 8d15f5d3e6 [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/814 gRoussac 2013-11-26 23:08:03 +01:00
• 5485433df6 [-] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/819 gRoussac 2013-11-26 22:57:57 +01:00
• 9ccd4504f4 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/820 + https://github.com/PrestaShop/PrestaShop/commit/5e407db21e3e30a1a5fa94b9558314ffa21af407 gRoussac 2013-11-26 22:49:10 +01:00
• b8012952f7 [*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/852 gRoussac 2013-11-26 22:32:57 +01:00
• 4c92e8f4c5 [*] PDF : Merge of https://github.com/PrestaShop/PrestaShop/pull/873 gRoussac 2013-11-26 19:06:50 +01:00
• 37d4d4bd5f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-26 19:03:27 +01:00
• 32af46e42c // Import WIP Kevin Granger 2013-11-26 19:03:15 +01:00
• 13b5762367 [-] FO : trailing \t in minified html gRoussac 2013-11-26 18:41:02 +01:00
• c5b6ec5c3c [+] FO : Missing old default templates gRoussac 2013-11-26 18:09:05 +01:00
• 13061bdc04 [-] Core: update cartrule feature active on cartrule updating rGaillard 2013-11-26 18:04:57 +01:00
• 58eb63e99e // small fix rGaillard 2013-11-26 17:02:13 +01:00
• 7f304fc768 [-] FO : Merge of https://github.com/ldecoker/PrestaShop/commit/d3bf4d233005511e08554a7c283e0b992815e01a gRoussac 2013-11-26 16:26:35 +01:00
• a71bfa8d4e Merge pull request #1046 from PhpMadman/patch-1 Rémi Gaillard 2013-11-26 07:10:28 -08:00
• 0a5216e35b show all messages link linked to tab PhpMadman 2013-11-26 15:56:21 +01:00
• dc90bb6227 // Force clearstatcache on product image upload Jerome Nadaud 2013-11-26 15:46:21 +01:00
• 69c99f49c9 [-] BO : Merge of https://github.com/smilesrg/PrestaShop/commit/b7b79ff4614e5be7891f8702acdc46c8303a2fdd gRoussac 2013-11-26 15:27:59 +01:00
• 5150a3fc4c [-] MO : fixed bug #PSCFV-9642 - Slider does not scroll when define language from right to left Vincent Augagneur 2013-11-26 15:20:44 +01:00
• 4ab4e19d20 // updated Latvia VAT rate fram 2013-11-26 12:32:45 +01:00
• 023be78690 // updated Liechtenstein VAT rate fram 2013-11-26 12:28:38 +01:00
• 55c329c16e // updated Kenya VAT rate fram 2013-11-26 11:54:51 +01:00
• b951c2809c // updated Jersey VAT rate fram 2013-11-26 11:47:34 +01:00
• 841f6ec65d Merge pull request #1011 from indesign47/patch-10 Gregory Roussac 2013-11-26 02:35:30 -08:00
• 5153b49eae Merge pull request #1013 from indesign47/patch-12 Gregory Roussac 2013-11-26 02:35:07 -08:00
• 24dc07ef85 Merge pull request #1022 from indesign47/patch-18 Gregory Roussac 2013-11-26 02:34:31 -08:00
• b6a41fca69 Merge pull request #1015 from indesign47/patch-14 Gregory Roussac 2013-11-26 02:34:25 -08:00
• 6de541ea1d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap gRoussac 2013-11-26 11:27:41 +01:00
• 53b91fc0b7 attribute_anchor_separator gRoussac 2013-11-26 11:27:25 +01:00
• 2b37db629e - Fix english translation for backoffice_order template prestamoduleandhadjedjvincent 2013-11-26 11:23:33 +01:00
• d064be1587 - Fix multiple translations in a same process for different id_lang If id_lang are mixed (1, 2, 3, 1, 4, 2...) the translations aren't correctly populated from the theme lang.php override if include_once is used. include must be used in order to handle mixed id_lang in a same process. prestamoduleandhadjedjvincent 2013-11-26 11:22:57 +01:00
• 33b7c554f7 //small fix #PSCSX-39 Vincent Augagneur 2013-11-26 10:59:03 +01:00
• 926286eaf9 // fix switch Kevin Granger 2013-11-26 10:33:35 +01:00