Commit Graph
20301 Commits
Author SHA1 Message Date
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
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
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
Lucas CERDAN 0824a61551 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 19:29:32 +01:00
Damien Metzger a2e1d5ad90 // Fix blockcategory install with new fixtures 2013-11-18 19:29:13 +01:00
Lucas CERDAN 72b6b3d482 Fixtures (en) 2013-11-18 19:27:10 +01:00
Jerome Nadaud 4f2ef4a638 // Update fixture in blockcms 2013-11-18 19:26:30 +01:00
Damien Metzger a3e1fdb690 // Install 2013-11-18 19:22:10 +01:00
Lucas CERDAN 770d48cf3c Fixtures (en) : category_product 2013-11-18 19:15:10 +01:00
Alexander Grosul b6c5cd7c63 replace new css files location to modules/themeconfigurator/css 2013-11-18 20:07:24 +02:00
Damien Metzger 36baadad1a // Set to new fixtures 2013-11-18 18:51:11 +01:00
Lucas CERDAN c78252f64b Fixtures images 2013-11-18 18:38:24 +01:00
Lucas CERDAN 5ca7f683ac // Fixture (en): add description to categories 2013-11-18 18:09:40 +01:00
rGaillard 7755cd8d3e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 17:46:20 +01:00
rGaillard 5c1f8871fc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 17:46:05 +01:00
Jerome Nadaud 57b329ca74 // Remove other fonts 2013-11-18 17:46:05 +01:00
rGaillard 9197498c3c // delete useless module 2013-11-18 17:45:53 +01:00
Jerome Nadaud 339fb86f4b // oops 2013-11-18 17:42:26 +01:00
Jerome Nadaud 04bc320080 // Small fix 2013-11-18 17:41:16 +01:00
Lucas CERDAN 09a558485a New fixtures (en)
(my first commit, yay! :) )
2013-11-18 17:24:06 +01:00
Jerome Nadaud c14b9e619d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	modules/themeconfigurator/themeconfigurator.php
2013-11-18 17:21:41 +01:00
Jerome Nadaud 938ef4fe39 // small fix 2013-11-18 17:12:35 +01:00
Damien Metzger 43a54b10bf // Reverted revert 2013-11-18 17:00:23 +01:00