dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,274 Commits 9 Branches 19 Tags
266bcd3652db9be4effff42e730ccb8ee1ffaed1
Commit Graph

78 Commits

Author SHA1 Message Date
mDeflotte
fea0ab635d // Changing version number of the blocklayered 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12404 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-13 10:23:30 +00:00
mDeflotte
53d4262cbf // Fixing problems with blocklayered and flag 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12363 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-11 15:56:18 +00:00
mDeflotte
f0065f2ced // Retrocompatibility with 1.4 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12320 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-10 16:03:52 +00:00
mDeflotte
e8d6600aa9 // Fixing problems with blocklayered and SEO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12314 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-10 15:39: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
mDeflotte
7d91e1bb50 // Fixed a bug with the blocklayered 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12117 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-04 13:05:26 +00:00
mDeflotte
f5da0b62c2 // Fixed problems with encoding and json_encode on the block layered 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12096 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-04 08:44:49 +00:00
mDeflotte
cb343e1e6f [-] MO : #PSCFI-4462 : Fixed problem with static token 
// Fixed by with non active categories

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12051 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-03 11:11:26 +00:00
mDeflotte
2a957e615a // Fixing problem with blocklayered 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11748 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-23 09:02:55 +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
mDeflotte
aaf0127906 // BlockLayered : Adding product shop restriction 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11116 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 10:46:19 +00:00
mDeflotte
de2e800ebd // Blocklayered : Filter templates could be associated to shops now 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11083 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-09 15:47:15 +00:00
mDeflotte
403d24ff4b // BugFix : Blocklayered 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11040 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-08 10:45:27 +00:00
mDeflotte
52c86a9bc3 // Blocklayered 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11038 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-08 10:36:42 +00:00
rMalie
f55a9e04b9 [*] Classes: Db->execute() now return always a boolean. Use Db->query() instead. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10999 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 15:41:34 +00:00
mDeflotte
35fea4b692 [-] FO : #PSCFI-3865 - Block Layered translation issues 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10985 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 14:23:57 +00:00
mDeflotte
e6d6e35b4d // New template for the blocklayered 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10915 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-05 14:08:13 +00:00
mDeflotte
567c23dafc // BugFix on blocklayered and sliders 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10836 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-01 15:49:13 +00:00
mDeflotte
0c87d98914 // Blocklayered: Slider could be change with two inputs or a list of values 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10822 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-01 09:16:10 +00:00
mDeflotte
ff3c4b6881 // Blocklayered: BugFix in pagination 
// Blocklayered: Add translations
// Blocklayered: BugFix with sliders (when cursor min and max are at 0)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10805 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-30 14:50:45 +00:00
mDeflotte
a42ab201f0 // Blocklayered: BO message used "echo", replaced by a return. 
// Blocklayered: Bug when show_limit = 0

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10785 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-30 08:33:37 +00:00
mDeflotte
557e05ae01 // Now blocklayered work with PS1.5 and 1.4 
// Adding some improvement to the blocklayered : Filters are now customizable (checkbox, radio, ...)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10763 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-29 18:03:21 +00:00
mDeflotte
d3cf49aaef // blocklayered is now available for PS 1.4 and 1.5. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10715 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-28 16:25:48 +00:00
tDidierjean
e0415ec7e2 // Remove deprecated calls to Tools::addJS/CSS in modules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10388 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 09:24:56 +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
tDidierjean
8a1bd2eb2d // Remove <img> from confirmation messages 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10258 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 11:00:37 +00:00
vChabot
568327849c [*] FO : combination link from product page are now the same as the combination link from blocklayered 
// Cart is now accepting the combination link

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10028 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-10 10:45:19 +00:00
mDeflotte
eb08f69f7b // Blocklayered for PS 1.5 - no modifications for the moment 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9654 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-26 13:12:57 +00:00
mDeflotte
9d1650ca0a // fixing bad code indentation for module block layered 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9488 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-20 09:12:20 +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
798de9aaea // Merge -> revision 9288 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9289 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-12 16:04:28 +00:00
rMalie
de69396a04 // Merge -> revision 9221 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9226 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-11 12:45:12 +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
14542fea44 // Merge -> revision 9124 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9125 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-07 09:54:43 +00:00
rMalie
ae5fc92bf7 // Merge -> revision 8984 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8988 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-03 15:48:07 +00:00
vAugagneur
2fbc132933 [+] Classes : added new class Media => It contains all the method related to media like CSS, JS 
[+] Classes : added new method Media::addJquery(), Media::addJqueryUI(), Media::addJqueryPlugin()
[~] Deprecated : All method related to CCC has been moved in class Media

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8926 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 13:01:10 +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
vAugagneur
f7c7b6350f [-] MO : fixed FATAL error on layered navigation module 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8781 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-26 16:31:36 +00:00
rMalie
7c85e104de // Merge -> revision 8734 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8740 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-23 14:06:47 +00:00
rMalie
4f2a090e24 // Merge -> revision 8720 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8722 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-22 15:45:10 +00:00
rMalie
42d996ec94 // Merge -> revision 8624 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8626 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-16 15:02:29 +00:00
rMalie
1977f1d851 // Merge -> revision 8608 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8612 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-15 16:10:59 +00:00
rMalie
224b55c3c2 // Merge -> revision 8589 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8596 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-14 16:13:24 +00:00
rMalie
87df41c9d6 // Merge -> revision 8552 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8554 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-14 08:29:10 +00:00
rMalie
b50c7e4334 // Merge -> revision 8507 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8513 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-12 16:17:37 +00:00
rMalie
24e213cda8 // Merg// Merge -> revision 8395 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8397 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-07 16:23:13 +00:00
rMalie
39f2f53db2 // Merge -> revision 8363 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8365 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-06 12:38:55 +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
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
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