Commit Graph

20344 Commits

Author SHA1 Message Date
Jerome Nadaud 2e16a1e5d4 // Better products attributes list button handle 2013-11-21 11:25:09 +01:00
Jerome Nadaud fbe7f236cb Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-21 11:06:21 +01:00
Jerome Nadaud d49f29f79d // Remove subtitle from orders view 2013-11-21 11:06:08 +01:00
Kevin Granger a6e1309a33 Merge pull request #1008 from djfm/cleanup
// removed superfluous mail files
2013-11-21 01:41:15 -08:00
fram 931f309b45 // removed superfluous mail files 2013-11-21 10:26:02 +01:00
Jerome Nadaud 89f400d3fc // Remove unnecessary button from shipping options 2013-11-21 10:12:53 +01:00
Jerome Nadaud 24daa6fa05 // Changing add new title button label 2013-11-21 10:04:03 +01:00
Vincent Augagneur d2c600a5e3 //updated .gitignore 2013-11-21 09:51:22 +01:00
Jerome Nadaud 0b47dbca21 // Adding footer to customer requiered fields 2013-11-21 09:46:27 +01:00
Jerome Nadaud 2df142eb89 // Align actions button in customner view 2013-11-21 09:35:44 +01:00
Kevin Granger d4afcec83f Merge pull request #1005 from djfm/css
// adjust markup in AdminTranslationsController
2013-11-20 12:10:22 -08:00
Kevin Granger 104ae93936 // tweak nav sidebar 2013-11-20 19:25:11 +01:00
Jerome Nadaud a536833f52 // Some bootstrap changes in controllers 2013-11-20 18:44:20 +01:00
Rémi Gaillard c2e3e1295c Merge pull request #1006 from TMMeilleur/bootstrap
// Added all themes for themeconfigurator and fixed Rich Snipet (availability)
2013-11-20 09:37:56 -08:00
TMMeilleur f58018b6e4 fixes for compatibility 2013-11-20 19:31:17 +02:00
TMMeilleur 01428f9a31 added all themes for themeconfigurator 2013-11-20 19:25:12 +02:00
Jerome Nadaud a5cc9efa76 // Languages boostraping 2013-11-20 18:20:19 +01:00
fram 5bd2439e43 // css in AdminTranslationsController 2013-11-20 18:07:51 +01:00
Vincent Augagneur a3282025cf //referralprogram retro compat 1.5 when using helper form in module configuration 2013-11-20 18:05:56 +01:00
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