 djfm
|
30624fabd2
|
Merge branch 'bootstrap' of https://github.com/djfm/PrestaShop into bootstrap
|
2013-11-07 12:27:58 +00:00 |
|
|
djfm
|
598034efb4
|
// English
|
2013-11-07 12:27:48 +00:00 |
|
|
djfm
|
8cb761078b
|
// English
|
2013-11-07 12:26:55 +00:00 |
|
|
gRoussac
|
91cde1ab3a
|
[-] BO : getCMSPages to associated shop in cmscontroller
|
2013-11-07 12:09:58 +01:00 |
|
|
djfm
|
f83c50b264
|
// one is one
|
2013-11-07 11:08:15 +00:00 |
|
|
Vincent Augagneur
|
9e76f82fb5
|
//merge
|
2013-11-07 12:06:58 +01:00 |
|
|
Vincent Augagneur
|
3c31f1a07f
|
//dashconfig errors return
|
2013-11-07 12:05:03 +01:00 |
|
|
gRoussac
|
e6f9f806bf
|
[-] FO : Fix bug #PSCFV-10892, getCMSPages by id_shop thnaks @jd440
|
2013-11-07 12:03:35 +01:00 |
|
|
djfm
|
3af230118b
|
// English
|
2013-11-07 10:27:50 +00:00 |
|
|
gRoussac
|
fc4a660f76
|
[-] BO : Fix bug #PSCFV-10666 product_supllier currency set to 0
|
2013-11-07 11:24:32 +01:00 |
|
|
Jerome Nadaud
|
c7249bcc84
|
// Done in 1.5.6.1
|
2013-11-07 11:05:39 +01:00 |
|
|
djfm
|
8ef9064355
|
Merge branch 'bootstrap' of https://github.com/djfm/PrestaShop into bootstrap
|
2013-11-07 10:02:24 +00:00 |
|
|
djfm
|
3d22303b90
|
// sprintf
|
2013-11-07 10:01:10 +00:00 |
|
|
Jerome Nadaud
|
f3147b4e57
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-11-07 09:47:47 +01:00 |
|
|
PhpMadman
|
2f1a82628c
|
// Fixes "Notice: Undefined index: nb_results in"
|
2013-11-07 09:00:00 +01:00 |
|
|
Kevin Granger
|
866e7f831b
|
// fixs highlight search
|
2013-11-06 19:26:22 +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 |
|
|
Kevin Granger
|
93717e910b
|
// Repairs sake of performance on tables with many lines.
|
2013-11-06 18:15:17 +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 |
|
|
djfm
|
1aadb10fb2
|
// English emails
|
2013-11-06 16:20:19 +00: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 |
|
|
Kevin Granger
|
df865eb827
|
Merge pull request #936 from TMMeilleur/bootstrap
// improved scss variables
|
2013-11-06 07:00:31 -08:00 |
|
|
Jerome Nadaud
|
616cc91eb2
|
// Fix bug JQuery on handler
|
2013-11-06 15:49:44 +01:00 |
|
|
Jerome Nadaud
|
56230a1f53
|
// Live is deprecated in jquery 1.9
|
2013-11-06 15:34:46 +01:00 |
|
|
Jerome Nadaud
|
7895f8643e
|
// Fix missing page header in combinations generator
|
2013-11-06 14:42:56 +01: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 |
|
|
TMMeilleur
|
211c36c7a3
|
improved scss variables
|
2013-11-06 15:41:00 +02:00 |
|
|
Jerome Nadaud
|
fcb225ac5a
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-06 12:19:15 +01:00 |
|
|
Jerome Nadaud
|
0c1b77b3da
|
// Fix Combinations list actions button problem
|
2013-11-06 12:18:52 +01: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 |
|
|
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 |
|
|
Vincent Augagneur
|
a890410a64
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-06 10:57:02 +01:00 |
|
|
Vincent Augagneur
|
c16c239953
|
//typo
|
2013-11-06 10:56:56 +01: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 |
|
|
Jérôme Nadaud
|
54db0b705c
|
Merge pull request #923 from PrestaEdit/1.6.x-fancybox
//remove unnecessary addCSS (fancybox)
|
2013-11-06 00:31:57 -08: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
|
1dd919addf
|
// no need mobile version with responsive :)
|
2013-11-05 19:15:24 +01:00 |
|