gRoussac
|
f0f3679cbd
|
[*] FO : https on TOS in fancybox, follow up https://github.com/PrestaShop/PrestaShop/pull/956
|
2013-11-12 15:56:04 +01:00 |
|
Rémi Gaillard
|
175da3ecf6
|
Merge pull request #965 from djfm/IETF
[*] LO : Fix PSCFV-10876: use IETF code to set language of shop, not 'is...
|
2013-11-12 06:05:10 -08:00 |
|
fram
|
743c4f4607
|
[*] LO : Fix PSCFV-10876: use IETF code to set language of shop, not 'iso' code, allows to distinguish between chinese variants etc.
|
2013-11-12 14:59:36 +01:00 |
|
gRoussac
|
40abef8aac
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-11-12 12:32:37 +01:00 |
|
Rémi Gaillard
|
8be339463d
|
// small fix
|
2013-11-12 12:36:51 +01:00 |
|
gRoussac
|
f0f630fb50
|
[-] FO : #PSCFV-10978 firstname displayed instead of lastname in invoice address
|
2013-11-12 12:32:21 +01:00 |
|
gRoussac
|
3f42a381a4
|
[*] FO : Redirect to address.tpl when !Address::isCountryActiveById
|
2013-11-12 12:12:19 +01:00 |
|
Gregory Roussac
|
0e1898be09
|
Merge pull request #963 from djfm/sprintf
// do not use sprintf in installer when it is useless
|
2013-11-12 01:45:39 -08:00 |
|
gRoussac
|
c1969028f2
|
[-] FO : Customized meesage with carriage return follow up #962
|
2013-11-12 10:41:19 +01:00 |
|
Gregory Roussac
|
cd83ec93c7
|
Merge pull request #961 from joseantgv/patch-4
[-] MO : Whishlist, innerhtml in html jquery
|
2013-11-12 00:42:04 -08:00 |
|
fram
|
ab730dc3da
|
// do not use sprintf when it is useless
|
2013-11-12 09:21:05 +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
|
e2d8a33a81
|
[*] FO : Cache on getDiscountsCustomer, follow up https://github.com/PrestaShop/PrestaShop/pull/960
|
2013-11-11 14:02:11 +01:00 |
|
gRoussac
|
a7869a1f06
|
[*] CORE : Remove duplicate SQL queries
|
2013-11-11 13:41:23 +01:00 |
|
gRoussac
|
de404706d9
|
[*] CORE : Profiling hide non doubles
|
2013-11-11 02:09:50 +01:00 |
|
gRoussac
|
3f9338e13d
|
[*] CORE : Cache store for isAssociatedToShop::isAssociatedToShop
|
2013-11-11 01:59:10 +01:00 |
|
gRoussac
|
38da826671
|
[-] FO : getTaxCalculator bad cache key again // sorry about that
|
2013-11-11 01:37:20 +01:00 |
|
gRoussac
|
fee461fdf1
|
[*] FO : Set cache for StockAvailable::getQuantityAvailableByProduct
|
2013-11-11 01:00:55 +01:00 |
|
gRoussac
|
8dd951c2df
|
[*] MO : Remove calls to isRegisteredInHook in crossselling and productscategory
|
2013-11-11 00:36:17 +01:00 |
|
gRoussac
|
7e93b2cffd
|
[-] FO : getTaxCalculator bad cache key
|
2013-11-11 00:13:35 +01:00 |
|
gRoussac
|
19da345531
|
[-] BO : Could not check all modules after ajax call
|
2013-11-10 21:51:14 +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
|
7eb70486e0
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-11-08 15:54:28 +01:00 |
|
gRoussac
|
ebc3dfee62
|
[-] BO : Fix css bug #PSCFV-10899, fixed fix-toolbar z-index
|
2013-11-08 15:54:13 +01:00 |
|
Gregory Roussac
|
ee487fde59
|
Merge pull request #953 from Shagshag/patch-4
[*] BO: kb was not translatable
|
2013-11-08 06:37:26 -08:00 |
|
Shagshag
|
c7f1fcb49a
|
kb was not translatable
|
2013-11-08 15:33:49 +01:00 |
|
gRoussac
|
530b6dc501
|
// Productscomments remove warnings
|
2013-11-08 15:00:56 +01:00 |
|
gRoussac
|
5364be686e
|
// More simple names for csv import files
|
2013-11-08 14:59:43 +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 |
|
Jérôme Nadaud
|
02acd47c9e
|
Merge pull request #950 from pelTek/patch-2
Added states to Greek localization pack
|
2013-11-08 02:46:55 -08:00 |
|
Chris
|
32e92762f5
|
Added states to Greek localization pack
Added states to Greek localization pack
|
2013-11-08 12:44:42 +02:00 |
|
Francois Gaillard
|
3b7387ffe8
|
[-] Classes : Hook - Installer & context shop id
|
2013-11-08 11:00:14 +01:00 |
|
gRoussac
|
472dc8c27d
|
[-] MO : Blocklayered follow up a6e67b078e (commitcomment-4538556)
|
2013-11-07 17:59:04 +01:00 |
|
Fabio Chelly
|
92cf31e5c3
|
[-] MO : Fixed #PNM-1600 by modifying getPageLink()
|
2013-11-07 16:46:30 +01:00 |
|
Fabio Chelly
|
fa7d44d67f
|
Merge remote-tracking branch 'origin/development' into development
|
2013-11-07 16:39:26 +01:00 |
|
Fabio Chelly
|
b9c4b5d2a7
|
[-] FO : Prevents warning in safePostVars when $_POST has been unset
|
2013-11-07 16:38:53 +01:00 |
|
Gregory Roussac
|
fbd28f3e49
|
Merge pull request #942 from Jacky75/20131107_payment_and_groups
[-] FO : in multistore payment module restrictions by customer group was...
|
2013-11-07 06:39:57 -08:00 |
|
Daniele Giachino
|
8c8340db4e
|
[-] FO : in multistore payment module restrictions by customer group was not applied to specific shop
|
2013-11-07 15:18:59 +01:00 |
|
gRoussac
|
7cc351e83d
|
[-] BO : Fix bug #PSCFV-10932, ranges input disabled on load
|
2013-11-07 15:11:30 +01:00 |
|
gRoussac
|
91cde1ab3a
|
[-] BO : getCMSPages to associated shop in cmscontroller
|
2013-11-07 12:09:58 +01:00 |
|
gRoussac
|
e6f9f806bf
|
[-] FO : Fix bug #PSCFV-10892, getCMSPages by id_shop thnaks @jd440
|
2013-11-07 12:03:35 +01:00 |
|
gRoussac
|
fc4a660f76
|
[-] BO : Fix bug #PSCFV-10666 product_supllier currency set to 0
|
2013-11-07 11:24:32 +01:00 |
|
gRoussac
|
514c087962
|
[*] BO : New import csv files
|
2013-11-06 18:38:32 +01:00 |
|
gRoussac
|
00887942d3
|
// preg_last_error not available on every stacks
|
2013-11-06 18:32:39 +01:00 |
|
gRoussac
|
afe6c9bc6f
|
// missing dir sep on is_dir (open_basedir)
|
2013-11-06 18:23:01 +01:00 |
|
gRoussac
|
fc6041fa33
|
[-] IN : bad path in create multistore
|
2013-11-06 18:06:19 +01:00 |
|
gRoussac
|
76b03856e2
|
// missing trailing dir sep
|
2013-11-06 17:33:18 +01:00 |
|
Rémi Gaillard
|
ef5779f63f
|
// d321b9a5bc
|
2013-11-06 17:11:31 +01:00 |
|