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

45 Commits

Author SHA1 Message Date
rGaillard
66c9b52d43 // Fix product stocks on multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15379 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 14:32:29 +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
998ef4263e [-] BO : BugFix : #PSFV-1020 : category reduction can be deleted now 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14109 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-13 17:06:20 +00:00
tDidierjean
27dd4be97d // remove $noTabLink from compatibility tabs 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13835 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-05 13:25:30 +00:00
rMalie
ac890a4fb1 // Fix auth issues for multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13647 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 17:03:58 +00:00
vChabot
02d98b237e // id_category_default is now for multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13624 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 13:53:52 +00:00
rMalie
c2cef61a5a // Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13618 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 12:15:30 +00:00
rMalie
69e2cf95d6 // Restore shop context in shop list and can filter shop pages per group shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13579 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-24 08:58:21 +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
rMalie
4e6628cbfd // Remove $display_multishop_toolbar and add instead $multishop_context to manage shop context per admin controller 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13530 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-22 14:25:28 +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
rMalie
97c7e11df0 // Improve multishop ergonomy (new toolbar) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13333 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 10:04:05 +00:00
dMetzger
5f95dda75d // Small display fixes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13181 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-09 15:07:52 +00:00
rMalie
6b47a49885 // Remove _DB_TYPE_ constant from everywhere in the code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12181 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-05 13:12:45 +00:00
tDidierjean
8c2c9507cf // Fix #PSTEST-231 - AdminSearch 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11994 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 14:17:30 +00:00
tDidierjean
18c81442d1 // Fix AdminCmsControllers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10355 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 14:30:26 +00:00
tDidierjean
740ac7c843 // AdminTab compatibility: Dispatcher for BO now search tabs in database, not on the disk. AdminTabs now uses the new BO theme. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10236 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 18:15:07 +00:00
hAitmansour
d8509b2829 [*] FO BO MO : rename function isMultiShopActivated by isFeatureActive 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9444 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-19 09:36:12 +00:00
rMalie
a7bc16dadd // Replace shop->sqlAsso(), shop->sqlLang() and shop->sqlRestriction() with shop->addSqlAssociation(), shop->addSqlRestrictionOnLang() and shop->addSqlRestriction() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9384 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-17 09:46:08 +00:00
lLefevre
a8a11c0ece [*] BO : Rights verification for multi-shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9198 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-10 16:10:57 +00:00
rMalie
577221ff08 // Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9178 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-10 12:18:56 +00:00
lLefevre
c781f25760 [*] BO : added right of multi-shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9157 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-07 15:39:55 +00:00
mMarinetti
41c4897976 // ajax-tab usage of Dispatcher 
// adminHome.tpl
// header.tpl fix


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8805 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-27 14:18:27 +00:00
lLefevre
7b1344becf git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8782 b9a71923-0436-4b27-9f14-aed3839534dd 2011-09-26 16:46:48 +00:00
jmCollin
2309720a0b // 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8778 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-26 16:04:15 +00:00
jmCollin
da24f70c91 // Fix for Strict standards: Creating default object from empty value, when try to add a new product without product name or friendly URL 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8777 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-26 15:53:36 +00:00
rMalie
45eb3a52ad // Fix admin dispatcher 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8774 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-26 14:36:18 +00:00
rMalie
6a39d24f05 // Improve flexibility of dispatcher + fix controllers access in BO (only admin controllers are loaded by the dispatcher) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8764 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-26 09:57:00 +00:00
rMalie
ff51f77bba // Fix token on adminHome 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8758 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-26 08:24:38 +00:00
mMarinetti
4f5b1dd933 // fix tab display and subtabbing 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8750 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-23 15:45:09 +00:00
mMarinetti
926063e08f [+] BO : New AdminController system, including smarty backoffice, thanks to Raphael and Thomas 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8742 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-23 15:01:49 +00:00
tDidierjean
b45dd02452 // remove deprecated PS_ADMIN_DIR by _PS_ADMIN_DIR_ 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8666 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-20 15:53:57 +00:00
rMalie
e5e12bdf90 [+] Add abstract controller 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8625 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-16 14:49:47 +00:00
rMalie
382584ad35 // Fix all category_lang sql restrictions with multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8124 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-19 14:21:45 +00:00
rMalie
c945049ef1 // Some fix + improve ergonomy + Tools::isMultiShopActived() moved in Shop class + 1.5.0.1 version in install script 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7842 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 09:54:23 +00:00
rMalie
ab5fc723b4 // Routes for dispatcher (part 4) + some fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7830 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-01 13:28:02 +00:00
rMalie
a875fecb20 // MERGE with 1.4 r7770 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 09:20:57 +00:00
rMalie
be4811aa6e // REVERT MERGE 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 13:35:06 +00:00
rMalie
e159c925d8 // MERGE with trunk revision 7754 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 12:48:42 +00:00
tDidierjean
20276404a8 // Context part 7 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7629 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-15 13:59:26 +00:00
tDidierjean
e5c68ba9ae // Context part 5 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7624 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-13 15:24:38 +00:00
rGaillard
8a59d0dc41 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:54:11 +00:00
rGaillard
69f2f09dc5 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7522 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:10:43 +00:00
aFolletete
10445ad61d // 1.5 branche creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5881 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-12 18:24:40 +00:00