dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,608 Commits 9 Branches 19 Tags
a07733fcec16f471ec447789631804a0a33b94de
Commit Graph

18608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Metzger e7c860a3dd Merge pull request #792 from djfm/release 
// remove backup files
 2013-10-03 08:09:41 -07:00
djfm 8580dd0b39 // remove backup files 2013-10-03 15:02:16 +00:00
Damien Metzger 9e837d1ecc // No more translation packs in the ZIP (except for FR and EN), only remotes! 2013-10-03 16:35:54 +02:00
Gregory Roussac cfd70bf660 Merge pull request #789 from PhpMadman/patch-2 
[*] BO: wrong description on getIdOrderCarrier
 2013-10-03 07:30:14 -07:00
Rémi Gaillard 0662cd3b12 // don't need to clear smarty cache while installation 2013-10-03 16:29:31 +02:00
Damien Metzger 6c4a69ea0b Merge pull request #790 from djfm/release 
// added tab translations to Bengali installer
 2013-10-03 07:26:29 -07:00
djfm b92c9869a4 // added tab translations to Bengali installer 2013-10-03 14:20:08 +00:00
gRoussac 992cc6b437 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-10-03 16:10:37 +02:00
gRoussac 7f32e8d187 [-] BO : Fix bug #PSCFV-10064, could not import feature in multilang, thanks @E.Bigfoot 2013-10-03 16:09:43 +02:00
gRoussac cafe2ed9d2 [-] BO : Fix bug #PSCFV-10064, could not import deature in multilang, thanks @E.Bigfoot 2013-10-03 16:08:53 +02:00
PhpMadman e38d808a85 [*] BO: wrong description on getIdOrderCarrier 2013-10-03 15:51:27 +02:00
Gregory Roussac 86631202df Merge pull request #788 from PhpMadman/patch-1 
[*] BO: missing align on order for product warehouse
 2013-10-03 06:37:58 -07:00
Fabio Chelly d601844e82 Merge remote-tracking branch 'origin/development' into development 2013-10-03 15:32:27 +02:00
Fabio Chelly ea57b3fdd1 [-] MO watermark: original pictures are now protected through htaccess 
#PNM-109
 2013-10-03 15:32:10 +02:00
PhpMadman f979cbef57 [*] BO: missing align on order for product warehouse 2013-10-03 15:26:09 +02:00
gRoussac 8b2215eec5 // remove warning 2013-10-03 15:02:48 +02:00
gRoussac 0f288583ca [-] BO : Remove dead code in AdminImport 2013-10-03 14:57:03 +02:00
Gregory Roussac 8762c310b9 Merge pull request #787 from tucoinfo/development 
[*] FO : add variable $nofollow to mobile theme header.tpl
 2013-10-03 05:02:01 -07:00
Damien Metzger 6e0c3e1aa2 // addFeatureValueImport partial fix 2013-10-03 12:24:35 +02:00
tucoinfo 8f09d49ffc [*] FO : add variable $nofollow to mobile theme header.tpl 
Copied from normal theme which already manages the NoFollow variable
 2013-10-03 12:19:10 +02:00
Jerome Nadaud 3585bf33c8 // Fix supply order change state save button 2013-10-03 11:49:16 +02:00
gRoussac 6610bd2067 [-] BO : Could noty save ImportMatchs 2013-10-03 11:15:03 +02:00
Jerome Nadaud 43a60f1b57 [-] BO : FixBug #PSCFV-9044 - Missing state in new order, and now you can edit customer addresses 2013-10-03 11:06:08 +02:00
Rémi Gaillard f2e39488b6 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-10-03 10:33:58 +02:00
Rémi Gaillard e190c8df9f // small fix on import 2013-10-03 10:33:43 +02:00
Vincent Augagneur d1956572a5 //small fix on carrier wizard 2013-10-03 10:29:40 +02:00
Gregory Roussac ca1bc3daa8 Merge pull request #786 from kpodemski/patch-6 
[-] CORE : Increasing the length of link_rewrite & name in Category.php
 2013-10-03 01:24:22 -07:00
Krystian Podemski d87c816038 [*] CORE : Increasing the length of link_rewrite & name in Category.php 
In database this fields have varchar(128) so let's give the user full size of fields
 2013-10-03 10:20:45 +02:00
Gregory Roussac 3b75dd6785 Merge pull request #785 from djfm/pstw 
[*] TR : Traditional Chines Installer
 2013-10-03 00:54:48 -07:00
Jerome Nadaud 89d86793b0 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-10-03 09:12:01 +02:00
Jerome Nadaud 33b5971a7a [-] BO : FixBug #PSCFV-10558 - Invalid HTML markup. 2013-10-03 09:11:26 +02:00
djfm 711f5b0bdf [+] LO : Completed Traditional Chinese Installer 2013-10-03 06:57:53 +00:00
djfm 4668d8ffa2 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into pstw 2013-10-03 06:56:08 +00:00
gRoussac e9a3c98af9 [-] BO : Fix bug #PSCFV-8389 duplicates is SpecificPrice table 2013-10-02 18:57:45 +02:00
gRoussac da48cea96e [-] BO : AdminImport, tables are not truncated 2013-10-02 17:54:48 +02:00
Gregory Roussac a40356d21c Merge pull request #784 from djfm/release 
// updated native translation packs
 2013-10-02 08:50:29 -07:00
djfm 3a0081912d // updated native translation packs 2013-10-02 15:37:57 +00:00
gRoussac a027dbd061 [*] BO : Add category id in AdminSpecificPriceRule 2013-10-02 17:00:20 +02:00
Gregory Roussac 3d1d178bba Merge pull request #783 from ellisium/upper 
[-] CORE : CART::BOTH should be Cart::Both
 2013-10-02 16:35:37 +02:00
Gregory Roussac 4bb4199f5a Merge pull request #783 from ellisium/upper 
[-] CORE : CART::BOTH should be Cart::Both
 2013-10-02 07:34:00 -07:00
Eric Le Lay 3e0c5e71f4 classname uppercase issue 2013-10-02 16:28:45 +02:00
gRoussac fe7035aae9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-10-02 15:48:44 +02:00
gRoussac 96be4068f5 // norms 2013-10-02 15:48:29 +02:00
Damien Metzger 250a9f17a2 [-] BO : managed decimal format in BO orders 2013-10-02 15:47:21 +02:00
gRoussac bf6a0e0077 [-] BO : Fix bug #PSCFV-5060 could not import supplier_combinations in combinations import 2013-10-02 15:46:11 +02:00
Damien Metzger 6974a88b59 Merge pull request #782 from 202-ecommerce/development 
[*] FO : Added new Maintenance Hook
 2013-10-02 06:07:42 -07:00
Rémi Gaillard f4cadbdfd6 Merge pull request #770 from urecheatu007/development 
[-] LO: updated localization pack for Romania / romanian - added states
 2013-10-02 05:47:17 -07:00
thoma202 1ccc25f56c Merge branch 'development' of github.com:202-ecommerce/PrestaShop into development 2013-10-02 14:38:44 +02:00
gRoussac c4e549db13 [-] BO : Fix #PSCFV-6482 could not import tags in deiffrent languages 2013-10-02 14:20:27 +02:00
Damien Metzger a876b13c1c [-] BO : fixed currency format on order creation 2013-10-02 12:10:54 +02:00