rMalie
|
6fc10e23f8
|
// Some fix on canonical URL + remove PS_HOMEPAGE_PHP_SELF configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7853 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-02 14:24:28 +00:00 |
|
rMalie
|
921fbcd564
|
// Remove AdminAppearance
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7845 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-02 12:23:11 +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 |
|
rMalie
|
ab5fc723b4
|
// Routes for dispatcher (part 4) + some fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7830 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-01 13:28:02 +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 |
|
dMetzger
|
a2b32fb056
|
[-] IN : missing entries in accesses table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7817 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-31 11:58:31 +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
|
4caa9d2775
|
// fix sql
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7722 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-25 14:36:30 +00:00 |
|
rMalie
|
6814ae87c6
|
// Carrier range price / weight for multishop + fix duplicate of carrier_lang when a new shop is created
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7716 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-25 10:32:56 +00:00 |
|
rMalie
|
e08b70a242
|
// Carrier association + discount association
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7696 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-22 15:53:07 +00:00 |
|
rMalie
|
10e68bda6b
|
// Add scenes for multistore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7692 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-22 12:27:42 +00:00 |
|
tDidierjean
|
e72ae93557
|
// Context part 17
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7688 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-22 09:35:28 +00:00 |
|
rMalie
|
e62be3d793
|
// id_shop on cart product (for links) + change Shop::sqlAsso() + share_order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7687 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-22 08:57:51 +00:00 |
|
tDidierjean
|
20276404a8
|
// Context part 7
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7629 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-15 13:59:26 +00:00 |
|
rMalie
|
4f3aad65e3
|
// Multishop for referrers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7583 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-11 13:03:26 +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 |
|
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 |
|
tDidierjean
|
be17931df6
|
// merge 6036 6069 6071 6093
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6094 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-28 11:32:07 +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 |
|
tDidierjean
|
cd6fd464b1
|
[-] SQL : removed unsigned from product stock quantity field
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5933 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-15 15:42:12 +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 |
|