 Rémi Gaillard
|
dec0cf5177
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2012-12-18 16:00:12 +01:00 |
|
|
vAugagneur
|
66f58dfbd9
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2012-12-18 16:00:20 +01:00 |
|
|
vAugagneur
|
9b0dbae730
|
[-] CORE : fixed bug #PSCFV-5116 Horizontal top menu cache
|
2012-12-18 16:00:10 +01:00 |
|
|
Rémi Gaillard
|
85b1127be2
|
// small change
|
2012-12-18 15:59:57 +01:00 |
|
|
Rémi Gaillard
|
d431802e7e
|
[-] Core: The emails can now be sent with amazon SES when logo is in png
|
2012-12-18 15:45:43 +01:00 |
|
|
vAugagneur
|
ef0eb49ba9
|
[-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes
|
2012-12-18 14:59:34 +01:00 |
|
|
Damien Metzger
|
270ae41d15
|
[-] BO : fixed weight and distance units validation
|
2012-12-18 14:40:58 +01:00 |
|
|
vAugagneur
|
3954d7381d
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2012-12-17 18:05:25 +01:00 |
|
|
vAugagneur
|
fde175ac4f
|
revert modif on product.js
|
2012-12-17 18:05:22 +01:00 |
|
|
Damien Metzger
|
12be2627f2
|
[-] FO : fixed multishipping crash when too many products and addresses
|
2012-12-17 16:27:47 +01:00 |
|
|
Rémi Gaillard
|
5b7069f0bf
|
[-] FO: Fix cache product features #PSCFV-6138
|
2012-12-17 15:52:52 +01:00 |
|
|
Damien Metzger
|
ffa72b0b93
|
[-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459
|
2012-12-17 15:49:40 +01:00 |
|
|
vAugagneur
|
1c181b7c20
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2012-12-17 15:26:00 +01:00 |
|
|
vAugagneur
|
e472ff7239
|
[-] FO : fixed loop redirect when pagination have 0 product
|
2012-12-17 15:25:56 +01:00 |
|
|
Rémi Gaillard
|
3a72d1676c
|
[-] BO: Fix #PSCFV-6172 don't htmlentities the cart rule name && increase size of name order_cart_rule field
|
2012-12-17 14:42:24 +01:00 |
|
|
Rémi Gaillard
|
3e89821b1d
|
[-] Core: Fix #PSCFV-6162 - can't add no tax for specific zip code or state
|
2012-12-17 12:29:29 +01:00 |
|
|
vAugagneur
|
3d35871fd5
|
//small fix in admin modules
|
2012-12-17 09:58:33 +01:00 |
|
|
vAugagneur
|
fff026ca7d
|
//display import button only on listing
|
2012-12-17 09:55:31 +01:00 |
|
|
vAugagneur
|
912971263b
|
[-] BO : fixed bug #PSCFV-5408 - Affect a new zone button for selected states in States doesn't work correctly
|
2012-12-14 16:12:25 +01:00 |
|
|
Damien Metzger
|
eb423f1a09
|
[-] BO : fixed duplicate code management on cart rules #PSCFV-6119
|
2012-12-14 09:48:16 +01:00 |
|
|
Damien Metzger
|
ec760c6eef
|
// Handle fatal error in modules (after an upgrade for example)
|
2012-12-13 19:06:10 +01:00 |
|
|
vAugagneur
|
28a3856bfa
|
//added check on field lenght in install and fix sql in upgrade
|
2012-12-13 16:26:38 +01:00 |
|
|
vAugagneur
|
1c27ae15f9
|
//order opc js fix
|
2012-12-13 14:55:26 +01:00 |
|
|
Damien Metzger
|
6e2ebf1c07
|
// Cleaned modules call
|
2012-12-13 14:38:55 +01:00 |
|
|
vAugagneur
|
7fe6b95a38
|
//rename upgrade file
|
2012-12-13 10:06:46 +01:00 |
|
|
vAugagneur
|
cb4f2bd889
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2012-12-13 09:41:32 +01:00 |
|
|
vAugagneur
|
003c9666c1
|
[-] FO : small js fix on gift checkbox update on mobile
|
2012-12-13 09:41:20 +01:00 |
|
|
Damien Metzger
|
8a8c674a95
|
// French translations
|
2012-12-13 09:32:04 +01:00 |
|
|
vAugagneur
|
cfa1359c87
|
[-] FO : small fix on mobile logo url
|
2012-12-13 09:30:55 +01:00 |
|
|
vAugagneur
|
06a3e4709b
|
[*] BO : moved sample csv file
|
2012-12-13 09:16:03 +01:00 |
|
|
Damien Metzger
|
f78abb14b9
|
// New user assistance in the installer
|
2012-12-12 20:34:13 +01:00 |
|
|
Rémi Gaillard
|
e0aa292a69
|
[-] BO: Fix catalog price rules creation with mysql strict mod #PSCFV-5916
|
2012-12-12 19:38:40 +01:00 |
|
|
Rémi Gaillard
|
91ba2bfa2e
|
// fix js arg missing for translations in javascript
|
2012-12-12 19:07:29 +01:00 |
|
|
vAugagneur
|
02f3c3c1cc
|
removed unused files
|
2012-12-12 19:00:57 +01:00 |
|
|
Vincent Augagneur
|
d31d54a65b
|
Merge pull request #87 from ivancasasempere/patch-1
[*] Modules : blocktopmenu css improvement
|
2012-12-12 09:59:48 -08:00 |
|
|
vAugagneur
|
35327e1792
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2012-12-12 18:43:15 +01:00 |
|
|
vAugagneur
|
198a48491a
|
//small fix
|
2012-12-12 18:43:11 +01:00 |
|
|
Rémi Gaillard
|
35a0c7c94c
|
[-] MO: Fix Wishlist controller with ssl #PSCFV-5943
|
2012-12-12 18:01:57 +01:00 |
|
|
vAugagneur
|
a100b1d220
|
[-] FO : fixed bug #PSCFV-5980 && added 'js=1' in tpl when string is in script tag
|
2012-12-12 17:38:31 +01:00 |
|
|
vAugagneur
|
b5037d4bfe
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2012-12-12 16:24:41 +01:00 |
|
|
vAugagneur
|
4471a1a140
|
//small fix #310dbaaf2492042953c5e65ffb7fa1c6afd0b0a8
|
2012-12-12 16:24:35 +01:00 |
|
|
Rémi Gaillard
|
87798d1193
|
// small fix
|
2012-12-12 16:18:48 +01:00 |
|
|
vAugagneur
|
f6b46f47c5
|
//added PS_MAIL_COLOR in upgrade
|
2012-12-12 16:01:32 +01:00 |
|
|
Vincent Augagneur
|
ebff913250
|
Merge pull request #69 from PrestaEdit/mails
[+] Project: add the possibility to change the default color (#db3484)
|
2012-12-12 06:59:04 -08:00 |
|
|
vAugagneur
|
39f108d79d
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2012-12-12 14:37:40 +01:00 |
|
|
vAugagneur
|
42f3587e8e
|
//remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option
|
2012-12-12 14:37:15 +01:00 |
|
|
Damien Metzger
|
6180cb1fa9
|
// And another
|
2012-12-12 14:33:54 +01:00 |
|
|
Rémi Gaillard
|
ed65ab64de
|
[-] BO: useSSL global does not exist anymore #PSCFV-6113
|
2012-12-12 14:33:42 +01:00 |
|
|
Damien Metzger
|
6532868e1d
|
// Fixed duplicated lines #PSCFV-6109
|
2012-12-12 14:31:46 +01:00 |
|
|
Damien Metzger
|
0f6b60a3af
|
// Merged 4 lignes of code in the Configuration class
|
2012-12-12 14:29:37 +01:00 |
|