 gRoussac
|
84c88dab65
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-07-02 14:55:28 +02:00 |
|
|
Francois Gaillard
|
b8bfdcd3f5
|
// .gitattributes files added
|
2013-07-02 14:53:58 +02:00 |
|
|
gRoussac
|
75942074d2
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-07-02 14:53:18 +02:00 |
|
|
gRoussac
|
9dfe65cb17
|
[-] BO : Fix bug #PSCFV-8666 COD module association no more deleted when restrition on other currency
|
2013-07-02 14:51:25 +02:00 |
|
|
Damien Metzger
|
25dc4e25ac
|
// Code cleaning
|
2013-07-02 11:48:48 +02:00 |
|
|
Damien Metzger
|
f204f80c99
|
// Improved profiling tool
|
2013-07-02 11:08:24 +02:00 |
|
|
Damien Metzger
|
d05968823e
|
// Try to fix warning
|
2013-07-02 10:46:46 +02:00 |
|
|
Vincent Augagneur
|
cab425e819
|
//remove useless css
|
2013-07-02 08:41:51 +02:00 |
|
|
Vincent Augagneur
|
0ff23eee9f
|
//miss to delete some files
|
2013-07-02 08:02:05 +02:00 |
|
|
gRoussac
|
312dabbc60
|
//parse error
|
2013-07-02 00:30:50 +02:00 |
|
|
gRoussac
|
6e3a2449e8
|
[-] INSTALLER : Fix SQL warnings when upgrading
|
2013-07-01 23:39:00 +02:00 |
|
|
gRoussac
|
f17b865214
|
(-] INSTALLER Remove errors during upgrade
|
2013-07-01 19:23:42 +02:00 |
|
|
gRoussac
|
508cc0bd1a
|
[-) CORE : Remove undefined constant in class declaration
|
2013-07-01 19:17:54 +02:00 |
|
|
gRoussac
|
41219ad258
|
[-] INSTALLLER : Remove seesion name based on base_uri
|
2013-07-01 19:01:49 +02:00 |
|
|
François Gaillard
|
1da44dbb7a
|
[-] Mobile : Bug fix - Order address template fixed
|
2013-07-01 16:52:16 +02:00 |
|
|
Vincent Augagneur
|
0c2aa996a2
|
//oups 😋
|
2013-07-01 16:48:25 +02:00 |
|
|
Vincent Augagneur
|
24db6b13c5
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-07-01 16:40:39 +02:00 |
|
|
Vincent Augagneur
|
a519f4a7cb
|
//small fix
|
2013-07-01 16:40:08 +02:00 |
|
|
Rémi Gaillard
|
c5fc26ed0b
|
// same for unregister hook
|
2013-07-01 16:30:53 +02:00 |
|
|
Rémi Gaillard
|
09359d011f
|
[-] MO: exec hook on hook registration #PSCFV-8977
|
2013-07-01 16:12:33 +02:00 |
|
|
gRoussac
|
0e0d8c58d0
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-07-01 15:42:10 +02:00 |
|
|
gRoussac
|
725c2221df
|
[-] INSTALLER : fix bug when updating add_new_tab not defined
|
2013-07-01 15:41:15 +02:00 |
|
|
Damien Metzger
|
d656297884
|
// Removed call to a deprecated file
|
2013-07-01 14:00:01 +02:00 |
|
|
Damien Metzger
|
006e8718f2
|
// Improved label of IETF language tag
|
2013-07-01 12:35:32 +02:00 |
|
|
Damien Metzger
|
56aab3c676
|
// Fixed references to a "conversion rate" that was in fact the "exchange rate"
|
2013-07-01 12:14:50 +02:00 |
|
|
gRoussac
|
f824b537cf
|
[-] BO : Fix bug #PSCFV-8619 update order weight when modifying products
|
2013-07-01 11:32:09 +02:00 |
|
|
gRoussac
|
c90e574cb8
|
// Remove additionnal files from gitignore
|
2013-07-01 11:28:00 +02:00 |
|
|
Staging
|
68cb702350
|
[-] Mobile : Bug fix : Authentication & phone number
|
2013-07-01 11:08:14 +02:00 |
|
|
Vincent Augagneur
|
1657db9743
|
[-] MO : fixed bug #PSCFV-5724 - 1.5.2.0 cms block error when adding more than one column to the categories block in the footer
|
2013-07-01 11:02:32 +02:00 |
|
|
Vincent Augagneur
|
38c4ea2775
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-07-01 10:11:31 +02:00 |
|
|
Vincent Augagneur
|
d6dcf7058f
|
[-] BO : fixed bug #PSCFV-9622
|
2013-07-01 10:11:13 +02:00 |
|
|
gRoussac
|
1eb992f542
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-06-30 19:46:31 +02:00 |
|
|
gRoussac
|
127b046c0e
|
//remove warning
|
2013-06-30 19:46:04 +02:00 |
|
|
gRoussac
|
85da11181d
|
//remove warning
|
2013-06-30 19:42:07 +02:00 |
|
|
PrestaEdit
|
679ee351df
|
[-] BO: remove old icon into New Version block
|
2013-06-29 16:28:03 +02:00 |
|
|
Kevin Granger
|
d583cf25d2
|
// Bootstrap3 - Cart_rules > information.tpl + header + Font Awesome + Switch
|
2013-06-28 19:35:32 +02:00 |
|
|
Damien Metzger
|
3d85e81c3d
|
// Oops, removing a block is a sure way to optimize...
|
2013-06-28 18:52:08 +02:00 |
|
|
Fabio Chelly
|
901d695e32
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-06-28 18:35:58 +02:00 |
|
|
Damien Metzger
|
d574f92411
|
[*] FO : added smarty cache to blockspecials
|
2013-06-28 18:27:19 +02:00 |
|
|
Fabio Chelly
|
668181d8ec
|
Newsletter field is always shown in create account form even if blocknewsletter module is disabled
|
2013-06-28 18:11:44 +02:00 |
|
|
Fabio Chelly
|
ae2491c402
|
Prevent email to be stored twice (1 in customer newsletter and 1 in module newsletter) by removing email in newsletter table when creating a new account
#PNM-1419
|
2013-06-28 18:10:13 +02:00 |
|
|
gRoussac
|
349a10e2a9
|
// fix warnings
|
2013-06-28 17:58:04 +02:00 |
|
|
Damien Metzger
|
09bbff8737
|
[*] FO : added smarty cache on blockbestsellers
|
2013-06-28 17:42:43 +02:00 |
|
|
Damien Metzger
|
583346bbb7
|
[*] FO : added smarty cache on homefeatured module
|
2013-06-28 17:19:06 +02:00 |
|
|
Damien Metzger
|
a8d96ed0c0
|
// Removed useless feature
|
2013-06-28 16:38:08 +02:00 |
|
|
Damien Metzger
|
a387ff5e2f
|
[-] FO : added smarty cache to blockcms
|
2013-06-28 16:20:04 +02:00 |
|
|
Damien Metzger
|
8acf308639
|
[*] FO : added smarty cache on blocknewproducts
|
2013-06-28 15:17:53 +02:00 |
|
|
Damien Metzger
|
42f8a0a67a
|
[*] BO : improved unicode characters replacement in URLs
|
2013-06-28 12:19:20 +02:00 |
|
|
Vincent Augagneur
|
97370946d2
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-06-28 11:06:13 +02:00 |
|
|
Vincent Augagneur
|
dfc7456980
|
//replace some escape:'html' by addslashes in .tpl with javascript
|
2013-06-28 11:06:08 +02:00 |
|