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

• 76b03856e2 // missing trailing dir sep gRoussac 2013-11-06 17:33:18 +01:00
• 1aadb10fb2 // English emails djfm 2013-11-06 16:18:46 +00:00
• ef5779f63f // d321b9a5bc Rémi Gaillard 2013-11-06 17:11:31 +01:00
• d0522417eb Merge pull request #937 from PhpMadman/DiscountPrice Jérôme Nadaud 2013-11-06 08:06:16 -08:00
• 50c95f568c Merge pull request #935 from jeckyl/patch-4 Rémi Gaillard 2013-11-06 07:01:02 -08:00
• df865eb827 Merge pull request #936 from TMMeilleur/bootstrap Kevin Granger 2013-11-06 07:00:31 -08:00
• 616cc91eb2 // Fix bug JQuery on handler Jerome Nadaud 2013-11-06 15:49:44 +01:00
• 56230a1f53 // Live is deprecated in jquery 1.9 Jerome Nadaud 2013-11-06 15:34:46 +01:00
• 7895f8643e // Fix missing page header in combinations generator Jerome Nadaud 2013-11-06 14:42:56 +01:00
• d321b9a5bc Update cart-summary.js jeckyl 2013-11-06 14:42:00 +01:00
• d95885caae [*] FO : Added posibilty to display new price instead of quantity discount PhpMadman 2013-11-06 14:41:42 +01:00
• 211c36c7a3 improved scss variables TMMeilleur 2013-11-06 15:41:00 +02:00
• fcb225ac5a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-06 12:19:15 +01:00
• 0c1b77b3da // Fix Combinations list actions button problem Jerome Nadaud 2013-11-06 12:18:52 +01:00
• 05c71145c2 // dashboard Kevin Granger 2013-11-06 12:14:49 +01:00
• 71139df65f Merge pull request #796 from PhpMadman/patch-1 fchellypresta 2013-11-06 03:06:47 -08:00
• 1fb8ef823d [-] BO : Fix bug #PSCFV-10937, bad escaping for var product_prices in prices.tpl gRoussac 2013-11-06 11:50:52 +01:00
• 29001b3392 Merge pull request #930 from PhpMadman/patch-3 Jérôme Nadaud 2013-11-06 02:30:57 -08:00
• eac7fbb694 [-] BO : Cart was not using order reference, corrected syntax PhpMadman 2013-11-06 11:06:46 +01:00
• a890410a64 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-11-06 10:57:02 +01:00
• c16c239953 //typo Vincent Augagneur 2013-11-06 10:56:56 +01:00
• 9fa4296a06 Merge pull request #929 from djfm/bootstrap Rémi Gaillard 2013-11-06 01:38:44 -08:00
• 54db0b705c Merge pull request #923 from PrestaEdit/1.6.x-fancybox Jérôme Nadaud 2013-11-06 00:31:57 -08:00
• fa4b5e0b7d Merge pull request #927 from djfm/loc Jérôme Nadaud 2013-11-06 00:31:46 -08:00
• d30830f6fe Merge pull request #932 from prestalab/patch-1 Jérôme Nadaud 2013-11-05 23:49:43 -08:00
• b2e5c6090d Fixed tags with UTF-8 chars PrestaLab 2013-11-05 23:33:44 -08:00
• 2556a7bb68 [-] MO : Mailalert was not using order reference PhpMadman 2013-11-05 20:46:10 +01:00
• 7226f33f90 [-] BO : Cart was not using order reference PhpMadman 2013-11-05 20:42:57 +01:00
• 1dd919addf // no need mobile version with responsive :) Rémi Gaillard 2013-11-05 19:15:24 +01:00
• f742e817da // updated English emails: now responsive djfm 2013-11-05 18:10:31 +00:00
• 3edaee1313 // themeconfigurator Rémi Gaillard 2013-11-05 19:07:42 +01:00
• 65a41a9f7a // theme configurator Rémi Gaillard 2013-11-05 18:49:21 +01:00
• 5ec5215919 // UI modules fixs Kevin Granger 2013-11-05 18:17:39 +01:00
• 37e0556c36 //fixed carrier logo upload Vincent Augagneur 2013-11-05 18:12:53 +01:00
• 871ebe77b6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-11-05 18:08:22 +01:00
• d27fe93daa //modules added ->bootstrap = true; Vincent Augagneur 2013-11-05 18:08:01 +01:00
• a31dbeb68e // Fixed bootstrap mode for modules Damien Metzger 2013-11-05 17:29:51 +01:00
• b68d8c5d4a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-05 17:15:51 +01:00
• 332101614a // moved nv.d3.css to vendor directory Kevin Granger 2013-11-05 17:15:36 +01:00
• 657c8f415a //small css fix Vincent Augagneur 2013-11-05 17:01:38 +01:00
• 3f3a4ef342 //revert Vincent Augagneur 2013-11-05 16:58:26 +01:00
• 217a9124d4 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-11-05 16:56:08 +01:00
• 1dccee0036 //remove back button in header toolbar on carrier wizard Vincent Augagneur 2013-11-05 16:56:03 +01:00
• ad7dfca9e1 // RSS date on the dashboard Damien Metzger 2013-11-05 16:55:42 +01:00
• 2581acd505 // fix tooltip carrier wizard Kevin Granger 2013-11-05 16:52:41 +01:00
• eb02711042 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-05 16:42:24 +01:00
• e702af6a67 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-05 16:42:09 +01:00
• 9f1911eeca // Fixed shopping cart line reduction Damien Metzger 2013-11-05 16:41:38 +01:00
• 533ebc0f6d // backward CSS Kevin Granger 2013-11-05 16:40:21 +01:00
• 3f3dc0feb9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jerome Nadaud 2013-11-05 16:39:12 +01:00
• 4a6cb5075e Merge pull request #924 from TMMeilleur/bootstrap Rémi Gaillard 2013-11-05 07:36:14 -08:00
• ec528fff93 // one more groups improvement Damien Metzger 2013-11-05 16:33:49 +01:00
• f0e1b9b2b8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-11-05 16:32:12 +01:00
• 7e872aa581 //small fix Vincent Augagneur 2013-11-05 16:32:05 +01:00
• 161c701ecf // Groups review Damien Metzger 2013-11-05 16:30:34 +01:00
• 0ffa6ab059 update 5.11.13 TMMeilleur 2013-11-05 17:27:57 +02:00
• 21209d799f update 5.11.13 TMMeilleur 2013-11-05 17:17:26 +02:00
• 0bd6b940d2 // Fixed logoq Damien Metzger 2013-11-05 16:17:14 +01:00
• 0e4a900d3d // Fixed group display Damien Metzger 2013-11-05 16:13:52 +01:00
• e4fe5f6df6 // Fixed htmlentities in KPIs Damien Metzger 2013-11-05 16:01:37 +01:00
• 161145fb34 // small fix Rémi Gaillard 2013-11-05 15:35:14 +01:00
• d4253b9849 // small fix Rémi Gaillard 2013-11-05 15:33:21 +01:00
• 9bc5a52925 Merge pull request #916 from PrestaEdit/patch-58 Damien Metzger 2013-11-05 06:20:59 -08:00
• b0ae53f823 // Changed cursor in the module position tab (for drag n drop) Damien Metzger 2013-11-05 15:14:40 +01:00
• b96da7e5ee Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Rémi Gaillard 2013-11-05 15:14:13 +01:00
• a5bb0486e6 // fix email validator && allow to convert unicode without classes Rémi Gaillard 2013-11-05 15:06:22 +01:00
• 9a86f2c32b // And now it works! Damien Metzger 2013-11-05 15:02:36 +01:00
• a5552f3f85 // Improved dashgoals configuration (tmp) Damien Metzger 2013-11-05 14:44:31 +01:00
• eb383e580e // Organize css/sass + backward compatibility WIP Kevin Granger 2013-11-05 12:32:41 +01:00
• 4b0b5cf4da // added an option not to override the local localization pack when installing a localization pack fram 2013-11-05 12:08:14 +01:00
• 2b8d069cf9 [*] LO : Added states to Spanish localization pack fram 2013-11-05 12:06:31 +01:00
• 9817ef6840 // small fix on profiling Rémi Gaillard 2013-11-05 11:54:22 +01:00
• 581645ce6d [-) BO : Action is mandatory for a cart rule gRoussac 2013-11-05 11:26:10 +01:00
• 87be153e42 [-] MO : Blockcategories last_visited_category must not be cached gRoussac 2013-11-05 11:16:52 +01:00
• f85c6b59c8 Merge pull request #921 from Jacky75/20131105-layered-feature-sorted Gregory Roussac 2013-11-05 01:50:48 -08:00
• 99e98a5164 In multistore, layered filters about categories are not loading the category name from the proper shop Daniele Giachino 2013-11-05 10:45:23 +01:00
• 55cd7c4c34 update 05.11.13 TMMeilleur 2013-11-05 11:35:24 +02:00
• 1a7aa020f6 //added new configuration on dashproduct Vincent Augagneur 2013-11-05 10:23:26 +01:00
• 4c1ad83b18 // "Fixed" strict standard Damien Metzger 2013-11-05 10:22:39 +01:00
• e710942833 //small fix on dashboard config save Vincent Augagneur 2013-11-05 10:22:22 +01:00
• 9af3b30135 //smal fix on hookDashboardData params Vincent Augagneur 2013-11-05 10:21:34 +01:00
• 26a43260c5 [-] CORE : invalid method name in displayAjax method of Controller action gRoussac 2013-11-05 10:18:53 +01:00
• 9f396ada83 //remove unnecessary addCSS (fancybox) Jonathan Danse 2013-11-05 10:13:13 +01:00
• c69429c126 Merge pull request #922 from Jacky75/20131105-layered-categories-shop Gregory Roussac 2013-11-05 01:10:39 -08:00
• 02c04a9884 In multistore, layered filters about categories are not loading the category name from the proper shop Daniele Giachino 2013-11-05 09:40:53 +01:00
• cf65877f3f layered filters involving features are now natural sorted Daniele Giachino 2013-11-05 09:32:36 +01:00
• f0abdca08f layered filters involving features are now natural sorted Daniele Giachino 2013-11-05 09:30:13 +01:00
• de8bd97831 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-04 19:50:48 +01:00
• cf44f8d0b4 // Uploader helper small fix Jerome Nadaud 2013-11-04 19:50:04 +01:00
• fbc93e5632 // moved admin css and backward compatibility css to admin theme css directory Kevin Granger 2013-11-04 19:48:53 +01:00
• 569455a7ff // fix on front validators Rémi Gaillard 2013-11-04 19:26:51 +01:00
• 8dc29b20f0 // Code cleaning and dashgoals improvements (part 1 - not finished yet) Damien Metzger 2013-11-04 18:51:20 +01:00
• fa68e015b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-04 18:34:51 +01:00
• bf2d54e286 // Add new uploader helper to blockcategories Jerome Nadaud 2013-11-04 18:32:59 +01:00
• 8aedd4eb04 // Cleaned CSS files Kevin Granger 2013-11-04 18:31:59 +01:00
• d78a268730 // Uploader helper part 2 Jerome Nadaud 2013-11-04 18:31:43 +01:00
• 0e54bf0f76 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-11-04 18:27:39 +01:00
• 12276f41fb // Update image when updated Jerome NadaudandgRoussac 2013-10-18 17:41:36 +02:00
• be13f82b30 [*] FO: Follow up https://github.com/PrestaShop/PrestaShop/commit/e86c56172dad2892d5c7e7dbb0908b0f4ffbaae0 gRoussac 2013-11-04 18:20:01 +01:00
• f5cc6862cb // don't die on autoload Rémi Gaillard 2013-11-04 18:08:24 +01:00