 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
|
35748d1b8f
|
// Fix #PSFV-6
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7807 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-29 10:02:55 +00:00 |
|
|
tDidierjean
|
d80c7b5ba8
|
// Context part 26
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7804 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 16:37:50 +00:00 |
|
|
rMalie
|
72de3384a7
|
// Fix #PSFV-12
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7795 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 14:38:46 +00:00 |
|
|
tDidierjean
|
d3b2ff2664
|
// Context part 25
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7794 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 14:17:58 +00:00 |
|
|
rMalie
|
a1a32714ab
|
// Fix #PSFV-30 + context part 24
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7792 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 14:12:17 +00:00 |
|
|
rMalie
|
31ed17058c
|
// Revert test
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7791 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 14:05:38 +00:00 |
|
|
rMalie
|
939d2a0cf5
|
// test
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7789 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 14:04:21 +00:00 |
|
|
rMalie
|
ad3e1f1804
|
// Fix #PSFV-31
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7788 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 13:53:51 +00:00 |
|
|
rMalie
|
d822f2a373
|
// Fix #PSFV-32
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7787 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 13:51:29 +00:00 |
|
|
rMalie
|
e990ded287
|
// Fix #PSFV-35
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7785 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 13:48:02 +00:00 |
|
|
rMalie
|
6a99789015
|
// Fix #PSFV-34
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7784 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 13:43:56 +00:00 |
|
|
rMalie
|
77603244c0
|
// Fix #PSFV-37
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7783 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 13:26:46 +00:00 |
|
|
rMalie
|
8bfd44085d
|
// Some fix after merge
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7781 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 13:03:43 +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
|
df255f66c1
|
// Context part 23
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7765 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 15:08:15 +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
|
4ade3a0ea0
|
// remove 1.4 deprecated functions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7755 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 09:51:43 +00:00 |
|
|
tDidierjean
|
86fd2a4648
|
// Context part 22
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7753 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 09:01:00 +00:00 |
|
|
rMalie
|
3557765c59
|
// Fix #PSFV-25
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7752 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 08:36:23 +00:00 |
|
|
rMalie
|
85fb88a2a4
|
// Fix #PSFV-24
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7751 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 08:32:52 +00:00 |
|
|
rMalie
|
8ef7835cd6
|
// Fix #PSFV-21
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7748 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 08:15:21 +00:00 |
|
|
rMalie
|
ad270d5ea8
|
// Fix #PSFV-20
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7747 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 08:12:31 +00:00 |
|
|
rMalie
|
ad27647a98
|
// Fix #PSFV-38
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7746 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 08:08:37 +00:00 |
|
|
rMalie
|
dd5109b3f5
|
// Fix adminMeta page + bug #PSFV-39
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7745 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 08:03:00 +00:00 |
|
|
rMalie
|
c9ad75fe11
|
// Routes for dispatcher (part 3)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7743 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-26 16:47:41 +00:00 |
|
|
tDidierjean
|
d05d16d399
|
// Context part 21
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7742 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-26 16:40:17 +00:00 |
|
|
tDidierjean
|
51b4c8591d
|
// Context part 20
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7740 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-26 15:55:04 +00:00 |
|
|
tDidierjean
|
fddc7a6a75
|
// fix missing context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7738 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-26 14:55:04 +00:00 |
|
|
rMalie
|
4f76b91de5
|
// Routes for dispatcher (part 2)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7728 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-25 20:16:53 +00:00 |
|
|
rMalie
|
771e36aecb
|
// Routes for dispatcher (part 1)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7727 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-25 17:33:46 +00:00 |
|
|
tDidierjean
|
0fbd146713
|
// Context part 19
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7724 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-25 16:42:48 +00:00 |
|
|
tDidierjean
|
9e349dd274
|
// Context part 18
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7723 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-25 15:19:39 +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
|
90efde2a00
|
// alias.php is now included from autoload.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7693 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-22 12:36:57 +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 |
|
|
rMalie
|
1a462e0a85
|
// Fix strict standard on paymentModule + fix stats SQL bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7689 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-22 09:49:29 +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
|
9619b93c73
|
// fix delete customization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7681 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-21 16:41:12 +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
|
ff2df3e3b3
|
// Improve Db class + add _db.php class in overrides for bench
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7678 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-21 12:02:25 +00:00 |
|
|
tDidierjean
|
884e95f307
|
// fix mysql insert_id
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7671 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-21 08:05:53 +00:00 |
|
|
rMalie
|
811018f78c
|
// Fix abstract static methods in Db class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7670 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-20 16:15:05 +00:00 |
|
|
rMalie
|
d1510f6f36
|
// Add file config/alias.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7669 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-20 16:13:22 +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 |
|
|
rMalie
|
42da42f827
|
// Context part 16 (shops)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7664 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-20 12:08:15 +00:00 |
|