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

301 Commits

Author SHA1 Message Date
fBrignoli
ae47d8b9f2 [-] BO : Bug fixed related to #PSCFV-1354 - Specific price with multishop, groups/currencies/countries should vary in function of the selected shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15353 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 15:51:22 +00:00
tDidierjean
16977eb5a3 [-] BO : fix bug #PSCFV-2363 - wrong product tabs loaded when the product page is saved and has an error 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15329 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 09:08:37 +00:00
mDeflotte
ea7e73ef35 [-] BO : #PSCFV-139 - Improving Retial refund 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15316 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 14:58:02 +00:00
tDidierjean
5fd6bf99d7 [-] BO : fix bug #PSCFV-2307 - multishop: product modification applied to the wrong shop caused by race condition with ajax calls 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15300 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 08:34:07 +00:00
vChabot
0b8e21fc01 [-] BO : BugFix : #PSCFV-2260 : Admin in one shop can see categories from another shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15227 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-11 13:56:15 +00:00
tDidierjean
bf27e6a93a // small js fixes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15224 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-11 13:39:08 +00:00
tDidierjean
310457f39b [-] BO : fix #PSCFV-2177 - js bug with default supplier selection 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15221 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-11 12:49:57 +00:00
bMancone
33cb7fc589 // Fixed #PSCFV-2175 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15214 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-11 10:00:16 +00:00
tDidierjean
403d22ac5c [-] BO : fix #PSCFV-2302 - import: bug with truncate confirmation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15211 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-11 09:47:57 +00:00
vAugagneur
77b67e5341 [-] FO : fixed bug #PSCFV-484 - live edit bug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15145 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 08:55:00 +00:00
rMalie
dc10a038d1 // Fix click on "all" checkbox on adminproduct for multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15143 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 08:07:12 +00:00
tDidierjean
ca3c567eca [-] BO : fix bug #PSCFV-2239 - js error on product page on IIS + PHP5.4 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15135 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 16:50:05 +00:00
rMalie
ccfef659c9 // Multishop interface reworked 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15121 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 15:05:39 +00:00
tDidierjean
c6be7c30d9 [-] BO : fix bug #PSCFV-341 - ajax call could be made twice for the same product tab 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15065 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-04 08:55:16 +00:00
aFolletete
41184a7620 [-] BO : fixed bug #PSCFV-2180 - Not auto height with long name shop 
// Clean HTML, JS, CSS code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15043 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 13:48:58 +00:00
rMalie
d911a3edff // Fix treeview retro compat 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15023 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 08:13:20 +00:00
rMalie
f5f9ee023d // Rename treeview to treeview-categories 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15022 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 08:10:10 +00:00
tDidierjean
36a5aab69d // fix JS error on IE8 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14993 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-02 09:39:30 +00:00
rMalie
327d7f42ec // Fix attr('checked'), attr('disabled') and attr('selected') with jquery update #PSCFV-2142 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14989 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-02 08:29:30 +00:00
vAugagneur
26482b4f4d //fixed bug #PSCFV-55 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14889 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-26 08:00:06 +00:00
tDidierjean
2a97927eba // #PSTEST-1229 - make sure you cannot select virtual product if you have combinations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14857 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-24 16:45:00 +00:00
tDidierjean
8f4a8b1b5c // #PSTEST-1229 - remove virtual combinations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14844 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-24 13:23:02 +00:00
lLefevre
142bb01271 [-] BO : Fix #PSTEST-1220 : now position update for attribute value is good && fix JavaScript error in admin-dnd.js 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14843 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-24 12:59:17 +00:00
fBrignoli
d22fde6176 [*] Project : Jquery 1.7.2 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14792 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-20 15:45:43 +00:00
rMalie
33d8a79b0b // Combination multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14786 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-20 10:01:05 +00:00
vChabot
e8dfa8311d // BO : product form improved (categories association) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14777 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 16:18:58 +00:00
tDidierjean
8bb5cd701f // Fix errors on product combinations edition page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14776 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 15:41:52 +00:00
tDidierjean
5eaacd2162 [-] MO : fix bug #PSTEST-1178 - block CMS position drag and drop was not implemented 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14772 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 14:34:51 +00:00
tDidierjean
c0a6bfaf9c [-] BO : fix #PSTEST-1176 - Modules positions drag and drop - ajax process is broken, page JS too 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14764 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 12:20:47 +00:00
tDidierjean
41d8630e97 [*] BO : #PSFV-865 - it is now possible to use drag and drop positions in custom controllers using HelperList 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14740 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-18 15:48:38 +00:00
rMalie
f72806d279 // Inverse checkbox for options in BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14735 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-18 15:05:04 +00:00
rMalie
d001741df3 // Add multishop checkbox for id_category_default in admin products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14711 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-18 08:26:41 +00:00
tDidierjean
456ea2a191 [-] BO : fix product page suppliers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14689 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 15:18:09 +00:00
rMalie
0c2dd0cd2f // MERGE product_multistore branch : product fields are now editable per shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 13:32:12 +00:00
tDidierjean
ca71733f00 [*] BO : #PSTEST-1157 - Ajax deletion of virtual file 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14668 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 08:07:35 +00:00
lLefevre
7a48decd82 [-] BO : fix #PSFV-826 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14653 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-16 12:26:53 +00:00
tDidierjean
b48a19a62e [-] BO : fix bug #PSFV-860 - Can't edit combinations with an existing product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14652 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-16 11:57:51 +00:00
mDeflotte
b9018cf28d [-] BO : #PSFV-776 - Fix Bug with order editing on the back office 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14647 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-16 09:34:31 +00:00
mDeflotte
99beaf6ed0 [-] FO : #PSFV-797 - Fix bug with order detail and customized products 
[-] BO : #PSFV-797 - Fix bug with order editing  and customized products

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14607 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-12 13:02:18 +00:00
tDidierjean
5c7c3a5362 // move function 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14544 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-10 08:07:12 +00:00
tDidierjean
e3537cbb74 // #PI-116 JS cleanup 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14528 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-06 12:38:39 +00:00
tDidierjean
f5b4f351fa // PI-116 - attribute default refactoring 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14525 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-06 11:59:29 +00:00
tDidierjean
678e7b9ab3 [-] BO : fix JS exception when advanced stock management is inactive 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14515 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-06 08:34:51 +00:00
tDidierjean
bb272a7e50 // #PI-116 more JS refactoring in BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14512 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-05 16:29:45 +00:00
tDidierjean
cb1a1df968 // #PI-116 JS refactoring in BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14511 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-05 16:24:26 +00:00
tDidierjean
fe491a5f8c // Fix function name 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14508 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-05 16:00:06 +00:00
tDidierjean
9aedac17dc // Remove unused JS code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14507 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-05 15:58:10 +00:00
tDidierjean
64c0219094 // Product tab objects refactoring 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14499 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-05 15:07:46 +00:00
lLefevre
9f4dd1a3ea [-] BO : fixed #PSFV-727 (issue #9 to #13) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14493 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-05 13:51:40 +00:00
vAugagneur
c20c8806db [-] BO : fixed bug #PSFV-727 - forgot password redirect 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14485 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-05 12:38:47 +00:00