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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
f2b5ee338b
// Merge -> revision 7875
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7877 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-03 16:16:49 +00:00
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
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
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
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
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
mDeflotte