rMalie
|
792ce71cd4
|
// Merge -> revision 7979
|
2011-08-10 08:36:17 +00:00 |
|
rMalie
|
c3ac9dffa7
|
// Some fix on canonical URL + remove PS_HOMEPAGE_PHP_SELF configuration
|
2011-08-02 14:24:28 +00:00 |
|
rMalie
|
7506710b75
|
// Remove AdminAppearance
|
2011-08-02 12:23:11 +00:00 |
|
rMalie
|
e2c8d89e41
|
// Merge with revision 7841
|
2011-08-02 11:43:58 +00:00 |
|
rMalie
|
66eab15a18
|
// Routes for dispatcher (part 4) + some fix
|
2011-08-01 13:28:02 +00:00 |
|
dMetzger
|
33bbb70bfa
|
[+] BO : you can now set detailed permissions for each module in the back end
|
2011-07-31 16:39:53 +00:00 |
|
dMetzger
|
30b13ea43e
|
[-] IN : missing entries in accesses table
|
2011-07-31 11:58:31 +00:00 |
|
rMalie
|
c17e7c236d
|
// MERGE with 1.4 r7770
|
2011-07-28 09:20:57 +00:00 |
|
rMalie
|
5f6f018885
|
// REVERT MERGE
|
2011-07-27 13:35:06 +00:00 |
|
rMalie
|
233c0076b7
|
// MERGE with trunk revision 7754
|
2011-07-27 12:48:42 +00:00 |
|
tDidierjean
|
9b0b588b09
|
// fix sql
|
2011-07-25 14:36:30 +00:00 |
|
rMalie
|
8b2e514197
|
// Carrier range price / weight for multishop + fix duplicate of carrier_lang when a new shop is created
|
2011-07-25 10:32:56 +00:00 |
|
rMalie
|
0aba3ba000
|
// Carrier association + discount association
|
2011-07-22 15:53:07 +00:00 |
|
rMalie
|
3dbff71fcd
|
// Add scenes for multistore
|
2011-07-22 12:27:42 +00:00 |
|
tDidierjean
|
112b465f96
|
// Context part 17
|
2011-07-22 09:35:28 +00:00 |
|
rMalie
|
3f9a9e41d7
|
// id_shop on cart product (for links) + change Shop::sqlAsso() + share_order
|
2011-07-22 08:57:51 +00:00 |
|
tDidierjean
|
6e93cc2848
|
// Context part 7
|
2011-07-15 13:59:26 +00:00 |
|
rMalie
|
55007357e1
|
// Multishop for referrers
|
2011-07-11 13:03:26 +00:00 |
|
rGaillard
|
8fc7f11014
|
|
2011-07-06 10:54:11 +00:00 |
|
rGaillard
|
d1a13007b9
|
|
2011-07-06 10:10:43 +00:00 |
|
vAugagneur
|
05440b91e2
|
//merge 1.4 => 1.5
|
2011-04-29 12:34:09 +00:00 |
|
fBrignoli
|
b8f460ed46
|
// merge 1.4 => 6117
|
2011-04-29 09:09:38 +00:00 |
|
tDidierjean
|
02d1f7aa6a
|
// merge 6036 6069 6071 6093
|
2011-04-28 11:32:07 +00:00 |
|
fBrignoli
|
ff49083fb6
|
// merge 1.4 (5397)
|
2011-04-22 16:00:58 +00:00 |
|
tDidierjean
|
d8ba3119b1
|
[-] SQL : removed unsigned from product stock quantity field
|
2011-04-15 15:42:12 +00:00 |
|
fBrignoli
|
5e2884a8fa
|
// merge 1.4 (5916) => 1.5.x
|
2011-04-15 10:30:56 +00:00 |
|
aFolletete
|
05a58f53e6
|
// 1.5 branche creation
|
2011-04-12 18:24:40 +00:00 |
|