vAugagneur
|
01e1f8af09
|
[-] MO : fixed bug #PSCFV-2874 - blocklink_shop.id_shop is varchar, It must be integer.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16078 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-19 12:30:17 +00:00 |
|
vAugagneur
|
db52d33267
|
[-] MO : fixed bug #PSCFV-2853 - bug in the blocklink : you can not update the title block or edit links.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16076 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-19 09:29:22 +00:00 |
|
rGaillard
|
161f32b9e6
|
// Fix freeshipping on backoffice Order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15930 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-07 14:56:48 +00:00 |
|
rGaillard
|
2bce691ae8
|
// Improve performance and bug fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15882 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-06 16:22:48 +00:00 |
|
dMetzger
|
9e6341df71
|
// Code cleaning
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15849 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-05 11:51:46 +00:00 |
|
dMetzger
|
a6ca0bb1b2
|
// Code cleaning
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15770 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 16:18:10 +00:00 |
|
tDidierjean
|
d568269c56
|
[-] BO : fix bug #PSCFV-2268 - blocklink bug with multishop and link list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15120 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-09 14:59:01 +00:00 |
|
tDidierjean
|
b9497e80a7
|
[-] BO : fix bug #PSCFV-2231 - blocklink problem when not in multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15112 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-09 14:10:33 +00:00 |
|
rMalie
|
0c2dd0cd2f
|
// MERGE product_multistore branch : product fields are now editable per shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 13:32:12 +00:00 |
|
rMalie
|
48e9590cf4
|
// Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13991 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-03-09 09:19:30 +00:00 |
|
rMalie
|
2454cd7863
|
// Welcome 2012²
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 16:33:10 +00:00 |
|
rMalie
|
b0590e342e
|
// Fix default shop associations in helper shop #PSTEST-770
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13392 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-16 14:10:30 +00:00 |
|
rMalie
|
d514b6dc9b
|
// Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12746 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-27 10:28:56 +00:00 |
|
rMalie
|
a4d97911b1
|
[*] Classes : Db::autoExecute() call are now replaced by Db::insert() or Db::update()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12624 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-23 17:41:02 +00:00 |
|
rMalie
|
58433f1881
|
// Normalize + use $this->smarty instead of $this->context->smarty in modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11944 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-30 14:59:57 +00:00 |
|
rGaillard
|
b74fec078e
|
// BlockLink
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11639 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-22 16:46:02 +00:00 |
|
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
|
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
|
1b6d0d1be3
|
// Merge -> revision 8800
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8808 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-27 14:30:06 +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 |
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|