Damien Metzger
a932ba512a
Merge pull request #846 from sebastienhouzet/patch-2
...
[-] MO : Fix add truncate tag in pscleaner
2013-11-25 02:13:06 -08:00
Jérôme Nadaud
033bf745cd
Merge pull request #1000 from studiokiwik/sk-ps15x-011
...
"---<br />" string is now removed correctly from the end of customization data text
2013-11-21 00:14:28 -08:00
Priyank Bolia
0ff7163cba
Adding a position order by clause.
...
Adding a position order by clause. This way you can manage how the featured products will display on home page. You can manage the order from the PrestaShop backend, and thus you have full control on the display in the frontend.
2013-11-20 20:56:35 +05:30
Quentin Montant
0410378bd3
"---<br />" string is now removed correctly from the end of customization data text
2013-11-20 13:30:47 +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
gRoussac
8d627aa522
[-] MO : Referralprogram Prevent Exception when badly configured
2013-11-18 14:58:17 +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
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
gRoussac
947f9bb21c
// small isset in productcomments
2013-11-13 16:39:33 +01:00
Jerome Nadaud
c4837e65ec
[-] FO : FixBug #PSCFV-9291 - Ecotax increment display price in product combination
2013-11-13 11:24:25 +01:00
gRoussac
9328a3c473
// forgot to commit 036e2362c9
2013-11-12 19:17: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
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
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 a6e67b078e (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
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
PhpMadman
2556a7bb68
[-] MO : Mailalert was not using order reference
2013-11-05 20:46:10 +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
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
gRoussac
66f314bbb2
// missing trailing bracket in modules/productcomments/config.xml
2013-11-04 14:31:15 +01:00
gRoussac
b8b7fbaf71
[*] MO : New modules version since 1.5.6.0
2013-11-04 11:57:31 +01:00
Gregory Roussac
4b6ee72072
Merge pull request #894 from codeurWeb/patch-6
...
[-] MO : Fix NetworkError 404 Not Found on admin in blocklayered.php
2013-11-04 02:02:10 -08:00
Rémi Gaillard
e000f8c627
// something is missing in the last commit
2013-11-04 11:00:21 +01:00
Rémi Gaillard
6ef7f258ea
// small fix
2013-11-04 10:34:58 +01:00
gRoussac
c7323c2bfe
[-] CORE : Fix bug #PSCFV-10901 warnings on htmlentities
2013-11-03 22:59:04 +01:00
Jerome Nadaud
9193a29a44
[+] MO : Blockcart - Add error handler on ajax function
2013-10-31 19:02:43 +01:00
djfm
0288696c90
// English
2013-10-29 14:37:55 +00:00
Jerome Nadaud
9f2580f3bd
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-10-29 10:31:12 +01:00
Jerome Nadaud
d2e475dd3a
// Removed line from merge
2013-10-29 10:30:59 +01:00
Gregory Roussac
b885c63564
Merge pull request #900 from kpodemski/patch-10
...
[*] MO: productcomments optimization
2013-10-29 02:06:56 -07:00
Gregory Roussac
d74291e5b5
Merge pull request #901 from kpodemski/patch-11
...
[*] MO: blocksharefb optimization
2013-10-29 02:06:25 -07:00
Jerome Nadaud
1d90218e0d
// Update mailalert module version
2013-10-29 10:00:57 +01:00
Jerome Nadaud
9660cef0aa
[-] MO : mailalert - Fix deprecated warning on displayDate
2013-10-29 09:58:42 +01:00
gRoussac
0aca1d4a67
[*] BO : AdminProducts find smallest images
2013-10-29 08:47:41 +01:00
