rMalie
|
b12bf222a9
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8179 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-24 15:57:10 +00:00 |
|
fBrignoli
|
0c68e37e40
|
[-] FO : Removed deprecated function Tax::getProductTaxRate
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8174 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-24 13:40:41 +00:00 |
|
fBrignoli
|
7e1ac5572e
|
// validateControler is now deprecated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8158 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-23 08:58:07 +00:00 |
|
rMalie
|
6d414e45c5
|
// Fix orders with friendly URL and dispatcher
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8157 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-23 08:54:14 +00:00 |
|
rMalie
|
d7eaa5f5a4
|
// Fix search on multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8150 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-22 16:10:17 +00:00 |
|
rMalie
|
a4f6bde797
|
// Fix change on currencies with context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8148 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-22 14:46:32 +00:00 |
|
rMalie
|
99c89469fb
|
// Fix order detail controller bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8147 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-22 14:29:13 +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 |
|
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
|
e86d668a49
|
// Fix download products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8080 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-16 16:22:13 +00:00 |
|
rMalie
|
0e4b7fbd72
|
// Fix PDF controllers + order-detail template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8039 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 15:14:38 +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
|
09977516c2
|
// fix product comparison
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8012 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 08:39:52 +00:00 |
|
tDidierjean
|
7c67fd84c2
|
// Context part 30
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8008 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-10 16:45:48 +00:00 |
|
fBrignoli
|
aad6d1b6f3
|
// validateControler => validateController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8004 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-10 15:39:15 +00:00 |
|
rMalie
|
47a4f7f31e
|
// Merge -> revision 7941
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7948 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 16:01:47 +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
|
6fc10e23f8
|
// Some fix on canonical URL + remove PS_HOMEPAGE_PHP_SELF configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7853 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-02 14:24:28 +00:00 |
|
rMalie
|
ffeb22bfb9
|
// Merge with revision 7841
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-02 11:43:58 +00:00 |
|
rMalie
|
72de3384a7
|
// Fix #PSFV-12
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7795 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 14:38:46 +00:00 |
|
rMalie
|
8bfd44085d
|
// Some fix after merge
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7781 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 13:03:43 +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
|
9e349dd274
|
// Context part 18
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7723 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-25 15:19:39 +00:00 |
|
rMalie
|
6814ae87c6
|
// Carrier range price / weight for multishop + fix duplicate of carrier_lang when a new shop is created
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7716 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-25 10:32:56 +00:00 |
|
tDidierjean
|
e72ae93557
|
// Context part 17
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7688 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-22 09:35:28 +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 |
|
tDidierjean
|
9619b93c73
|
// fix delete customization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7681 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-21 16:41:12 +00:00 |
|
tDidierjean
|
462c362191
|
// removing cookie from product customization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7680 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-21 14:38:04 +00:00 |
|
rMalie
|
e921117581
|
// Add config/alias.php file + refactoring of DB / MySQL classes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7668 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-20 16:10:12 +00:00 |
|
rMalie
|
42da42f827
|
// Context part 16 (shops)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7664 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-20 12:08:15 +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 |
|
tDidierjean
|
e91c92ce98
|
// Context part 14
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7653 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-19 12:28:30 +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 |
|
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
|
311e8ab964
|
// Context part 8
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7633 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-15 16:41:39 +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 |
|
rMalie
|
50f9794383
|
// Context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7600 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-12 13:50:15 +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 |
|