dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
342 Commits 9 Branches 19 Tags
e7b5cd5b952374137e55d73d2b01a2884df136fb
Commit Graph

60 Commits

Author SHA1 Message Date
rMalie 79fd72e461 // Merge -> revision 8342 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8344 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-05 14:56:02 +00:00
aFolletete 3eff951265 [+] Project : adding Features detachables in order to improve performance 
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8328 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-03 17:21:32 +00:00
tDidierjean c2258ae8e9 //// Merge -> revision 8290 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8295 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-01 09:53:43 +00:00
lBrieu e347e11872 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8254 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-30 13:44:57 +00:00
lBrieu 7d5f1ae314 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8253 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-30 13:42:35 +00:00
lBrieu 6ccb93e606 [-] Remove employee fields 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8251 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-30 13:38:50 +00:00
lBrieu 4817e97cd8 [+] Add employee fields for notifications in BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8250 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-30 13:38:36 +00:00
lBrieu cb5fc11308 [+] Add some fields in the employee tab to handle notifications in BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8246 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-30 12:03:10 +00:00
tDidierjean 16516953fb // Merge -> revision 8206 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8210 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-26 15:52:42 +00:00
rMalie 68c7be42c2 // Merge -> revision 8199 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8200 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-26 07:59:29 +00:00
rMalie 22d23f8324 // Merge -> revision 8149 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8151 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-22 16:22:16 +00:00
fBrignoli 13849fc2c8 // update tax rules PHP => SQL 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8116 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-19 12:03:04 +00:00
rMalie a1843c1900 // Merge -> revision 8114 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8115 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-19 09:46:12 +00:00
fBrignoli f371f3e3bc [*] Project : US + CA TaxSystem 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8105 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-18 10:10:50 +00:00
rMalie 0aada6cc1e // Merge -> revision 8097 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8100 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-17 16:10:20 +00:00
rMalie 4079e1c159 // Fix #PSFV-13 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8041 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 15:22:57 +00:00
rMalie 3c9fdb4e2c // Fix install of ps_stock table 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8025 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 12:45:43 +00:00
rMalie 52d1d13891 // Merge -> revision 8014 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8021 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 12:00:05 +00:00
rMalie d1d4d57eca // Revert normalization 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8019 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 10:20:59 +00:00
rMalie f62cdb1963 // Normalization 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8017 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 09:58:20 +00:00
rMalie e093ecd554 // Fix on shops + remove id_group_shop from stock + fix stock 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8015 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 09:38:24 +00:00
rMalie 7411db9a69 // Merge -> revision 7979 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7981 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-10 08:36:17 +00:00
rMalie a86e95fc5a // Fix shop_url when no physical_uri + fix shop association when multistore is disactivated 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7958 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-09 13:20:26 +00:00
rMalie bd9366daf5 // Fix physical_uri during install + required paramaters in dispatcher 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7903 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-05 09:53:42 +00:00
rMalie b1ea0538a3 // Fix install of shop uri 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7896 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-05 07:51:20 +00:00
rMalie e2b883f617 // Remove PS_HTACCESS_SPECIFIC configuration (we don't need it anymore since .htaccess now keep automatically all what he need) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7856 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 15:06:31 +00:00
rMalie 6fc10e23f8 // Some fix on canonical URL + remove PS_HOMEPAGE_PHP_SELF configuration 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7853 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 14:24:28 +00:00
rMalie 921fbcd564 // Remove AdminAppearance 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7845 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 12:23:11 +00:00
rMalie ffeb22bfb9 // Merge with revision 7841 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 11:43:58 +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
dMetzger 287a5f42dc [+] BO : you can now set detailed permissions for each module in the back end 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7818 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-31 16:39:53 +00:00
dMetzger a2b32fb056 [-] IN : missing entries in accesses table 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7817 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-31 11:58:31 +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 4caa9d2775 // fix sql 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7722 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-25 14:36:30 +00:00
rMalie 6814ae87c6 // Carrier range price / weight for multishop + fix duplicate of carrier_lang when a new shop is created 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7716 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-25 10:32:56 +00:00
rMalie e08b70a242 // Carrier association + discount association 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7696 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-22 15:53:07 +00:00
rMalie 10e68bda6b // Add scenes for multistore 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7692 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-22 12:27:42 +00:00
tDidierjean e72ae93557 // Context part 17 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7688 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-22 09:35:28 +00:00
rMalie e62be3d793 // id_shop on cart product (for links) + change Shop::sqlAsso() + share_order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7687 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-22 08:57:51 +00:00
rMalie e921117581 // Add config/alias.php file + refactoring of DB / MySQL classes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7668 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-20 16:10:12 +00:00
rMalie fa2fc8b69d // No more mysql_error() hard coded ! 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7651 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-19 11:35:33 +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
rMalie 82754451ad git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7618 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-13 12:52:44 +00:00
rMalie 4f3aad65e3 // Multishop for referrers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7583 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-11 13:03:26 +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
vAugagneur 35ff645731 //merge 1.4 => 1.5 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6124 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-29 12:34:09 +00:00