 François Gaillard
|
b9dde1d50e
|
Merge branch 'development' of http://github.com/PrestaShop/PrestaShop into development
|
2013-01-16 18:47:39 +01:00 |
|
|
François Gaillard
|
338ba1ce85
|
// AdminHomeController, syntax changed
|
2013-01-16 18:47:29 +01:00 |
|
|
vAugagneur
|
94a45b0572
|
[-] BO : fixed bug #PSCFV-5601 - AddressFormat wrongly forbid the 'other' field from the Address to be part of the address format
|
2013-01-16 18:24:11 +01:00 |
|
|
vAugagneur
|
51a067c34c
|
[-] FO : fixed bug #PSCFV-6533 - CMS categories: This page does not exist.
|
2013-01-16 10:47:00 +01:00 |
|
|
vAugagneur
|
f7124f6cee
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-16 10:36:29 +01:00 |
|
|
vAugagneur
|
46aa9eeca7
|
[-] BO : fixed bug #PSCFV-6623 - fixed Parse error
|
2013-01-16 10:36:24 +01:00 |
|
|
Damien Metzger
|
c30f7b48e0
|
[-] FO : fixed voucher highlighting in the cart #PSCFV-6422
|
2013-01-15 20:08:38 +01:00 |
|
|
Rémi Gaillard
|
e5e62ba00b
|
[-] BO: Fix #PSCFV-6616 id_shop should be loaded from cart when no order is created on Admin Carts
|
2013-01-15 19:31:21 +01:00 |
|
|
vAugagneur
|
61b3135f6b
|
[-] BO : fixed bug #PSCFV-6623 - multistore edit greek encoding
|
2013-01-15 17:15:30 +01:00 |
|
|
Damien Metzger
|
9f99ec01b5
|
[-] FO : fixed shipping number in e-mail #PSCFV-6584
|
2013-01-15 13:56:39 +01:00 |
|
|
Damien Metzger
|
e48c0cfc67
|
// Fixed typo
|
2013-01-15 13:54:06 +01:00 |
|
|
Damien Metzger
|
4efaad145f
|
[+] BO : Added customer language on the customer page
|
2013-01-14 16:45:21 +01:00 |
|
|
vAugagneur
|
61371b5b4c
|
//BO more compliant with 1024x768
|
2013-01-14 14:24:05 +01:00 |
|
|
vAugagneur
|
74774be65e
|
[-] FO : fixed bug #PSCFV-5569 - Trying to get property of non-object in SitemapController
|
2013-01-10 09:31:46 +01:00 |
|
|
Rémi Gaillard
|
c740199e4f
|
[-] BO: Disallow advanced stock management if the product become a pa
|
2013-01-09 19:09:49 +01:00 |
|
|
gRoussac
|
015037c65f
|
[-] FO : fix #PSCFV-6165 cart update when inactive country in old address
|
2013-01-09 18:23:40 +01:00 |
|
|
gRoussac
|
9771af9e28
|
[-] FO : Bad html entities for alert of order-address.js
|
2013-01-09 17:09:15 +01:00 |
|
|
Rémi Gaillard
|
3d6b3d2cb0
|
// Fix PHP warning
|
2013-01-09 16:55:28 +01:00 |
|
|
vAugagneur
|
66974a05e0
|
[-] BO : fixed bug #PSCFV-4961 - Strange behavior when reordering categories
|
2013-01-09 13:44:19 +01:00 |
|
|
vAugagneur
|
b64098f3f2
|
//small fix part 2
|
2013-01-09 12:06:00 +01:00 |
|
|
vAugagneur
|
26055c26e7
|
//small fix
|
2013-01-09 11:58:48 +01:00 |
|
|
vAugagneur
|
58100276a6
|
[-] BO : fixed bug #PSCFV-4668 - added check if module folder is writable before upgrade it
|
2013-01-09 11:37:02 +01:00 |
|
|
Rémi Gaillard
|
2dac490089
|
// small fix
|
2013-01-09 10:28:28 +01:00 |
|
|
vAugagneur
|
857b8c2009
|
[-] CORE : fixed bug #PSCFV-4523 - Static _PS_DEFAULT_CUSTOMER_GROUP_ is still use in code even if deprecated 1.5.0.1
|
2013-01-09 10:26:16 +01:00 |
|
|
Gregory Roussac
|
66ddc0c809
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-07 18:02:25 +01:00 |
|
|
gRoussac
|
4b104f2358
|
[-] FO : Fix Exception when invoice address is empty in OPC
|
2013-01-07 18:02:01 +01:00 |
|
|
vAugagneur
|
f37758605c
|
[-] BO : fixed bug #PSCFV-4925 - duplicate subject in SAV
|
2013-01-07 17:55:17 +01:00 |
|
|
gRoussac
|
6a7795a92f
|
[-] FO : Fix #PSCFV-5544 same alias is no more rejected in OPC
|
2013-01-07 16:54:42 +01:00 |
|
|
vAugagneur
|
9615de5dca
|
//merge pull request
|
2013-01-07 10:15:47 +01:00 |
|
|
djfm
|
385c593129
|
//Changed English strings using the translationsenglish module.
|
2013-01-04 16:58:58 +01:00 |
|
|
Rémi Gaillard
|
507309ddf5
|
[-] BO: Fix #PSCFV-6386 recyclable should be init to 0 on BO orders
|
2013-01-04 15:06:07 +01:00 |
|
|
Rémi Gaillard
|
3fbd7dc55c
|
[-] BO: Fix #PSCFV-6120 display of shipping price on BO order summary detail with freeshipping
|
2013-01-04 14:51:01 +01:00 |
|
|
François Gaillard
|
064ba453e6
|
// Welcome 2013
|
2013-01-04 11:19:03 +01:00 |
|
|
root
|
ce24ce6d1b
|
[-] FO : Fix #PSCFV-6307 correct invoice address in OPC
|
2013-01-03 18:35:01 +01:00 |
|
|
Gregory Roussac
|
9513a9e599
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-03 15:20:08 +01:00 |
|
|
gRoussac
|
5c80535287
|
[-] FO : Fix again #PSCFV-6209 #PSCFV-5686 no required phone
|
2013-01-03 15:19:04 +01:00 |
|
|
vAugagneur
|
cc32366077
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-03 15:18:06 +01:00 |
|
|
vAugagneur
|
8d7196daf3
|
[-] BO : fixed import images
|
2013-01-03 15:18:00 +01:00 |
|
|
Rémi Gaillard
|
df405abfe9
|
[-] BO: Fix #PSCFV-6118 display of product image for git on BackOffice orders
|
2013-01-03 11:38:39 +01:00 |
|
|
vAugagneur
|
a5ab1d5bc2
|
//small fix when disabled language with bulk action
|
2013-01-02 17:47:49 +01:00 |
|
|
vAugagneur
|
13ad25f331
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-02 17:09:44 +01:00 |
|
|
vAugagneur
|
f7754045fb
|
[-] BO : fixed bug #PSCFV-6130 - Wrong currency in product specific prices administration
|
2013-01-02 17:09:39 +01:00 |
|
|
Rémi Gaillard
|
301dc491b4
|
[-] BO: Fix #PSCFV-6415 php notice
|
2013-01-02 16:21:54 +01:00 |
|
|
vAugagneur
|
a232288ee1
|
//retro compat smarty variable name 'onr_phone_at_least'
|
2013-01-02 11:53:43 +01:00 |
|
|
vAugagneur
|
2e90e12293
|
//Merge branch release
|
2013-01-02 09:56:20 +01:00 |
|
|
Rémi Gaillard
|
4d76877ec6
|
[-] FO: Fix PHP warning on category controller
|
2012-12-31 10:04:53 +01:00 |
|
|
vAugagneur
|
ef46d41800
|
//Merge controllers/admin/AdminTranslationsController.php
|
2012-12-28 10:23:37 +01:00 |
|
|
vAugagneur
|
aae9aa82c4
|
//added methode to write default content in index.php file && added check in translation pack import
|
2012-12-28 10:18:14 +01:00 |
|
|
vAugagneur
|
a35469768f
|
//added translation
|
2012-12-28 09:27:12 +01:00 |
|
|
vAugagneur
|
d4ba087158
|
//added check in translation pack import
|
2012-12-28 09:19:54 +01:00 |
|