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 |
|
tDidierjean
|
b45dd02452
|
// remove deprecated PS_ADMIN_DIR by _PS_ADMIN_DIR_
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8666 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-20 15:53:57 +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
|
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
|
89fcb38dc7
|
// Force install of modules in global context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8178 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-24 15:04:50 +00:00 |
|
tDidierjean
|
39d005f222
|
// Context part 32
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8095 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-17 13:40:05 +00:00 |
|
fBrignoli
|
28025e0ff6
|
// Comment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8079 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-16 16:05:16 +00:00 |
|
rMalie
|
c945049ef1
|
// Some fix + improve ergonomy + Tools::isMultiShopActived() moved in Shop class + 1.5.0.1 version in install script
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7842 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-02 09:54:23 +00:00 |
|
dMetzger
|
287a5f42dc
|
[+] BO : you can now set detailed permissions for each module in the back end
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7818 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-31 16:39:53 +00:00 |
|
tDidierjean
|
d3b2ff2664
|
// Context part 25
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7794 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 14:17:58 +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 |
|
tDidierjean
|
0dbcebf01e
|
// Context part 9
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7637 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-18 10:08:07 +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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|