dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,949 Commits 9 Branches 19 Tags
4a013cf5377654536a4e4875fa27fa236a89c3ce
Commit Graph
20949 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jerome Nadaud 04e5617d7d // Instant stock bootstraping 2013-10-02 16:58:27 +02:00
Sarah Lorenzini 5993c188c5 // update login page 2013-10-02 16:50:09 +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
Sarah Lorenzini 791481e149 // update login page 2013-10-02 16:00:54 +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
Jerome Nadaud acb5bf77f6 // Remove comment 2013-10-02 14:52:13 +02:00
Jerome Nadaud 68c5318706 // Icon change for list details button 2013-10-02 14:49:42 +02:00
Jerome Nadaud 3ce163449e // Advanced stock management bootstraping 2013-10-02 14:48:23 +02: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
Vincent Augagneur dec213aecf //now use displayError() in modules 2013-10-02 14:39:41 +02:00
thoma202 1ccc25f56c Merge branch 'development' of github.com:202-ecommerce/PrestaShop into development 2013-10-02 14:38:44 +02:00
Sarah Lorenzini 1cb7f27a21 // update login page bootsrap 2013-10-02 14:38:13 +02:00
Sarah Lorenzini ba06b217cc // update javascript login page 2013-10-02 14:36:14 +02:00
gRoussac c4e549db13 [-] BO : Fix #PSCFV-6482 could not import tags in deiffrent languages 2013-10-02 14:20:27 +02:00
Kevin Granger f5a4aeeab5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 13:59:04 +02:00
Kevin Granger 0867e8b7c1 // fix AdminController array unique 2013-10-02 13:58:57 +02:00
Jerome Nadaud 661e18916b // Permission bootstrap design 2013-10-02 12:30:07 +02:00
Jerome Nadaud 51c1ee0cf0 // Move ajax box and ajax confirmation to content part 2013-10-02 12:23:10 +02:00
Damien Metzger a876b13c1c [-] BO : fixed currency format on order creation 2013-10-02 12:10:54 +02:00
Jerome Nadaud a891c9277a // Advanced stock management details list 2013-10-02 12:09:03 +02:00
thoma202 eb7655e318 [+] Added hook in maintenance page 2013-10-02 11:58:35 +02:00