Commit Graph

48 Commits

Author SHA1 Message Date
mBertholino
f3b612609e [*] MO : updated module blockwishlist for mobile theme
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13664 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 09:42:17 +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
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
8643de7311 // French translations (by Xavier)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13391 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 14:09:43 +00:00
rMalie
2d6fd402c9 // French translations (by Xavier)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13342 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-15 13:22:27 +00:00
rMalie
7ebff4d7ae // Modules langs files moved to modules/*/translations/ folder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12900 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 14:42:15 +00:00
lLefevre
302ab96db8 [-] BO : fix #PSFV-260
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12177 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-05 10:39:05 +00:00
bMancone
631309d2d2 // #PSFV-124 Licenses update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12137 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 14:54:25 +00:00
mDeflotte
22f661d751 [-] MO : #PSCFI-4440 - Fixed image problem is the blockwishlist and images
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12071 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 14:50:00 +00:00
rMalie
92b2d682f1 // Set $definition in ObjectModel classes for modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11950 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-30 15:37:57 +00:00
sThiebaut
504d94ff90 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11948 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-30 15:33:52 +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
mDeflotte
21d4c051bd // Traductions files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11336 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 09:25:37 +00:00
sThiebaut
085f64c85f // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11066 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 17:07:55 +00:00
lLefevre
a73e408196 [-] BO & FO & MO : #PSCFI-4237 : adding id_lang in method l() of class Mail()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10954 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:22:47 +00:00
sThiebaut
5b1642b26e // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10952 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:22:04 +00:00
mMarinetti
810dab5d27 // new theme fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10869 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:10:22 +00:00
mMarinetti
9cc30dc3fe [+] Project : default theme added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10862 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:24:40 +00:00
rMalie
9ca2fe4ca5 // Fix typo in blockwishlist
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10728 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 09:53:59 +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
vKham
c441358b40 // new icon for adminhome, adminmodules and header
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10318 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 09:21:26 +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
rMalie
45645f1f50 // Merge -> revision 9352
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9354 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 08:20:54 +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
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
7cadad5d3e // Fix all product_lang sql restrictions with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8121 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-19 14:01:23 +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
tDidierjean
cb3d802346 // Context part 31
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8087 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 10:07:12 +00:00
rMalie
49468717c2 // Fix #PSFV-48
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8032 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 14:42:31 +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
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
tDidierjean
d80c7b5ba8 // Context part 26
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7804 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-28 16:37:50 +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
89213e18e5 // Context part 12
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7649 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 09:28:11 +00:00
tDidierjean
2c493137c3 // Context part 11
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7644 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-18 15:50:58 +00:00
tDidierjean
143022e488 // Context - first commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7586 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-11 14:32:05 +00:00
tDidierjean
8bf1b23239 // revert previous commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7573 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-08 16:12:27 +00:00
tDidierjean
f085f81d23 // cancel commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7572 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-08 15:43:24 +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
fBrignoli
4a210f98d9 [+] Dispatcher
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7069 b9a71923-0436-4b27-9f14-aed3839534dd
2011-06-15 16:32:06 +00:00
fBrignoli
56099fa735 // merge 1.4 => 6117
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6118 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-29 09:09:38 +00:00
rGaillard
cfdc0ab1d9 [-] BO: Fixed module configuration when cache is activated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5888 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-13 10:11:09 +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