Commit Graph

20325 Commits

Author SHA1 Message Date
Vincent Augagneur 6ec8e4e70e mailalerts retro compat 1.5 when using helper form in module configuration 2013-11-20 17:57:58 +01:00
Vincent Augagneur 64cfe559f1 //loyalty retro compat 1.5 when using helper form in module configuration 2013-11-20 17:56:11 +01:00
Jerome Nadaud fc5b3b1d29 // Localization bootstraping 2013-11-20 17:52:05 +01:00
Jerome Nadaud 5b6cfa3cdb Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-20 17:29:46 +01:00
Jerome Nadaud 12f3a150a7 // bootraping of import csv view 2013-11-20 17:29:35 +01:00
Kevin Granger 9e2dac8ece //fix css login 2013-11-20 17:24:52 +01:00
Damien Metzger 63f2082da3 [-] FO : fixed tax rules cache 2013-11-20 16:49:48 +01:00
Damien Metzger 4cc99ed9b6 // more image fixes 2013-11-20 16:33:34 +01:00
Damien Metzger 2d60a95fc3 // Fixed slider image 2013-11-20 16:32:14 +01:00
Damien Metzger 8d0b1e9602 [*] BO : Added combination ean13 in the backend search #PSCFV-10436 2013-11-20 16:30:25 +01:00
Rémi Gaillard df4cc9d876 Merge pull request #1002 from TMMeilleur/bootstrap
//fixed banners style
2013-11-20 07:28:51 -08:00
Kevin Granger 8eb5f76df9 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-20 16:24:15 +01:00
Kevin Granger dc29fae59d // reorganize some css and stuff on backward compatibility 2013-11-20 16:24:01 +01:00
Damien Metzger a10c8a3874 [-] FO : Fixed meta title entities #PSCFV-10312 2013-11-20 16:21:37 +01:00
Kevin Granger c61d1bc309 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-20 16:20:56 +01:00
Jerome Nadaud e5d03f4e7c // Csv import fix hide checkbox 2013-11-20 16:11:37 +01:00
Jerome Nadaud 0b3c08acbe // Add language iso code to language select 2013-11-20 15:37:25 +01:00
TMMeilleur db081111a6 fixed banners style 2013-11-20 16:24:05 +02:00
Vincent Augagneur 8148d5696d [-] BO : fixed bug #PSCSX-25 - carrier wizard summary design and missing infos 2013-11-20 15:20:44 +01:00
Jerome Nadaud e2aa776a64 // update cms controller title 2013-11-20 15:19:07 +01:00
Vincent Augagneur 0299f3f0cd [-] BO : fixed bug #PSCSX-32 class-danger on mail send error 2013-11-20 14:56:31 +01:00
Jerome Nadaud 62a149ebe6 [-] BO : FixBug #PSCSX-33 Misplaced save button 2013-11-20 14:50:31 +01:00
Jerome Nadaud dbf98d3722 // Put suffix after input field 2013-11-20 12:02:15 +01:00
Kevin Granger 896d8ce494 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-20 11:57:44 +01:00
Jerome Nadaud 7ab256d28f // Small fix in customer order private note 2013-11-20 11:04:39 +01:00
Damien Metzger 61b1dd338e // Update blockbestsellers 2013-11-20 10:28:39 +01:00
Jérôme Nadaud 29e7169a92 // Change logo size 2013-11-19 08:43:17 +01:00
Damien Metzger 3f5963885e // Install multilang 1.6.0.1 2013-11-19 00:56:53 +01:00
Damien Metzger 54786a6f75 // Install 2013-11-19 00:10:46 +01:00
Damien Metzger 359f408bd1 // Install 2013-11-19 00:05:51 +01:00
Jerome Nadaud 60be5a7989 // themeconfigurator fix 2013-11-18 23:56:19 +01:00
Damien Metzger 89e09c32e8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 23:55:39 +01:00
Damien Metzger e2c930a165 // Install 2013-11-18 23:55:29 +01:00
Jerome Nadaud 1b96c590bb // fix stock available on install 2013-11-18 23:53:47 +01:00
Kevin Granger 3580dc016a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 23:46:48 +01:00
Damien Metzger dec5ef7469 // Install 2013-11-18 23:26:41 +01:00
Lucas CERDAN e99332c012 // Pics 2013-11-18 22:55:17 +01:00
Jerome Nadaud b2c656e51a // small font fix 2013-11-18 22:32:33 +01:00
Lucas CERDAN 4001a99414 Fixtures product 2013-11-18 22:21:10 +01:00
Jerome Nadaud 2c687ba090 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 22:16:38 +01:00
Jerome Nadaud 639a56421a // Themeconfigurator 2013-11-18 22:16:26 +01:00
Damien Metzger 51e5163761 // Moulinette for installer attributes 2013-11-18 22:10:22 +01:00
Jérôme Nadaud fb0118e456 Merge pull request #996 from TMMeilleur/bootstrap
replace new css files location to modules/themeconfigurator/css
2013-11-18 11:53:22 -08:00
Jerome Nadaud f2b5e6de51 // Themeconfigurator and homeslider 2013-11-18 20:49:52 +01:00
Lucas CERDAN c451ee1bd8 // Fixtures 2013-11-18 20:46:22 +01:00
Damien Metzger f4560d0899 // Install 2013-11-18 20:35:42 +01:00
Lucas CERDAN bde8d02c81 Fixtures: category_product 2013-11-18 20:27:01 +01:00
Damien Metzger e4fcb31836 // Install 2013-11-18 20:02:14 +01:00
Jerome Nadaud 3dd7a17f6f // Some fixtures 2013-11-18 19:53:44 +01:00
Lucas CERDAN fac6a5f8b2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 19:31:56 +01:00