 rMalie
|
c17e7c236d
|
// MERGE with 1.4 r7770
|
2011-07-28 09:20:57 +00:00 |
|
|
tDidierjean
|
60b07cacb9
|
// Context part 23
|
2011-07-27 15:08:15 +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
|
21017fb5d8
|
// remove 1.4 deprecated functions
|
2011-07-27 09:51:43 +00:00 |
|
|
tDidierjean
|
55ee922b16
|
// Context part 22
|
2011-07-27 09:01:00 +00:00 |
|
|
rMalie
|
351a7d7202
|
// Fix #PSFV-24
|
2011-07-27 08:32:52 +00:00 |
|
|
rMalie
|
03b5d8ae50
|
// Fix #PSFV-20
|
2011-07-27 08:12:31 +00:00 |
|
|
rMalie
|
833e7b3f35
|
// Fix #PSFV-38
|
2011-07-27 08:08:37 +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
|
ea890721e8
|
// Context part 21
|
2011-07-26 16:40:17 +00:00 |
|
|
tDidierjean
|
a64edf3ff6
|
// Context part 20
|
2011-07-26 15:55:04 +00:00 |
|
|
rMalie
|
3a97b4b6f3
|
// Routes for dispatcher (part 2)
|
2011-07-25 20:16:53 +00:00 |
|
|
rMalie
|
611b180b82
|
// Routes for dispatcher (part 1)
|
2011-07-25 17:33:46 +00:00 |
|
|
tDidierjean
|
a96064b13d
|
// Context part 19
|
2011-07-25 16:42:48 +00:00 |
|
|
tDidierjean
|
2c4f27f1be
|
// Context part 18
|
2011-07-25 15:19:39 +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
|
89bcfec297
|
// fix delete customization
|
2011-07-21 16:41:12 +00:00 |
|
|
tDidierjean
|
a264942b1a
|
// removing cookie from product customization
|
2011-07-21 14:38:04 +00:00 |
|
|
rMalie
|
5e3d0882ad
|
// Improve Db class + add _db.php class in overrides for bench
|
2011-07-21 12:02:25 +00:00 |
|
|
tDidierjean
|
b393cb506b
|
// fix mysql insert_id
|
2011-07-21 08:05:53 +00:00 |
|
|
rMalie
|
c9ba8338b4
|
// Fix abstract static methods in Db class
|
2011-07-20 16:15:05 +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
|
1fdf4400b7
|
// Fix minor bugs
|
2011-07-19 14:10:44 +00:00 |
|
|
rMalie
|
290e1f1f87
|
|
2011-07-19 13:55:53 +00:00 |
|
|
tDidierjean
|
c620f4ce09
|
// Context part 14
|
2011-07-19 12:28:30 +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 |
|
|
rMalie
|
ba2922a823
|
// Context part 13
|
2011-07-19 09:44:10 +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 |
|
|
rMalie
|
4b7dee58b7
|
|
2011-07-18 15:37:31 +00:00 |
|
|
rMalie
|
e16a8ab8d3
|
// Context part 10
|
2011-07-18 15:27:32 +00:00 |
|
|
tDidierjean
|
badba064b2
|
// Context part 8
|
2011-07-15 16:41:39 +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
|
cb3f2f7b52
|
|
2011-07-13 13:26:40 +00:00 |
|
|
rMalie
|
8981b6aaee
|
// Refactoring of shop class with new context Part 2
|
2011-07-13 12:52:09 +00:00 |
|
|
tDidierjean
|
375607f8a5
|
// Context part 4
|
2011-07-13 07:51:09 +00:00 |
|
|
rMalie
|
daec4c3e93
|
|
2011-07-12 16:28:33 +00:00 |
|
|
rMalie
|
2d77925e7d
|
// Refactoring of shop class with new context
|
2011-07-12 16:28:20 +00:00 |
|
|
tDidierjean
|
e7ea230525
|
// Context part 3
|
2011-07-12 16:25:27 +00:00 |
|