 rMalie
|
2aa6b88d7e
|
// Some fix after merge
|
2011-07-28 13:03:43 +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 |
|
|
rMalie
|
33b431647d
|
// Fix #PSFV-25
|
2011-07-27 08:36:23 +00:00 |
|
|
rMalie
|
9f285198be
|
// Fix adminMeta page + bug #PSFV-39
|
2011-07-27 08:03:00 +00:00 |
|
|
rMalie
|
beb5eff300
|
// Routes for dispatcher (part 3)
|
2011-07-26 16:47:41 +00:00 |
|
|
tDidierjean
|
b7fb4cd8b9
|
// fix missing context
|
2011-07-26 14:55:04 +00:00 |
|
|
rMalie
|
3a97b4b6f3
|
// Routes for dispatcher (part 2)
|
2011-07-25 20:16:53 +00:00 |
|
|
tDidierjean
|
a96064b13d
|
// Context part 19
|
2011-07-25 16:42:48 +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
|
a264942b1a
|
// removing cookie from product customization
|
2011-07-21 14:38:04 +00:00 |
|
|
rMalie
|
766a38dcd7
|
// Add config/alias.php file + refactoring of DB / MySQL classes
|
2011-07-20 16:10:12 +00:00 |
|
|
rMalie
|
73d6f4267b
|
// Context part 16 (shops)
|
2011-07-20 12:08:15 +00:00 |
|
|
rMalie
|
02a738dce1
|
// Context part 15
|
2011-07-19 16:17:14 +00:00 |
|
|
rMalie
|
0060d1edab
|
// Remove some other mysql_ in code
|
2011-07-19 11:51:12 +00:00 |
|
|
rMalie
|
5c16ddce4a
|
// No more mysql_error() hard coded !
|
2011-07-19 11:35:33 +00:00 |
|
|
tDidierjean
|
52339502b6
|
// Context part 12
|
2011-07-19 09:28:11 +00:00 |
|
|
rMalie
|
ff81f71449
|
// Context in modules + Shop::sql* methods
|
2011-07-19 09:23:10 +00:00 |
|
|
tDidierjean
|
6551a3ece7
|
// Context part 11
|
2011-07-18 15:50:58 +00:00 |
|
|
rMalie
|
e16a8ab8d3
|
// Context part 10
|
2011-07-18 15:27:32 +00:00 |
|
|
tDidierjean
|
bc5d36821d
|
// Context part 9
|
2011-07-18 10:08:07 +00:00 |
|
|
tDidierjean
|
6e93cc2848
|
// Context part 7
|
2011-07-15 13:59:26 +00:00 |
|
|
tDidierjean
|
c8acd7a824
|
// Context part 6
|
2011-07-13 16:35:06 +00:00 |
|
|
tDidierjean
|
b09c76f5b4
|
// Context part 5
|
2011-07-13 15:24:38 +00:00 |
|
|
rMalie
|
8981b6aaee
|
// Refactoring of shop class with new context Part 2
|
2011-07-13 12:52:09 +00:00 |
|
|
rMalie
|
2d77925e7d
|
// Refactoring of shop class with new context
|
2011-07-12 16:28:20 +00:00 |
|
|
rMalie
|
286a374353
|
// Context
|
2011-07-12 13:50:15 +00:00 |
|
|
tDidierjean
|
89920e17fd
|
// Context part 2
|
2011-07-12 12:50:00 +00:00 |
|
|
rMalie
|
502942002d
|
// Hook modules exceptions now works with new dispatcher
|
2011-07-11 15:16:16 +00:00 |
|
|
tDidierjean
|
139bb84f87
|
// Context - first commit
|
2011-07-11 14:32:05 +00:00 |
|
|
rMalie
|
55007357e1
|
// Multishop for referrers
|
2011-07-11 13:03:26 +00:00 |
|
|
rMalie
|
52be7fe939
|
// Some fix + multistore for import tools
|
2011-07-07 12:18:27 +00:00 |
|
|
rMalie
|
460e7293a7
|
// Generate .htaccess in adminShopUrl
|
2011-07-06 14:35:19 +00:00 |
|
|
rMalie
|
d62e3da234
|
|
2011-07-06 13:54:12 +00:00 |
|
|
rGaillard
|
692c1e9c8d
|
|
2011-07-06 13:26:34 +00:00 |
|
|
rGaillard
|
ebfae73353
|
|
2011-07-06 12:45:27 +00:00 |
|
|
rGaillard
|
8fc7f11014
|
|
2011-07-06 10:54:11 +00:00 |
|
|
rGaillard
|
d1a13007b9
|
|
2011-07-06 10:10:43 +00:00 |
|
|
mMarinetti
|
6b5b375b4b
|
[-] BO : Fixed #PSCFI-1736 - in AdminTranslations.php, only theme directory are parsed (and not files)
|
2011-05-02 15:50:39 +00:00 |
|
|
vAugagneur
|
5474660f47
|
//merge 1.4 => 1.5
|
2011-05-02 12:27:04 +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 |
|
|
aFolletete
|
37130dd53c
|
// merge
|
2011-04-25 12:07:31 +00:00 |
|
|
gBrunier
|
e45a1fe324
|
[-] BO : Fixed #PSCFI-1624 - Extra forward slash
|
2011-04-24 17:53:37 +00:00 |
|
|
gBrunier
|
bf44dfe388
|
[-] BO : Fixed #PSCFI-1624 - Extra forward slash
|
2011-04-24 17:53:29 +00:00 |
|