dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,780 Commits 9 Branches 19 Tags
2ca41bd6cdabc7b1aaa34b4f6c0ce4716bb00ced
Commit Graph

29 Commits

Author SHA1 Message Date
dMetzger 6fed7f3683 // Renamed defaultLanguage in id_lang_default in order to avoid conflict with an object #PSCFV-3780 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17065 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-29 09:55:39 +00:00
lLefevre eeeaaa8e08 [-] MO : loyalty : #PSCFV-3764 : display points of default attribute 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17038 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-28 08:27:46 +00:00
lLefevre a57aabec11 [-] MO : loyalty : #PSCFV-3760 : fix warning && update number of loyalties by product && normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17015 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-27 12:15:57 +00:00
dMetzger e60df09495 // Code cleaning 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16837 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-14 07:46:42 +00:00
fSerny 5959b96b2e [-] MO : Fix hook name on differents modules - #PSCFV-2784 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16173 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-02 08:51:05 +00:00
lLefevre fa1caba6e5 [-] FO : #PSCFV-2150 : Translations of modules are connected width sprintf() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15304 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 08:54:24 +00:00
lLefevre eccb5b7da2 [*] MO : change calls method Tools::displayError() by $name_module->l() && Translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15094 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 10:06:23 +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
fGaillard 7a6339d50f [-] Classes : #PSFV-634 : BugFix Currency was not set for loyalty discounts 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14110 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-13 17:06:42 +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
mDeflotte 0db654d8c9 [-] MO : #PSFV-532 - Fix bug on the module Loyalty - "points" are not upgrading on changing combination 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13429 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 13:36:29 +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
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 58433f1881 // Normalize + use $this->smarty instead of $this->context->smarty in modules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11944 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-30 14:59:57 +00:00
rMalie 9d10de0848 // Merge -> 10309 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 11:05:10 +00:00
dMetzger 17a8dbc05b // Retro compatibility and updater improved for Discount/CartRules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9798 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-02 14:23:44 +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
rMalie 1b6d0d1be3 // Merge -> revision 8800 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8808 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-27 14:30:06 +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 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
tDidierjean 5d090a25b3 // Context part 27 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7812 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-29 14:29:57 +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
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