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
|
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 |
|
lLefevre
|
5cae5358fa
|
[*] BO : Add reduction groups in the categories, and bug fix: reduction that is not an integer or a percentage (TD001 - TD002 - TD003)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8536 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-13 13:17:32 +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 |
|
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 |
|
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
|
7481712923
|
// Fix display of breadcrumb (dont show categories disabled) + it's now impossible to browse categories outside of root category for shops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8089 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-17 12:32:04 +00:00 |
|
rMalie
|
b8706ddd8a
|
// Fix homefeatured products for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8086 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-17 09:41:28 +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
|
3ab2ba9a75
|
// HTML flag can be used in ObjectModel->getTranslationsFieldsChild() to keep html on language fields
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8026 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 13:39:30 +00:00 |
|
lBrieu
|
03596be790
|
[+] Add the TinyMCE editor on categories description
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8024 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 12:35:47 +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
|
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 |
|
tDidierjean
|
653ef8d115
|
// Context part 29
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7935 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 13:17:12 +00:00 |
|
rMalie
|
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 |
|
rMalie
|
3e298ba94f
|
// Fix categories (duplicate cause of multishop)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7861 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-03 08:07:20 +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
|
4ade3a0ea0
|
// remove 1.4 deprecated functions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7755 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 09:51:43 +00:00 |
|
tDidierjean
|
d05d16d399
|
// Context part 21
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7742 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-26 16:40:17 +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
|
4ae81d8acd
|
// Context part 15
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7658 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-19 16:17:14 +00:00 |
|
rMalie
|
35e5efb530
|
// Context part 13
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7650 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-19 09:44:10 +00:00 |
|
rMalie
|
8a0a62ae03
|
// Context in modules + Shop::sql* methods
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7648 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-19 09:23:10 +00:00 |
|
rMalie
|
7b8f139103
|
// Context part 10
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7642 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-18 15:27:32 +00:00 |
|
tDidierjean
|
e5c68ba9ae
|
// Context part 5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7624 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-13 15:24:38 +00:00 |
|
rMalie
|
67c80b2b42
|
// Refactoring of shop class with new context Part 2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7617 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-13 12:52:09 +00:00 |
|
rMalie
|
10dd3db8d4
|
// Refactoring of shop class with new context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7604 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-12 16:28:20 +00:00 |
|
tDidierjean
|
25b1bceffd
|
// Context part 2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7598 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-12 12:50:00 +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
|
5ef57ae0ac
|
[*] Core : clean all deprecated methods
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5882 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-12 18:50:26 +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 |
|