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 |
|
Jérôme Nadaud
|
d0522417eb
|
Merge pull request #937 from PhpMadman/DiscountPrice
[*] FO : Added possibility to display new price instead of quantity discount
|
2013-11-06 08:06:16 -08:00 |
|
Rémi Gaillard
|
50c95f568c
|
Merge pull request #935 from jeckyl/patch-4
Update cart-summary.js
|
2013-11-06 07:01:02 -08:00 |
|
jeckyl
|
d321b9a5bc
|
Update cart-summary.js
Just add this space to separate this classes. It's to display or not carrier option when we select one or another carrier during order finalisation.
|
2013-11-06 14:42:00 +01:00 |
|
PhpMadman
|
d95885caae
|
[*] FO : Added posibilty to display new price instead of quantity discount
|
2013-11-06 14:41:42 +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 |
|
gRoussac
|
1fb8ef823d
|
[-] BO : Fix bug #PSCFV-10937, bad escaping for var product_prices in prices.tpl
|
2013-11-06 11:50:52 +01:00 |
|
Jérôme Nadaud
|
29001b3392
|
Merge pull request #930 from PhpMadman/patch-3
[-] BO : Cart was not using order reference
|
2013-11-06 02:30:57 -08:00 |
|
PhpMadman
|
eac7fbb694
|
[-] BO : Cart was not using order reference, corrected syntax
|
2013-11-06 11:06:46 +01:00 |
|
Jérôme Nadaud
|
fa4b5e0b7d
|
Merge pull request #927 from djfm/loc
[*] LO : Added states to Spanish localization pack
|
2013-11-06 00:31:46 -08:00 |
|
Jérôme Nadaud
|
d30830f6fe
|
Merge pull request #932 from prestalab/patch-1
// FIX: tags with UTF-8 chars
|
2013-11-05 23:49:43 -08:00 |
|
PrestaLab
|
b2e5c6090d
|
Fixed tags with UTF-8 chars
Fixed error Tag->Name is not valid if tag in non latin chars
|
2013-11-05 23:33:44 -08:00 |
|
PhpMadman
|
2556a7bb68
|
[-] MO : Mailalert was not using order reference
|
2013-11-05 20:46:10 +01:00 |
|
PhpMadman
|
7226f33f90
|
[-] BO : Cart was not using order reference
|
2013-11-05 20:42:57 +01:00 |
|
Rémi Gaillard
|
d4253b9849
|
// small fix
|
2013-11-05 15:33:21 +01:00 |
|
fram
|
2b8d069cf9
|
[*] LO : Added states to Spanish localization pack
|
2013-11-05 12:06:31 +01:00 |
|
Rémi Gaillard
|
9817ef6840
|
// small fix on profiling
|
2013-11-05 11:54:22 +01:00 |
|
gRoussac
|
581645ce6d
|
[-) BO : Action is mandatory for a cart rule
|
2013-11-05 11:26: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 |
|
Damien Metzger
|
4c1ad83b18
|
// "Fixed" strict standard
|
2013-11-05 10:22:39 +01:00 |
|
gRoussac
|
26a43260c5
|
[-] CORE : invalid method name in displayAjax method of Controller action
|
2013-11-05 10:18:53 +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
|
0e54bf0f76
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-11-04 18:27:39 +01:00 |
|
Jerome Nadaud
|
12276f41fb
|
// Update image when updated
|
2013-11-04 18:26:24 +01:00 |
|