dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,850 Commits 9 Branches 19 Tags
5832ab3eb5d62a81b427ff5f7c8bdea7d94ec00a
Commit Graph

17850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard
5832ab3eb5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-08 11:40:58 +02:00
Rémi Gaillard
567321dd3d // clean cookie after logout 2013-08-08 11:39:36 +02:00
Damien Metzger
169c3fbc6b // Removed useless line 2013-08-08 11:24:20 +02:00
gRoussac
5b3dda1cfb Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-08 11:05:37 +02:00
gRoussac
1c80b5fdfe [-] BO : list of carriers should only contain the active one in AdminProducts 2013-08-08 11:05:09 +02:00
Damien Metzger
4709f4a3c0 [-] MO : fixed module upgrade with common version number 2013-08-08 11:03:22 +02:00
Damien Metzger
a9b44884f1 // Fixed upgrade of homeslider module 2013-08-08 10:47:03 +02:00
gRoussac
c31c2ca0e9 [-] MO: cover image issue with layered block on multishop, thanks @theginie 2013-08-08 10:46:22 +02:00
gRoussac
1bfa43fa8b [-] MO : My account column block should not display module icon in list 2013-08-08 10:38:39 +02:00
gRoussac
0f4562eb44 [*] MO : added manufactureres order by name, thanks@Jacky75 2013-08-08 10:24:05 +02:00
gRoussac
4abff03244 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-08 10:17:00 +02:00
gRoussac
d6ab0696e6 [-] BO : OrderSlip now correctly displays the order slip date, thanks @Jacky75 2013-08-08 10:16:41 +02:00
Damien Metzger
ff69638595 // removed kay navigation in carrier wizard 2013-08-08 09:38:52 +02:00
Damien Metzger
05946f2932 [-] MO : blocktopmenu should clear cache when adding a new subcategory 2013-08-08 09:35:19 +02:00
Damien Metzger
0550ad5135 // Fixed smarty parse error on live edit 2013-08-08 09:29:13 +02:00
gRoussac
f89e42a5c5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-07 18:12:41 +02:00
gRoussac
601bfa628b [-] FO :ProductSale::getBestSales() by modified date renders SQL error, thanks @SebSept 2013-08-07 18:10:39 +02:00
Vincent Augagneur
73f40a6cc6 //fixed carrier wizard typewatch 2013-08-07 17:29:44 +02:00
gRoussac
a1786b97b3 [-] FO : expiration date not displayed in email for downloadable product 2013-08-07 17:08:50 +02:00
gRoussac
5df213f5ae Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-07 15:06:50 +02:00
Rémi Gaillard
d916e65a14 // missing return 2013-08-07 13:56:12 +02:00
Rémi Gaillard
6ccf3e839d // change passwd in cookie after changed it 2013-08-07 13:51:18 +02:00
gRoussac
e43f0619ca Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-07 11:53:23 +02:00
gRoussac
82621c08ec [-] BO : Do not display root category bool if addrootcategory not in url 2013-08-07 11:51:48 +02:00
Gregory Roussac
d99a5a740e Merge pull request #638 from vinvin27/patch-1 
// parse error
 2013-08-07 02:51:21 -07:00
vinvin27
843989489d Update AdminPPreferencesController.php 
Parse error: syntax error, unexpected T_ARRAY, expecting ')' in /controllers/admin/AdminPPreferencesController.php on line 120
 2013-08-07 11:47:56 +02:00
Rémi Gaillard
e6a819e5dd // Fix double quote translations 2013-08-07 11:29:34 +02:00
gRoussac
ac21fa9808 [-] MO : Missing image in my account for MODULE WishList 2013-08-07 10:56:09 +02:00
Gregory Roussac
3213b5dffb Merge pull request #635 from cippest/development 
[-] BO : missing order lang in Mail::l for in_transit email
 2013-08-06 11:23:19 -07:00
cippest
f8efd7a329 [-] BO : Fix send e-mails updating tracking number 
Hi,
We've fixed some bugs parameters about the Send function of Mail class in the AdminOrdersController.php.

Regards,
Massimo.
 2013-08-06 19:51:16 +02:00
gRoussac
7089ce10ef // remove warnings in blockwishlist 2013-08-06 19:05:08 +02:00
Gregory Roussac
b1ea66d510 Merge pull request #528 from ldecoker/patch-7 
[-] FO : missing $tpl_dir shopping-cart.tpl pathes
 2013-08-06 09:57:36 -07:00
Gregory Roussac
bf355e934e Merge pull request #634 from PhpMadman/RefSort 
[*] FO : Sort by Product reference
 2013-08-06 09:13:06 -07:00
Vincent Augagneur
67b44b5f17 //fixed carrier bug and added typewatch plugin on range validation 2013-08-06 18:04:12 +02:00
Damien Metzger
bfa5bae702 // Fixed display of root category 2013-08-06 17:45:24 +02:00
Damien Metzger
5be8e169f5 // Fixed totally unexplicable behavior 2013-08-06 17:40:49 +02:00
Vincent Augagneur
ea5f4476a6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 16:56:05 +02:00
Vincent Augagneur
5ed75901fb //typo 2013-08-06 16:55:51 +02:00
Damien Metzger
2303677ebf // Rollback a modification in object model 2013-08-06 16:52:13 +02:00
Damien Metzger
a1cf8d462f // Keep remote file retrieval in the right order 2013-08-06 16:42:10 +02:00
Damien Metzger
b701acc8cf // Clean language pack retrieval 2013-08-06 16:15:30 +02:00
PhpMadman
e4a42ab2b1 Update AdminPPreferencesController.php 2013-08-06 16:08:09 +02:00
PhpMadman
d4270289c1 Update category-product-sort.tpl 2013-08-06 16:06:03 +02:00
Vincent Augagneur
bcaa625f4c //default language fix in carrier wizard 2013-08-06 16:05:36 +02:00
Damien Metzger
c8564fa6b2 // Quick CSS fix 2013-08-06 16:02:22 +02:00
Damien Metzger
d783160af0 // Updated installer 2013-08-06 15:53:59 +02:00
Jerome Nadaud
375fa451d8 [-] FO : FixBug No warning message when no carriers available from advanced stock management 2013-08-06 15:53:25 +02:00
Damien Metzger
38753716e2 // Hide "is root category" option outside multistore 2013-08-06 15:42:31 +02:00
PhpMadman
598a5b3188 [*] FO : Add reference sort to theme 2013-08-06 15:38:25 +02:00
PhpMadman
cd254f8795 [*] FO : Add reference sort to theme 2013-08-06 15:37:10 +02:00