dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,926 Commits 9 Branches 19 Tags
e448ac8de5d59fdb697dfe071fdf4eabb53b6aaa
Commit Graph
20926 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jerome Nadaud 309f4333a7 // Supply orders bootstraping 2013-10-03 14:13:15 +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 6059ad163b // Fix supply order state change save button 2013-10-03 11:51:08 +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
Damien Metzger e82f0feacf // Fixed customer tab 2013-10-03 09:52:25 +02: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
Jerome Nadaud 90b203fde3 // Stock instant bootstraping 2013-10-02 18:59:34 +02:00
Jerome Nadaud 75771e0723 // Supply order bootstraping 2013-10-02 18:59:21 +02:00
Jerome Nadaud f891f64cc4 // Stock cover bootstraping 2013-10-02 18:58:47 +02:00
gRoussac e9a3c98af9 [-] BO : Fix bug #PSCFV-8389 duplicates is SpecificPrice table 2013-10-02 18:57:45 +02:00
Damien Metzger 3cfe76ec0c // Fixed mean age 2013-10-02 18:10:51 +02:00
gRoussac da48cea96e [-] BO : AdminImport, tables are not truncated 2013-10-02 17:54:48 +02:00
Jerome Nadaud b472aaed96 // Fix Stock Cover select submit 2013-10-02 17:53:56 +02:00
Jerome Nadaud c88ea275ab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 17:50:50 +02:00
Jerome Nadaud 2a984186a9 // Fix output for ajax content 2013-10-02 17:50:39 +02:00
Gregory Roussac a40356d21c Merge pull request #784 from djfm/release 
// updated native translation packs
 2013-10-02 08:50:29 -07:00
Kevin Granger 19af1cfda5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 17:39:03 +02:00
Kevin Granger f168dd7c50 // list icon backward compat 2013-10-02 17:38:53 +02:00
djfm 3a0081912d // updated native translation packs 2013-10-02 15:37:57 +00:00
Jerome Nadaud dc06ef9c6d // Stock movement fix export button on select filter 2013-10-02 17:09:31 +02:00
Jerome Nadaud 81b9c01824 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 17:08:39 +02:00
Jerome Nadaud 7454d75fb9 // List simple header bootstraping 2013-10-02 17:08:28 +02:00
Damien Metzger 84a251a575 [*] BO : you can noww override header and footer for each controller 2013-10-02 17:04:18 +02:00
gRoussac a027dbd061 [*] BO : Add category id in AdminSpecificPriceRule 2013-10-02 17:00:20 +02:00
Jerome Nadaud f63e1065b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 16:58:37 +02:00