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

61 Commits

Author SHA1 Message Date
rMalie
e01a890c01 // Use protected instead of private for classes we can override #PSCFV-1976 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14895 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-26 08:55:55 +00:00
vAugagneur
c116695e74 //fixed bug #PSCFV-475 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14893 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-26 08:51:58 +00:00
vChabot
79e53679b5 // product import improved (image problem because of file_exists PHP function) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14852 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-24 14:39:29 +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
lLefevre
566549d9f7 [*] BO : #PSTEST-1141 : fix bugs in AdminImportController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14568 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-11 11:58:27 +00:00
bMancone
8cb35dc9b1 // FIxed #PSFV-752 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14411 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-02 14:43:52 +00:00
vChabot
b664b8229f // category import : is_root_category added 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14361 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-29 14:00:18 +00:00
vChabot
6d3cb5ee76 // product import multishop fix with category default 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14330 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-28 12:43:47 +00:00
mDeflotte
5e3ba2fa42 [-] BO : #PSFV-686 - Fix import error output 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14304 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-27 15:38:41 +00:00
vChabot
427d139207 // category import improved 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14298 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-27 13:41:34 +00:00
vChabot
1803eb72f2 // product import : associate image to shops works fine 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14271 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-26 15:33:41 +00:00
vChabot
9b907fbd31 // multishop category import improved 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14200 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-15 14:35:07 +00:00
bMancone
888335e95a // Fixed #PSFV-664 : stock available is now correctly updated 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14192 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-15 10:32:00 +00:00
lLefevre
a7a05b7637 // Fix replace \\" by " in english keys and change french keys for errors files 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14180 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-15 08:31:12 +00:00
vChabot
ba91c597c7 [-] BO : BugFix : #PSFV-664 : Category import handles multishop now 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14167 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-14 16:21:03 +00:00
lLefevre
0e9e23aaae // Fix update english key of translations in all files 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14143 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-14 12:25:51 +00:00
vChabot
0b5653aeba // Import categories improvement 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13976 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-08 14:41:10 +00:00
bMancone
dde5fbb33e // Fixed combinations import 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13936 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-07 16:23:35 +00:00
rMalie
0f865fd2d6 [*] BO : reorganization of admin tabs 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13820 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-02 14:44:07 +00:00
bMancone
2d522750bf // Fixed #PSFV-583 & #PSFV-584 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13813 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-02 09:56:24 +00:00
mDeflotte
28f2912d04 [-] BO : #PSFV-586 - Fix bug with importeur and img dir creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13730 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-29 10:27:48 +00:00
tDidierjean
7a6a998aab // rename $toolbar_fix to $toolbar_scroll part2 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13712 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 17:39:40 +00:00
vChabot
6b9a9c7f9d // category import improved 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13694 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 14:31:15 +00:00
vChabot
5592c360d9 [-] BO : BugFix : #PSFV-561 & #PSFV-574 : Category import is now working fine 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13661 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 09:30:46 +00:00
bMancone
9b254fcafa // Fixed #PSFV-584 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13636 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 15:45:44 +00:00
bMancone
6a6c4e2e72 // Fixed #PSFV-558 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13631 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 15:40:06 +00:00
rGaillard
81ae741f9e // Add tax rules by shop in product import 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13594 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-24 09:59:27 +00:00
rMalie
2454cd7863 // Welcome 2012² 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-23 16:33:10 +00:00
rMalie
b24dcffc9c // Improve multishop API 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13566 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-23 15:39:44 +00:00
bMancone
12735c9f50 // Fixed #PSFV-550 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13529 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-22 14:13:09 +00:00
mMarinetti
10b3e3d8d3 // Welcome 2012 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13520 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-22 09:28:22 +00:00
bMancone
d105569cec // Improvement #PSFV-550 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13470 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 15:37:04 +00:00
bMancone
a566a2a3d6 // Fixed #PSFV-418 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13266 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 15:38:43 +00:00
tDidierjean
54080062f7 // Finish removing the "id_theme in ImageType" code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13265 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 15:35:05 +00:00
bMancone
f8750bfafe // Fixed #PSFV-417 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13255 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 14:11:46 +00:00
bMancone
494e434a1d // Fixed combinations CSV import for PS 1.5 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12696 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 18:01:32 +00:00
bMancone
78294f7085 // fixed CSV import 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12685 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 15:04:25 +00:00
rMalie
ebec527630 [*] Classes : images.inc.php functions are now all deprecated, use the new class ImageManager instead 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12596 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-23 10:21:51 +00:00
rMalie
6887541bdd [-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12552 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-19 10:14:10 +00:00
tDidierjean
ad1fd29cea // Refactor AdminController::_errors to errors 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12331 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-11 08:58:12 +00:00
vSchoener
4ab0776e19 // Reported bug #PSCFI-4407 about bad column id for categories and checked distant file 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12070 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-03 14:46:53 +00:00
tDidierjean
4017f3f60b // optimization to Product constructor (stock data is not loaded by default) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12061 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-03 13:40:50 +00:00
rMalie
07207496d7 // Rename correctly all hooks 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12006 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 15:52:40 +00:00
bMancone
a3d8def0a6 // Updated CSV Import 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11970 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 10:11:53 +00:00
bMancone
9681cfc3a6 // Supply Orders CSV Import 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11901 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-29 16:24:24 +00:00
bMancone
76533c40bd // Updated Supply Order + import CSV 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11856 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-28 15:08:07 +00:00
bMancone
09c59581da // Updated CSV Import 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11843 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-28 14:16:43 +00:00
bMancone
d96a1f8fb5 // Updated CSV Import 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11842 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-28 14:07:18 +00:00
bMancone
313e67d433 // CSV Import: began adding Supply Orders 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11830 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-28 11:36:45 +00:00
bMancone
343591ef87 // Improved StockInstantState / StockMvt 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11803 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-27 16:25:34 +00:00