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

43 Commits

Author SHA1 Message Date
rMalie
14e44efe75 // Improve Shop::getTotalShops() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15147 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 08:59:07 +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
rMalie
80f238df73 // Fix helper translations for shops #PSTEST-1121 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14822 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 14:59:42 +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
7379317956 // Small fixes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14270 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-26 15:26:23 +00:00
rMalie
5b9de8ac00 // Refacto generateShopList() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14183 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-15 09:33:23 +00:00
vChabot
d2e9c80c53 [-] BO : BugFix : #PSTEST-991 : ajax search with category treeview 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14029 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-12 10:30:14 +00:00
vChabot
000e05602b [-] BO : Bugfix : #PSFV-619 : removing the ability to add a new root category if you are not in multishop 
// category tree improved

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13856 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-05 16:52:58 +00:00
tDidierjean
eae3bc2d84 // rename $toolbar_fix to $toolbar_scroll part1 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13711 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 17:38:42 +00:00
vChabot
cb87b22f4f [-] BO : BugFix : #PSTEST-788 : Treeview is now handled with shop context in admin category controller 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13707 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 17:16:47 +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
vChabot
2335b53cdd // select associated categories on a shop creation (with the root category shown when you are not in a shop context) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13466 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 14:36:57 +00:00
rMalie
b0590e342e // Fix default shop associations in helper shop #PSTEST-770 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13392 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 14:10:30 +00:00
rMalie
b1a1d78533 // Fix default shop associations in helper shop #PSTEST-746 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13367 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 16:43:32 +00:00
fGaillard
f0e4ba651d [*] MO : BlockCMS module 1.5 compliant + translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13347 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 13:50:25 +00:00
rMalie
cecc3721d4 // Improve multishop ergonomy with a link to missing url on shop list 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13303 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 13:20:17 +00:00
rMalie
7682d57803 // Refacto of lang functions (all code moved in Translate class) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13262 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 15:20:25 +00:00
vChabot
241ddaf652 [-] BO : BugFix : #PSFV-462 : category tree view displayed according to he shop context 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13168 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-09 09:49:42 +00:00
tDidierjean
0a931b8bfe // Move all helper override templates for controllers to subfolders 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13052 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-06 18:12:15 +00:00
rMalie
9739089c32 [*] classes : new module architecture 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12872 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 16:57:19 +00:00
rMalie
c994c25fe1 // Normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12680 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 14:40:12 +00:00
vChabot
988dd73596 // categories multishop improved 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12638 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-24 09:30:32 +00:00
vChabot
e646dbcce8 // categories multishop improvements (BO breadcrumb + category tree root removed) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12607 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-23 14:50:47 +00:00
rMalie
5dad8f329d // Code review : normalise and todo 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12583 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-20 15:19:27 +00:00
tDidierjean
f6e48114e7 // Helper::renderAdminCategorieTree refactoring 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12578 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-20 13:02:34 +00:00
tDidierjean
81832703f2 // BO: Remove category filter by select in product page and refactor Helper::renderAdminCategorieTree() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12551 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-19 10:08:06 +00:00
bMancone
b8cc100abd // Norm following pre-commit warning ;) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12431 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-16 13:32:11 +00:00
bMancone
a7bee33635 // Fixed SupplyOrders 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12429 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-16 13:31:00 +00:00
tDidierjean
84035510b5 // Move controller templates to subfolder controllers/ 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12287 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 17:23:42 +00:00
vChabot
832dc339ab // little fix about multishop categories 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12276 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 16:02:27 +00:00
vChabot
87fd511314 [*] BO : Adding category management with multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12270 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 15:13:46 +00:00
rMalie
744e398a19 // Use smarty->getTemplateDir(0) instead of smarty->template_dir[0] (private property) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12265 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 14:02:34 +00:00
lLefevre
c8d4bbb09e // unused methods were deleted 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11795 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-27 14:53:15 +00:00
vChabot
c57942fc71 // BugFix : TreeView not displayed in Group Reduction form 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11793 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-27 14:30:19 +00:00
lLefevre
35ac5cd809 // fix bug upload image 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11777 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-27 08:53:27 +00:00
rGaillard
8ab8ef1fec // cms_block multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11560 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 21:17:36 +00:00
vChabot
6ef2e2cc50 [*] BO : New category management with multi shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11437 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-20 17:36:08 +00:00
vChabot
7d0942bcc2 [*] BO : Required fields improved (with a white list) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11276 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 16:37:08 +00:00
mDeflotte
5d941ccc26 // BugFix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11247 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 10:50:42 +00:00
vKham
199c3c1990 // fix toolbar button IE7, stylesheet edit product Informations Associations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11166 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 10:45:21 +00:00
mDeflotte
eb40bcf854 // Shop association area use tpl file 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11082 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-09 15:40:02 +00:00
tDidierjean
80ecb65475 // Commit new tabs in product edition 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11079 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-09 14:22:46 +00:00
rMalie
11ba092bca // Move helper classes in subdirectory 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10968 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 09:40:27 +00:00