Commit Graph

2761 Commits

Author SHA1 Message Date
Jerome Nadaud 3af7a59caa // Add version number to addsharethis 2013-11-15 15:32:52 +01:00
Jerome Nadaud b5d84a72e0 // AddShareThis fix 2013-11-15 15:31:01 +01:00
Jerome Nadaud d7de507f42 // Product comments 2013-11-15 11:49:40 +01:00
Jerome Nadaud a66d2e1ab6 // Fix form name 2013-11-15 09:18:41 +01:00
Jerome Nadaud c2d956ec7d // Modif after specs change 2013-11-15 08:58:30 +01:00
Jerome Nadaud 29f65da5ca // Add wish list button to blockwishlist module 2013-11-14 19:54:28 +01:00
TMMeilleur 0d1c113be1 updates and fixes 14.11.2013 2013-11-14 18:08:05 +02:00
Jerome Nadaud 8f81af0463 // fix on blockcategories 2013-11-14 15:12:08 +01:00
Jerome Nadaud 87faae9717 // Add top menu to blockcategories 2013-11-14 11:52:24 +01:00
Jerome Nadaud 63ef0b82e6 // Categories thumbnail images for blocktopmenu 2013-11-14 10:37:07 +01:00
Jerome Nadaud 232309996b // Fix blocklayered bootstrap 2013-11-14 10:35:02 +01:00
Jerome Nadaud 27731f3bb2 // Bootstraping blocklayered backoffice and ajax fix 2013-11-13 20:13:42 +01:00
Jerome Nadaud aa81e2607f // First boostraping pass on blocklayered module 2013-11-13 15:31:30 +01:00
Rémi Gaillard 24a4694000 // small clean 2013-11-13 11:58:11 +01:00
Vincent Augagneur 5d0117c5ed //added configuration in sql request in dashactivity 2013-11-13 10:08:57 +01:00
Vincent Augagneur 582ad68875 added default configuration value for dashproducts 2013-11-13 09:27:48 +01:00
Vincent Augagneur e7869f6b19 //added default configuration value for dashactivity 2013-11-13 09:07:44 +01:00
Vincent Augagneur 52abf62ae1 //dashactivity config 2013-11-12 17:33:54 +01:00
Vincent Augagneur c6e34ee229 //dashproducts added section in tpl 2013-11-12 14:43:08 +01:00
Vincent Augagneur 249bd5437d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-12 14:41:11 +01:00
Vincent Augagneur cf9da09f98 //remove unused smarty variable 2013-11-12 14:40:58 +01:00
alexey-svistunov 6f5c9044d3 Added changes from eb94b51 TMMeilleur/PrestaShop 2013-11-08 21:00:00 +02:00
Jerome Nadaud 01d8376ee7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-07 16:48:56 +01:00
Jerome Nadaud b51b388eaa // Blockcategories thumnail uploader fix 2013-11-07 16:44:55 +01:00
djfm 1aadb10fb2 // English emails 2013-11-06 16:20:19 +00:00
Kevin Granger 05c71145c2 // dashboard 2013-11-06 12:14:49 +01:00
Rémi Gaillard 9fa4296a06 Merge pull request #929 from djfm/bootstrap
// updated English emails: now responsive
2013-11-06 01:38:44 -08:00
djfm f742e817da // updated English emails: now responsive 2013-11-05 18:10:31 +00:00
Rémi Gaillard 3edaee1313 // themeconfigurator 2013-11-05 19:07:42 +01:00
Rémi Gaillard 65a41a9f7a // theme configurator 2013-11-05 18:49:21 +01:00
Vincent Augagneur 871ebe77b6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 18:08:22 +01:00
Vincent Augagneur d27fe93daa //modules added ->bootstrap = true; 2013-11-05 18:08:01 +01:00
Damien Metzger a31dbeb68e // Fixed bootstrap mode for modules 2013-11-05 17:29:51 +01:00
Kevin Granger 332101614a // moved nv.d3.css to vendor directory 2013-11-05 17:15:36 +01:00
Vincent Augagneur f0e1b9b2b8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 16:32:12 +01:00
Vincent Augagneur 7e872aa581 //small fix 2013-11-05 16:32:05 +01:00
Damien Metzger 0bd6b940d2 // Fixed logoq 2013-11-05 16:17:14 +01:00
Damien Metzger 0e4a900d3d // Fixed group display 2013-11-05 16:13:52 +01:00
Damien Metzger 9a86f2c32b // And now it works! 2013-11-05 15:02:36 +01:00
Damien Metzger a5552f3f85 // Improved dashgoals configuration (tmp) 2013-11-05 14:44:42 +01:00
Vincent Augagneur 1a7aa020f6 //added new configuration on dashproduct 2013-11-05 10:23:26 +01:00
Jerome Nadaud de8bd97831 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 19:50:48 +01:00
Damien Metzger 8dc29b20f0 // Code cleaning and dashgoals improvements (part 1 - not finished yet) 2013-11-04 18:52:27 +01:00
Jerome Nadaud fa68e015b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 18:34:51 +01:00
Jerome Nadaud bf2d54e286 // Add new uploader helper to blockcategories 2013-11-04 18:32:59 +01:00
djfm 71e3a8a937 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 16:58:17 +00:00
djfm 5372f31b4c // updated English emails 2013-11-04 16:57:50 +00:00
Kevin Granger 68cda947ed // removed login.css 2013-11-04 16:53:43 +01:00
Damien Metzger d4a6148b64 // Anything but a 404 image 2013-11-04 16:09:55 +01:00
Damien Metzger 2e80ed8de5 // Cleaned conflict 2013-11-04 14:58:17 +01:00