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 Nadaud and Francois 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
alexey-svistunov
6f5c9044d3
Added changes from eb94b51 TMMeilleur/PrestaShop
2013-11-08 21:00:00 +02:00
Fabio Chelly
bd8eebdc33
Merge remote-tracking branch 'origin/development' into development
2013-11-08 18:12:23 +01:00
Fabio Chelly
4312d241f3
[-] MO :Fixed #PNM-1654 (Loyalty module) by using most expensive attribute instead of default one
2013-11-08 18:12:11 +01:00
gRoussac
530b6dc501
// Productscomments remove warnings
2013-11-08 15:00:56 +01:00
Jérôme Nadaud
aaaf8588c1
Merge pull request #931 from PhpMadman/patch-2
...
[-] MO : Mailalert was not using order reference
2013-11-08 04:01:39 -08:00
PhpMadman
6ee2852fa5
[-] MO : Mailalert was not using order reference
2013-11-08 12:48:49 +01:00
gRoussac
472dc8c27d
[-] MO : Blocklayered follow up https://github.com/PrestaShop/PrestaShop/commit/a6e67b078e067445eef358e907649e843a1dc26a#commitcomment-4538556
2013-11-07 17:59:04 +01:00
Javsmile
99ad6481e6
Update productcomments.php
...
This little addition fix the problem for enlight the stars in the hookproductTab whe you disable or make an exception of the hookproductOutOfStock with the product file.
2013-11-07 17:53:47 +01: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
fchellypresta
71139df65f
Merge pull request #796 from PhpMadman/patch-1
...
[*] BO: #PNM-1472 Changed label and transparency range check to 1
2013-11-06 03:06:47 -08: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
PhpMadman
2556a7bb68
[-] MO : Mailalert was not using order reference
2013-11-05 20:46:10 +01: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
Jerome Nadaud