 rGaillard
|
9b6824a825
|
// Replacement of AdminTab by AdminController on modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10334 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 11:06:35 +00:00 |
|
|
rMalie
|
9d10de0848
|
// Merge -> 10309
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 11:05:10 +00:00 |
|
|
vSchoener
|
c5dd56aa5f
|
// update paypal version
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9720 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-28 14:11:13 +00:00 |
|
|
vSchoener
|
6b32d53742
|
[+] MO : Update Paypal to use the new system to store payment cc details
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9718 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-28 14:07:57 +00:00 |
|
|
rMalie
|
577221ff08
|
// Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9178 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-10 12:18:56 +00:00 |
|
|
rMalie
|
b4d436ca21
|
// Merge -> revision 9061
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9069 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-05 15:21:55 +00:00 |
|
|
rMalie
|
3620f0837f
|
// Merge -> 8910
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8917 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-30 08:17:25 +00:00 |
|
|
rMalie
|
79fd72e461
|
// Merge -> revision 8342
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8344 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-05 14:56:02 +00:00 |
|
|
rMalie
|
0aada6cc1e
|
// Merge -> revision 8097
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8100 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-17 16:10:20 +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
|
2b05b5308c
|
// Merge -> revision 8076
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8081 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-17 08:15:38 +00:00 |
|
|
rMalie
|
52d1d13891
|
// Merge -> revision 8014
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8021 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 12:00:05 +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 |
|
|
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
|
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 |
|
|
tDidierjean
|
5d090a25b3
|
// Context part 27
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7812 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-29 14:29:57 +00:00 |
|
|
rMalie
|
a1a32714ab
|
// Fix #PSFV-30 + context part 24
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7792 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 14:12:17 +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 |
|
|
rMalie
|
1a462e0a85
|
// Fix strict standard on paymentModule + fix stats SQL bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7689 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-22 09:49:29 +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
|
2ee764963b
|
// Fix shop association on new object + some strict standard for Franck
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7584 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-11 13:18:17 +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
|
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 |
|