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
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
Rémi Gaillard 99f325dc3c // validation of carrierwizard 2013-10-02 11:24:08 +02:00
Jerome Nadaud 43c874e06e // Fix line feed on address observation 2013-10-02 09:59:14 +02:00
Jerome Nadaud dd79b3c702 // Manufacturer bootstraping 2013-10-02 09:43:46 +02:00
Jerome Nadaud ba2494fa8b // Remove language select on textarea with 1 langue 2013-10-02 09:43:24 +02:00
gRoussac c466320887 [-] Bo : Fix again #PSCFV-10474 again, not deleting start page after import 2013-10-01 19:11:51 +02:00
Kevin Granger 65fc1fea63 // orders WIP 2013-10-01 18:50:41 +02:00
Jerome Nadaud 301de7a3a1 // Webservice and advanced stock list bootstraping 2013-10-01 18:29:35 +02:00
gRoussac a6e8af99f9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-10-01 18:13:02 +02:00
gRoussac 6bbcbb536f [-] CORE : Cart rules not ordered by priority for PaymentModule 2013-10-01 18:12:15 +02:00
gRoussac 294384d9ea [-] CORE : Partial fix bug #PSCFV-10534 bad total_products_wt calculated without other cart rules 2013-10-01 18:11:54 +02:00
Jerome Nadaud dd60eb66cf // Fix features list filters and sort 2013-10-01 18:10:52 +02:00
Gregory Roussac 953f0641e8 Merge pull request #778 from djfm/release 
[*] TR : Installer Translations
 2013-10-01 09:09:32 -07:00
gRoussac a5dc1ce6f6 [-] Bo : Fix again #PSCFV-10474 coul not export more than 300 products 2013-10-01 18:02:12 +02:00
Jerome Nadaud f2849bdb70 // Remove unnecessary function 2013-10-01 17:56:17 +02:00
Jerome Nadaud 68831ffbe9 // Fix attribute group view list 2013-10-01 17:55:20 +02:00
djfm 172986a461 // changed help text 2013-10-01 15:06:33 +00:00
Jerome Nadaud 9c40dbb222 // Fix group view for bootstrap - removing limit restriction 'cause is now fixed 2013-10-01 17:00:56 +02:00
djfm 23df6cb875 // updated German installer translations 2013-10-01 14:52:04 +00:00
Jerome Nadaud 88be78d096 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-01 16:44:20 +02:00
Jerome Nadaud 99a4ffe583 // Fix enable friendly url button generator on multishop 2013-10-01 16:44:03 +02:00
Kevin Granger c4c15917ab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-01 16:24:27 +02:00
Kevin Granger a866de41e7 // login form 2013-10-01 16:24:14 +02:00
gRoussac f4c2bacea3 [-] CORE : Cart rules not ordered by priority for PaymentModule 2013-10-01 16:17:23 +02:00