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
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
gRoussac
87be153e42
[-] MO : Blockcategories last_visited_category must not be cached
2013-11-05 11:16:52 +01:00
Gregory Roussac
f85c6b59c8
Merge pull request #921 from Jacky75/20131105-layered-feature-sorted
...
[*] MO : Blocklayered filter feature blocks sorted
2013-11-05 01:50:48 -08:00
Daniele Giachino
99e98a5164
In multistore, layered filters about categories are not loading the category name from the proper shop
2013-11-05 10:45:23 +01:00
Vincent Augagneur
1a7aa020f6
//added new configuration on dashproduct
2013-11-05 10:23:26 +01:00
Gregory Roussac
c69429c126
Merge pull request #922 from Jacky75/20131105-layered-categories-shop
...
[-] MO : Missing context shop for categories
2013-11-05 01:10:39 -08:00
Daniele Giachino
02c04a9884
In multistore, layered filters about categories are not loading the category name from the proper shop
2013-11-05 09:40:53 +01:00
Daniele Giachino
cf65877f3f
layered filters involving features are now natural sorted
2013-11-05 09:32:36 +01:00
Daniele Giachino
f0abdca08f
layered filters involving features are now natural sorted
2013-11-05 09:30:13 +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
Vincent Augagneur
5386a4547b
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:57:50 +01:00
Damien Metzger
27273334e3
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:47:16 +01:00
Kevin Granger
92bd59fbea
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:10 +01:00
gRoussac