 Raphaël Malié
|
bdceac5bb2
|
Fix Collection->sqlGroupBy()
|
2013-01-04 14:28:49 +01:00 |
|
|
vAugagneur
|
638bd51980
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-04 11:45:25 +01:00 |
|
|
vAugagneur
|
b725fd2d4a
|
//small refacto
|
2013-01-04 11:45:17 +01:00 |
|
|
Francois Gaillard
|
8baf87eef5
|
// Welcome 2013
|
2013-01-04 11:19:03 +01:00 |
|
|
Gregory Roussac
|
c339f585d0
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-03 18:43:14 +01:00 |
|
|
root
|
76e03d9d38
|
[-] FO : Fix #PSCFV-6307 correct invoice address in OPC
|
2013-01-03 18:35:01 +01:00 |
|
|
Rémi Gaillard
|
8bb41fb5f8
|
[-] BO: override the compile check to true for smarty in the BackOffice
|
2013-01-03 17:49:04 +01:00 |
|
|
Rémi Gaillard
|
2167904c87
|
[-] MO: Fix blockviewd for non identified customers #PSCFV-6042
|
2013-01-03 17:25:56 +01:00 |
|
|
Rémi Gaillard
|
ed97ed5698
|
[-] Core: Fix #PSCFV-5912 price computation on cart with multiple product without combinations
|
2013-01-03 16:44:10 +01:00 |
|
|
Gregory Roussac
|
29f8ad0a32
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-03 15:20:08 +01:00 |
|
|
gRoussac
|
88cd7ce1f4
|
[-] FO : Fix again #PSCFV-6209 #PSCFV-5686 no required phone
|
2013-01-03 15:19:04 +01:00 |
|
|
vAugagneur
|
5703e67c96
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-03 15:18:06 +01:00 |
|
|
vAugagneur
|
707340b665
|
[-] BO : fixed import images
|
2013-01-03 15:18:00 +01:00 |
|
|
Rémi Gaillard
|
5bb2856692
|
[-] FO: Fix #PSCFV-6159 order way of best sales
|
2013-01-03 12:08:29 +01:00 |
|
|
Rémi Gaillard
|
0229dad1f6
|
[-] BO: Fix #PSCFV-6118 display of product image for git on BackOffice orders
|
2013-01-03 11:38:39 +01:00 |
|
|
Gregory Roussac
|
b1d0ab0eb5
|
// forgot delete
|
2013-01-03 11:11:16 +01:00 |
|
|
Gregory Roussac
|
eb8f89f265
|
[*] Installer : Lower memory for update_order_messages.php
|
2013-01-03 10:44:11 +01:00 |
|
|
vAugagneur
|
f4fac3d123
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-02 17:48:07 +01:00 |
|
|
vAugagneur
|
f9c12ad564
|
//small fix when disabled language with bulk action
|
2013-01-02 17:47:49 +01:00 |
|
|
Vincent Augagneur
|
d464c9cda5
|
Merge pull request #136 from PrestaEdit/patch-3
//remove WAHOU
|
2013-01-02 08:18:24 -08:00 |
|
|
vAugagneur
|
9cdd7c8a0d
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-02 17:09:44 +01:00 |
|
|
vAugagneur
|
dd49bfb464
|
[-] BO : fixed bug #PSCFV-6130 - Wrong currency in product specific prices administration
|
2013-01-02 17:09:39 +01:00 |
|
|
PrestaEdit
|
06716c841b
|
[-] FO: remove WAHOU
|
2013-01-02 17:06:24 +01:00 |
|
|
Rémi Gaillard
|
f33a0d2f9f
|
[-] BO: Fix #PSCFV-6394 price/weight/unit_price reduction impact on combinations form
|
2013-01-02 16:48:30 +01:00 |
|
|
Rémi Gaillard
|
1900700f1b
|
[-] BO: Fix #PSCFV-6415 php notice
|
2013-01-02 16:21:54 +01:00 |
|
|
vAugagneur
|
f0f50db926
|
[-] FO : fixed bug #PSCFV-6411 Friendly URL on prices-drop for page 2 doesn't work
|
2013-01-02 14:40:35 +01:00 |
|
|
Damien Metzger
|
bdc421b645
|
// Changelog, readme and install_version.php
|
2013-01-02 12:01:12 +01:00 |
|
|
Damien Metzger
|
d8feb5dba8
|
// Fix upgrade
|
2013-01-02 12:00:57 +01:00 |
|
|
vAugagneur
|
fc7ea8ef14
|
//retro compat smarty variable name 'onr_phone_at_least'
|
2013-01-02 11:53:43 +01:00 |
|
|
vAugagneur
|
a4eb2cc7a9
|
//Merge branch release
|
2013-01-02 09:56:20 +01:00 |
|
|
Rémi Gaillard
|
2420fff747
|
// oups....
|
2012-12-31 12:20:26 +01:00 |
|
|
Rémi Gaillard
|
1e03d017ad
|
// small fix
|
2012-12-31 12:17:42 +01:00 |
|
|
Rémi Gaillard
|
2688e97145
|
[-] FO: Fix retrocompatibility for modules and old themes
|
2012-12-31 12:06:28 +01:00 |
|
|
Rémi Gaillard
|
a76d05b650
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2012-12-31 12:03:54 +01:00 |
|
|
Damien Metzger
|
31859f6e6f
|
// Just to be sure...
|
2012-12-31 12:00:29 +01:00 |
|
|
Rémi Gaillard
|
b28d561e4b
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2012-12-31 11:54:12 +01:00 |
|
|
Damien Metzger
|
6c00cf69e0
|
[-] BO : fixed accentuated URLs in products
|
2012-12-31 10:22:53 +01:00 |
|
|
Rémi Gaillard
|
8b44ef218b
|
[-] FO: Fix PHP warning on category controller
|
2012-12-31 10:04:53 +01:00 |
|
|
Damien Metzger
|
68dbfcbfb0
|
Merge pull request #127 from PrestaEdit/Patch-#002
[-] Project: Fix bug when you want to upload (and resize) an image
|
2012-12-31 00:51:37 -08:00 |
|
|
Damien Metzger
|
0c6b1aaf77
|
// Missing part of a fix
|
2012-12-31 09:45:10 +01:00 |
|
|
Damien Metzger
|
b83b0215a0
|
[-] Installer : mysql text cannot have a default value #PSCFV-6395
|
2012-12-31 09:42:07 +01:00 |
|
|
Rémi Gaillard
|
0fa343bafd
|
[-] Installer: Fix #PSCFV-6392 redirect_type was missing on upgrade
|
2012-12-31 09:35:00 +01:00 |
|
|
PrestaEdit
|
80f3012345
|
[-] Project: Fix bug when you want to upload (and resize) an image
|
2012-12-30 20:14:51 +01:00 |
|
|
vAugagneur
|
a82cb7a8f4
|
//CHANGELOG
|
2012-12-28 16:14:42 +01:00 |
|
|
Rémi Gaillard
|
5e367744b6
|
[*] Core: Log the exceptions in a file #PSCFV-6334
|
2012-12-28 16:12:28 +01:00 |
|
|
vAugagneur
|
2e38587070
|
//small fix in upgrade
|
2012-12-28 16:08:21 +01:00 |
|
|
vAugagneur
|
a5568e8196
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2012-12-28 10:23:52 +01:00 |
|
|
vAugagneur
|
289a203bce
|
//Merge controllers/admin/AdminTranslationsController.php
|
2012-12-28 10:23:37 +01:00 |
|
|
vAugagneur
|
e8920c859d
|
//added methode to write default content in index.php file && added check in translation pack import
|
2012-12-28 10:18:14 +01:00 |
|
|
Damien Metzger
|
7bebdb5eb5
|
// Fixed deleteDirectory function (is_dir is cached and must not be used, because use the result of scandir)
|
2012-12-28 09:47:09 +01:00 |
|