Commit Graph

1829 Commits

Author SHA1 Message Date
vAugagneur
becee63434 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 10:30:38 +01:00
vAugagneur
9e342d5183 [-] BO : fixed bug #PSCFV-7575 - BO shipping price by zones ang weigth error js 2013-02-11 10:30:32 +01:00
Rémi Gaillard
ba11328cec [-] BO: Fix #PSCFV-7427 group id used for price computation on order edition 2013-02-08 15:02:15 +01:00
Damien Metzger
4ab7b7eff4 // Translations 2013-02-07 18:20:19 +01:00
Rémi Gaillard
76c80680a2 [-] BO: Forbid to add a pack into a pack 2013-02-06 20:10:59 +01:00
Rémi Gaillard
fbf48fadf8 [*] BO: Improvements on customer services - you are now able to create new threads for synced emails 2013-02-06 15:28:57 +01:00
Rémi Gaillard
9c31710092 [-] BO: Fix #PSCFV-6497 display of list when deleting customers 2013-02-05 11:27:17 +01:00
vAugagneur
4ef61eb8f8 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00
vAugagneur
b23aa76d6b Merge branch 'dispatch_modules' into development 2013-02-04 18:20:24 +01:00
vAugagneur
0de5c242ca [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
Rémi Gaillard
7bd44ca1b1 [-] BO: get the invoice prefix from the right shop 2013-02-04 15:11:29 +01:00
Rémi Gaillard
63014eda4b [-] BO: Fix #PSCFV-7576 2013-01-31 16:54:30 +01:00
Damien Metzger
77f854b836 // Fixed hook names 2013-01-30 16:03:37 +01:00
vAugagneur
b27b9337b2 [-] BO - fixed bug #PSCFV-6195 - Currency format not re-writing in product tab shipping 2013-01-24 18:26:29 +01:00
vAugagneur
bc203bfc3a [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
gRoussac
7d1e6d993d [-] BO : fix css for iframe of custom products when creating order in BO 2013-01-23 18:38:00 +01:00
gRoussac
a48d2668d3 [-] FO : Apply changes from commit 1.4.X 1d0d59845b5f9cb9333a89e60523ab41df076d89 no cache for POST queries 2013-01-23 15:48:15 +01:00
vAugagneur
4523f4c849 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
vAugagneur
177cf36fa6 //reduced informations block and added click to see more link 2013-01-16 11:07:29 +01:00
Damien Metzger
e48c0cfc67 // Fixed typo 2013-01-15 13:54:06 +01:00
vAugagneur
8e43f1e38f //recovered View my shop button 2013-01-14 17:59:18 +01:00
vAugagneur
5f490483d1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 17:44:54 +01:00
vAugagneur
cbb87e4bbc //clean duplicate css in BO 2013-01-14 17:44:34 +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
sLorenzini
6ca6a83412 [-] FO: fixed Css issue in BO - #PSCFV-6408 2013-01-10 17:18:17 +01:00
vAugagneur
796b02bb68 [-] BO : fixed bug #PSCFV-6536 indefined index in toolbar.tpl 2013-01-09 23:03:20 +01:00
vAugagneur
bb558446e8 [-] BO : bad initialization of context due to miss define of _PS_ADMIN_DIR_ in displayImage.php 2013-01-09 10:33:57 +01:00
Vincent Augagneur
1f9a3109b9 Merge pull request #150 from djfm/development
//Changed English strings using the translationsenglish module.
2013-01-04 08:06:15 -08:00
djfm
385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Rémi Gaillard
d7694b5900 [*] BO: Improve form of catalog price rules #PSCFV-6099 2013-01-04 15:50:13 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
2e90e12293 //Merge branch release 2013-01-02 09:56:20 +01:00
Damien Metzger
c4d8bff01c [+] BO : you can now choose if a voucher is displayed under the cart in the frontend 2012-12-27 18:04:16 +01:00
Gregory Roussac
3e9e765a5a [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00
Damien Metzger
96d6abe2af [-] BO : Fixed warning in helper #PSCFV-6183 2012-12-18 15:47:09 +01:00
Damien Metzger
1e7963ec12 // Typo in the name of an image 2012-12-14 17:14:01 +01:00
vAugagneur
c841ddfcf5 [-] 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
630b41ec71 [-] BO : added check on a key in the helper list #PSCFV-6137 2012-12-14 10:13:28 +01:00
Damien Metzger
ee19d3d62b // Cleaned modules call 2012-12-13 14:38:55 +01:00
Damien Metzger
2bf6b3a82e // Cleaned modules call 2012-12-13 13:35:33 +01:00
vAugagneur
c6f9d13800 [*] BO : moved sample csv file 2012-12-13 09:16:03 +01:00
vAugagneur
cd0eb0c6a4 [-] FO : fixed bug #PSCFV-5980 && added 'js=1' in tpl when string is in script tag 2012-12-12 17:38:31 +01:00
Vincent Augagneur
6445fea198 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
ed836e081c //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option 2012-12-12 14:37:15 +01:00
vAugagneur
768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Rémi Gaillard
4c026fe0fc [-] BO: don't display stock available if stock management is disabled #PSCFV-6029 2012-12-11 16:59:26 +01:00
Rémi Gaillard
7cd629b15b [-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885 2012-12-11 12:01:04 +01:00
vAugagneur
eb451604af [-] BO : fixed bug #PSCFV-5991 - CMS friendly URL does not automatically copied 2012-12-10 10:51:46 +01:00
vAugagneur
20187807e1 [-] BO : added import button on listing 2012-12-10 10:14:03 +01:00