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

1983 Commits

Author SHA1 Message Date
Jerome Nadaud
9badb78f5b [-] BO : FixBug #PSCSX-115 Friendly URL generated 2013-12-11 10:39:25 +01:00
Jerome Nadaud
05f3c259e0 [-] BO : FixBug #PSCSX-37 - Double upload in carrier wizard 2013-12-10 16:59:51 +01:00
Jerome Nadaud
992dddcbb4 // Virtual Product bootsraping 2013-12-10 13:51:34 +01:00
Jerome Nadaud
8929bb5f21 [-] BO : FixBug #PSCSX-86 Missing color selector 2013-12-10 10:30:46 +01:00
Jerome Nadaud
9850eeb3e5 // Fix category delete cancel button 2013-12-05 11:00:58 +01:00
Vincent Augagneur
b1304f0379 //carrier wizard range table auto size 2013-12-04 18:27:08 +01:00
rGaillard
be91ec02f2 // fix modules filter after category change 2013-12-04 12:03:12 +01:00
Kevin Granger
68edf085d4 // fix «enter» on retrieve password panel 2013-12-04 11:29:21 +01:00
Gregory Roussac
9eea7203fe Merge pull request #1084 from PhpMadman/1.6-ShipMaxInput 
[*] BO : Fixes issue with not beeing able to edit weight beacuse string is longer then max length
 2013-12-03 11:43:32 -08:00
PhpMadman
8949382e00 [-] BO : Better maxlength on shippinh input fields 2013-12-03 19:38:28 +01:00
Kevin Granger
3f2ce54efd // gamification + multishop wip 2013-12-03 15:21:13 +01:00
Lucas CERDAN
da2d48890f Merge pull request #1072 from PhpMadman/Boot-AutoSeoUrl 
[*] BO : Option to always rewrite friendly url of product
 2013-12-03 06:15:28 -08:00
Vincent Augagneur
98d02d94b9 [-] BO : carrier wizard range tab now overflow scroll 2013-12-03 14:15:24 +01:00
PhpMadman
0de9c3ac6c [*] BO : Added option to always rewrite friendly url of product 2013-12-03 10:57:25 +01:00
Damien Metzger
2316bb50ba // Fixed import button in AdminImport 2013-12-02 18:53:51 +01:00
Jerome Nadaud
804fe56ba0 // Change order button language 2013-12-02 18:20:42 +01:00
Jerome Nadaud
970449148c // Add footer toolbar to products panel 2013-12-02 16:08:44 +01:00
Kevin Granger
0d7a48095c // tweak product tabs 2013-12-02 15:27:21 +01:00
Kevin Granger
bf3c27e864 // fix dropdown menu 2013-12-02 14:13:41 +01:00
Kevin Granger
2ef8333e6a // tweak import 2013-12-02 14:12:02 +01:00
Kevin Granger
79b1b07cce // tweak on login form : it’s a trap! 2013-12-02 11:35:21 +01:00
Kevin Granger
909983bcbf Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-12-02 11:11:29 +01:00
Kevin Granger
bca9048a6b // fix filter by category 2013-12-02 11:11:16 +01:00
Jerome Nadaud
5381e6007f // fix Tab selection in modules favorites view 2013-12-02 10:47:15 +01:00
Jerome Nadaud
c83761b420 // Module configuration bar fix 2013-12-02 10:25:18 +01:00
PhpMadman
6ef0910bfb [*] BO : Fixes issue with not beeing able to edit weight beacuse string is longer then max length 2013-12-02 10:17:26 +01:00
Jerome Nadaud
d887dfc2f1 // Update cart rules fancybox 2013-12-02 09:13:20 +01:00
Damien Metzger
7cd38d4461 // Changed base64 to urlencode in import (and fixed filename issue) 2013-11-29 19:24:04 +01:00
Jerome Nadaud
0a2a36f49b // Add text-success class to upload button 2013-11-29 18:15:55 +01:00
Jerome Nadaud
f8a94b1be9 // Catalog price rules bootstraping 2013-11-29 17:31:28 +01:00
Jerome Nadaud
b432fd5641 // Bootstraping cart rules 2013-11-29 17:13:09 +01:00
Jerome Nadaud
8ad3166226 // Add save button to Localization tax rules 2013-11-29 15:30:57 +01:00
Jerome Nadaud
badfef481c // Small fix 2013-11-29 12:20:10 +01:00
Jerome Nadaud
e1568a67a2 // Fix products attachments uploader 2013-11-29 12:10:09 +01:00
Kevin Granger
cc80e82431 // import (todo: add the link delete/view on items loaded with js) 2013-11-29 11:53:43 +01:00
Kevin Granger
1d2f6c9b9d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-28 19:22:03 +01:00
Kevin Granger
0f74646524 // import 2013-11-28 19:21:55 +01:00
Jerome Nadaud
9e6868ba97 // Change product attachment upload system 2013-11-28 19:09:24 +01:00
Vincent Augagneur
66947b5354 //multiple small fix on carrier wizard 2013-11-28 17:38:05 +01:00
Kevin Granger
8848ff08d8 // test git 
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	controllers/admin/AdminImportController.php
 2013-11-28 14:29:34 +01:00
Kevin Granger
6729d97534 // import WIP 2013-11-28 12:22:39 +01:00
Vincent Augagneur
dde8540a86 //carrier wizard logo location fixed 2013-11-28 11:27:34 +01:00
Vincent Augagneur
ddf00b3e98 //small fix #PSCSX-50 2013-11-28 11:06:46 +01:00
Kevin Granger
cc3a1379d1 // Import WIP (still broken for first upload) 2013-11-27 19:33:36 +01:00
Jerome Nadaud
b58e8b6bb7 // One step csv uploader 2013-11-27 16:35:58 +01:00
Kevin Granger
66f8b55fc2 // import WIP (broken for now) 2013-11-27 14:35:47 +01:00
Kevin Granger
dd36a9e8b7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-27 11:35:41 +01:00
gRoussac
b8012952f7 [*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/852 2013-11-26 22:32:57 +01:00
Kevin Granger
37d4d4bd5f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-26 19:03:27 +01:00
Kevin Granger
32af46e42c // Import WIP 2013-11-26 19:03:15 +01:00