 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
|
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 |
|
|
rMalie
|
39d0acc30b
|
// Hook modules exceptions now works with new dispatcher
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7587 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-11 15:16:16 +00:00 |
|
|
rMalie
|
4f3aad65e3
|
// Multishop for referrers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7583 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-11 13:03:26 +00:00 |
|
|
rMalie
|
3c50152c94
|
// Some fix + multistore for import tools
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7546 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-07 12:18:27 +00:00 |
|
|
rMalie
|
3d9b61023c
|
// Generate .htaccess in adminShopUrl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7534 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 14:35:19 +00:00 |
|
|
rMalie
|
8ed089decf
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7532 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 13:54:12 +00:00 |
|
|
rGaillard
|
3dde6382a5
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7528 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 13:26:34 +00:00 |
|
|
rGaillard
|
0433d8b7f4
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7525 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 12:45:27 +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 |
|
|
mMarinetti
|
1499e8bf94
|
[-] BO : Fixed #PSCFI-1736 - in AdminTranslations.php, only theme directory are parsed (and not files)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6147 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-05-02 15:50:39 +00:00 |
|
|
vAugagneur
|
1613e871e6
|
//merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6139 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-05-02 12:27:04 +00:00 |
|
|
vAugagneur
|
35ff645731
|
//merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6124 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-29 12:34:09 +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 |
|
|
aFolletete
|
6e34cc3f77
|
// merge
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6062 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-25 12:07:31 +00:00 |
|
|
gBrunier
|
66494a5a83
|
[-] BO : Fixed #PSCFI-1624 - Extra forward slash
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6058 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-24 17:53:37 +00:00 |
|
|
gBrunier
|
a79b9537ac
|
[-] BO : Fixed #PSCFI-1624 - Extra forward slash
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6057 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-24 17:53:29 +00:00 |
|
|
fBrignoli
|
43b6a41bbc
|
// merge 1.4 (5397)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6048 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-22 16:00:58 +00:00 |
|
|
tDidierjean
|
38cf360a0b
|
// merge 6001,6010,6012,6013
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6018 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-21 08:01:09 +00:00 |
|
|
rGaillard
|
3d547dcae3
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6009 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-20 15:02:16 +00:00 |
|
|
aFolletete
|
6f98aff114
|
// merge form 1.4 version (rev. 5937)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5938 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-15 16:46:20 +00:00 |
|
|
fBrignoli
|
ca5e60f0b9
|
// merge 1.4 (5916) => 1.5.x
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5918 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-15 10:30:56 +00:00 |
|
|
tDidierjean
|
8c520c66a3
|
[-] BO : fixed bug #PSCFI-1429 - Deleting products does not remove image files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5913 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-15 10:10:23 +00:00 |
|
|
rGaillard
|
ccbf26dd75
|
[-] BO : Fixed #1205 error on updating product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5885 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-13 09:04:32 +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 |
|