 Damien Metzger
|
a2e1d5ad90
|
// Fix blockcategory install with new fixtures
|
2013-11-18 19:29:13 +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 |
|
|
rGaillard
|
7755cd8d3e
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-18 17:46:20 +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
|
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 |
|
|
rGaillard
|
5d0b188eed
|
// small fix
|
2013-11-18 16:19:02 +01:00 |
|
|
Jerome Nadaud
|
522e95223f
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-18 15:35:17 +01:00 |
|
|
Jerome Nadaud
|
89c9f182b3
|
// Small fix in live configurator toolbox
|
2013-11-18 15:35:03 +01:00 |
|
|
Rémi Gaillard
|
4c51570b34
|
Merge pull request #991 from TMMeilleur/bootstrap
// fixed add to wishlist/compare buttons and added product review
|
2013-11-18 06:22:43 -08:00 |
|
|
Jerome Nadaud
|
40204ba458
|
// Live configurator toolbox part 2
|
2013-11-18 15:04:10 +01:00 |
|
|
TMMeilleur
|
95b9710eda
|
fixed add to wishlist/compare buttons and added product review
|
2013-11-18 15:52:39 +02:00 |
|
|
Jerome Nadaud
|
2ba5dc18fd
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
modules/themeconfigurator/themeconfigurator.php
|
2013-11-18 14:49:27 +01:00 |
|
|
Jerome Nadaud
|
867eef79cc
|
// Add live configurator toolbox - Part 1
|
2013-11-18 14:39:46 +01:00 |
|
|
Jerome Nadaud
|
ebad56a800
|
// Fix small error
|
2013-11-18 14:29:32 +01:00 |
|
|
rGaillard
|
68c8e9da57
|
// move to themeconfigurator
|
2013-11-16 19:24:03 +01:00 |
|
|
Damien Metzger
|
b62952accf
|
[*] BO : Added simulation mode to the dashboard
|
2013-11-15 18:07:23 +01:00 |
|
|
TMMeilleur
|
a5d9daff13
|
added responsive rich menu and small fix in blockbanner
|
2013-11-15 18:40:17 +02:00 |
|
|
Jerome Nadaud
|
8cd1d623e5
|
// Fix error if default blockbanner image is missing
|
2013-11-15 17:13:50 +01:00 |
|
|
Jerome Nadaud
|
19cfa443d2
|
// fix dashgoals configuration fields size
|
2013-11-15 17:04:55 +01:00 |
|
|
Jerome Nadaud
|
ece4331622
|
//Fix addsharethis error
|
2013-11-15 15:38:51 +01:00 |
|
|
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 |
|