Vincent Augagneur
fd1050b0db
//tab module list fix
2013-12-10 09:43:15 +01:00
rGaillard
10fa987832
// small fix
2013-11-29 15:11:49 +01:00
rGaillard
0585b8d723
// small fix
2013-11-28 11:29:27 +01:00
Jérôme Nadaud
ccc388fab9
Merge pull request #1044 from prestamodule/development
...
Mail translation methods fix & template translation fix
2013-11-28 00:08:54 -08:00
rGaillard
13061bdc04
[-] Core: update cartrule feature active on cartrule updating
2013-11-26 18:04:57 +01:00
prestamodule
d064be1587
- Fix multiple translations in a same process for different id_lang
...
If id_lang are mixed (1, 2, 3, 1, 4, 2...) the translations aren't correctly populated from the theme lang.php override if include_once is used.
include must be used in order to handle mixed id_lang in a same process.
Signed-off-by: hadjedjvincent <v.hadjedj@presta-module.com >
2013-11-26 11:22:57 +01:00
Rémi Gaillard
81f05b9db3
Merge pull request #780 from MyBB-Services/dev/gb/sqlmanagergroupby
...
[*] BO : Allow complex GROUP BY in SQL Manager
2013-11-25 08:21:23 -08:00
ccauw
04760c91e5
[-] BO : Double separator in function createTemplate()
...
smarty->getTemplateDir() returns a result ending with a separator,
so no need to add DIRECTORY_SEPARATOR ?
2013-11-25 14:13:10 +01:00
gRoussac
d6e52bdecb
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-21 14:20:00 +01:00
gRoussac
3ab28374e6
[-] BO : Remove warning with open_basdir on module list
2013-11-21 14:17:55 +01:00
Fabio Chelly
5f47526ed2
[-] FO : Fixed bug #PSCFV-11076
2013-11-21 12:13:30 +01:00
Quentin Montant
0410378bd3
"---<br />" string is now removed correctly from the end of customization data text
2013-11-20 13:30:47 +01:00
Quentin Montant
1508a8a5d7
"---<br />" string is now removed correctly from the end of customization data text
2013-11-20 11:31:02 +01:00
gRoussac
4771746959
[-) FO : Fix bug #PSCFV-10926, trailing question mark in pagination url
2013-11-18 12:26:08 +01:00
rGaillard
bd241a9c48
[-] BO: product price was changed on changing to advanced stock management #PSCFV-10996
2013-11-18 12:04:09 +01:00
Jerome Nadaud
11296fe464
// Small Fix in truncateString function
2013-11-18 09:55:21 +01:00
Gregory Roussac
21319ca32c
Merge pull request #988 from dlage/fix_jquery_ui_autocomplete
...
[-] Project : missing ui.menu in jquery_ui_dependencies.
2013-11-17 14:44:47 -08:00
gRoussac
cef406aef2
[*] FO : DNI can be not required
2013-11-17 23:35:56 +01:00
692643d7d6
[-] Project : missing ui.menu in jquery_ui_dependencies.
2013-11-16 17:42:54 +00:00
gRoussac
7f02c8ca58
[-] WS: Fix bug #PSCFV-10970 use configuration for uploaded images quality
2013-11-15 18:50:28 +01:00
gRoussac
2962141d51
[-] BO : Fix warning when no memcached servers
2013-11-15 15:39:00 +01:00
gRoussac
6a690b255b
[-] BO : Model return html error messagae instead of json while image uploading
2013-11-15 12:20:10 +01:00
Jerome Nadaud
50eee795ed
// Add truncate category description preserving html tags
2013-11-15 11:03:06 +01:00
gRoussac
0b47ef1b3b
[-] BO : test on xml string follow up https://github.com/PrestaShop/PrestaShop/pull/690#issuecomment-28542506
2013-11-15 10:51:46 +01:00
gRoussac
d06bf10bbb
[-] FO : Fix bug #PSCFV-10911, doubles in cart rules highlight
2013-11-14 16:35:11 +01:00
gRoussac
d0d234f555
// typo, sorry about this
2013-11-14 15:58:42 +01:00
Rémi Gaillard
f4601d9680
// default form language
2013-11-13 15:37:58 +01:00
gRoussac
c69688cc11
[-] BO : Fix bug #PSCFV-10990 bad version comparison for ps_versions_compliancy
2013-11-13 10:14:21 +01:00
Rémi Gaillard
75df12dd94
[-] Core: Group::getCurrent() return the default customer group of the shop if default customer group is not associated to shop
2013-11-12 18:49:52 +01:00
gRoussac
4d327a537f
[*] FO : addTextFieldToProduct without Line feed, follow up https://github.com/PrestaShop/PrestaShop/pull/962#issuecomment-28294571
2013-11-12 18:28:42 +01:00
gRoussac
036e2362c9
[+] CORE : Fixed cache_id
2013-11-12 17:09:38 +01:00
Fabio Chelly
fc193d5c8b
Merge remote-tracking branch 'origin/development' into development
2013-11-12 16:36:19 +01:00
Rémi Gaillard
75e6a03591
// small fix
2013-11-12 16:38:34 +01:00
Fabio Chelly
dd05692400
[-] FO : Fixed errors when calculating most selled products from footer link
2013-11-12 16:36:07 +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
Rémi Gaillard
8be339463d
// small fix
2013-11-12 12:36:51 +01:00
gRoussac
c1969028f2
[-] FO : Customized meesage with carriage return follow up #962
2013-11-12 10:41:19 +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
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
7e93b2cffd
[-] FO : getTaxCalculator bad cache key
2013-11-11 00:13:35 +01:00
Francois Gaillard
3b7387ffe8
[-] Classes : Hook - Installer & context shop id
2013-11-08 11:00:14 +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
