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 |
|
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
|
fd645ddb80
|
// Merge -> revision 8123
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8125 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-19 14:27:41 +00:00 |
|
rMalie
|
21ca4d15d7
|
// Merge -> revision 8059
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8062 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-16 09:10:40 +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 |
|
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
|
2c493137c3
|
// Context part 11
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7644 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-18 15:50:58 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|