 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
|
618aa24f74
|
Merge pull request #945 from Javsmile/patch-2
// Update productcomments.php
|
2013-11-18 06:30:59 -08: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 |
|
|
gRoussac
|
8d627aa522
|
[-] MO : Referralprogram Prevent Exception when badly configured
|
2013-11-18 14:58:17 +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 |
|
|
gRoussac
|
dbc08d779c
|
// typo, sorry about this
|
2013-11-18 14:35:39 +01:00 |
|
|
gRoussac
|
22a9548f83
|
[-] FO : Fix bug #PSCFV-11043, bad cache id from module template
|
2013-11-18 14:32:34 +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 |
|
|
Gregory Roussac
|
448a4c9994
|
Merge pull request #980 from djfm/development
// no line breaks in $this->l()
|
2013-11-15 02:23:39 -08:00 |
|
|
fram
|
ba15d975bc
|
// no line breaks in $this->l()
|
2013-11-15 10:44:01 +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 |
|
|
gRoussac
|
947f9bb21c
|
// small isset in productcomments
|
2013-11-13 16:39:33 +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 |
|
|
Jerome NadaudandFrancois Gaillard
|
c4837e65ec
|
[-] FO : FixBug #PSCFV-9291 - Ecotax increment display price in product combination
|
2013-11-13 11:24:25 +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 |
|
|
gRoussac
|
9328a3c473
|
// forgot to commit https://github.com/PrestaShop/PrestaShop/commit/036e2362c97ca00e9066076af1c45fc8f9946d56
|
2013-11-12 19:17:54 +01:00 |
|
|
Vincent Augagneur
|
52abf62ae1
|
//dashactivity config
|
2013-11-12 17:33:54 +01:00 |
|
|
gRoussac
|
036e2362c9
|
[+] CORE : Fixed cache_id
|
2013-11-12 17:09:38 +01:00 |
|
|
Fabio Chelly
|
dd05692400
|
[-] FO : Fixed errors when calculating most selled products from footer link
|
2013-11-12 16:36:07 +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 |
|
|
gRoussac
|
c1969028f2
|
[-] FO : Customized meesage with carriage return follow up #962
|
2013-11-12 10:41:19 +01:00 |
|
|
joseantgv
|
7523828a7a
|
Update ajax-wishlist.js
innerHtml can not execute javascript from "data". If someone modify php files returned from jquery function and includes a script, it's not executed.
|
2013-11-11 16:58:52 +01:00 |
|
|
gRoussac
|
a7869a1f06
|
[*] CORE : Remove duplicate SQL queries
|
2013-11-11 13:41:23 +01:00 |
|
|
gRoussac
|
8dd951c2df
|
[*] MO : Remove calls to isRegisteredInHook in crossselling and productscategory
|
2013-11-11 00:36:17 +01:00 |
|