 rMalie
|
382584ad35
|
// Fix all category_lang sql restrictions with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8124 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-19 14:21:45 +00:00 |
|
|
rMalie
|
31e78477ef
|
// Fix module blockmaccount with context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8122 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-19 14:04:41 +00:00 |
|
|
rMalie
|
7cadad5d3e
|
// Fix all product_lang sql restrictions with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8121 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-19 14:01:23 +00:00 |
|
|
rMalie
|
a1843c1900
|
// Merge -> revision 8114
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8115 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-19 09:46:12 +00:00 |
|
|
fBrignoli
|
f371f3e3bc
|
[*] Project : US + CA TaxSystem
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8105 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-18 10:10:50 +00:00 |
|
|
rMalie
|
0aada6cc1e
|
// Merge -> revision 8097
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8100 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-17 16:10:20 +00:00 |
|
|
tDidierjean
|
39d005f222
|
// Context part 32
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8095 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-17 13:40:05 +00:00 |
|
|
rMalie
|
7481712923
|
// Fix display of breadcrumb (dont show categories disabled) + it's now impossible to browse categories outside of root category for shops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8089 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-17 12:32:04 +00:00 |
|
|
tDidierjean
|
cb3d802346
|
// Context part 31
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8087 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-17 10:07:12 +00:00 |
|
|
rMalie
|
b8706ddd8a
|
// Fix homefeatured products for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8086 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-17 09:41:28 +00:00 |
|
|
rMalie
|
2b05b5308c
|
// Merge -> revision 8076
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8081 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-17 08:15:38 +00:00 |
|
|
rMalie
|
21ca4d15d7
|
// Merge -> revision 8059
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8062 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-16 09:10:40 +00:00 |
|
|
gBrunier
|
bbb8acc0de
|
//Changing version
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8056 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-12 14:47:18 +00:00 |
|
|
gBrunier
|
f06172fc2e
|
[-] MO : Duplicate condition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8052 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-12 11:57:11 +00:00 |
|
|
gBrunier
|
7a01e42704
|
[-] MO : Replace ps_ by _DB_PREFIX_
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8050 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-12 10:11:11 +00:00 |
|
|
gBrunier
|
0eb73c212a
|
[+] MO : Adding the favoriteproducts module - Part2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8047 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-12 08:14:09 +00:00 |
|
|
rMalie
|
49468717c2
|
// Fix #PSFV-48
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8032 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 14:42:31 +00:00 |
|
|
gBrunier
|
e9acb86ac5
|
[*] MO : Review of the productcomments module - Part3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8022 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 12:07:25 +00:00 |
|
|
rMalie
|
52d1d13891
|
// Merge -> revision 8014
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8021 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 12:00:05 +00:00 |
|
|
rMalie
|
d1d4d57eca
|
// Revert normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8019 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 10:20:59 +00:00 |
|
|
rMalie
|
f62cdb1963
|
// Normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8017 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 09:58:20 +00:00 |
|
|
gBrunier
|
9cf09cbc7c
|
[*] MO : Review of the productcomments module - Part2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8016 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 09:48:49 +00:00 |
|
|
rMalie
|
e093ecd554
|
// Fix on shops + remove id_group_shop from stock + fix stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8015 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 09:38:24 +00:00 |
|
|
tDidierjean
|
eb2c483f2f
|
// changes to header and footer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7997 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-10 13:11:56 +00:00 |
|
|
rMalie
|
7411db9a69
|
// Merge -> revision 7979
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7981 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-10 08:36:17 +00:00 |
|
|
gBrunier
|
3957de6087
|
[+] MO : Adding the favoriteproducts module - Part1
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7978 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 16:35:11 +00:00 |
|
|
tDidierjean
|
decbcc7246
|
// fix loyalty module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7968 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 14:54:17 +00:00 |
|
|
rMalie
|
bdc18d1d39
|
// Fix Shop::SHARE_ORDER and Shop::SHARE_CUSTOMER on statistics
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7959 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 13:42:03 +00:00 |
|
|
rMalie
|
47a4f7f31e
|
// Merge -> revision 7941
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7948 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 16:01:47 +00:00 |
|
|
tDidierjean
|
653ef8d115
|
// Context part 29
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7935 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 13:17:12 +00:00 |
|
|
gBrunier
|
4d2740eb35
|
[*] MO : Review of the productcomments module - Part1
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7918 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-05 15:09:46 +00:00 |
|
|
fBrignoli
|
13da28a2a8
|
[~] Hook::get replaced by Hook::getIdByName
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7916 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-05 14:49:18 +00:00 |
|
|
rMalie
|
01868b944c
|
// Fix on module product comment for context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7914 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-05 14:21:16 +00:00 |
|
|
rMalie
|
239f92eaf1
|
// Merge -> revision 7906
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7909 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-05 13:26:44 +00:00 |
|
|
rMalie
|
f2b5ee338b
|
// Merge -> revision 7875
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7877 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-03 16:16:49 +00:00 |
|
|
rMalie
|
26efd329a3
|
// Move theme choice from AdminTheme page to Shop page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7848 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-02 13:47:34 +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
|
c945049ef1
|
// Some fix + improve ergonomy + Tools::isMultiShopActived() moved in Shop class + 1.5.0.1 version in install script
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7842 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-02 09:54:23 +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 |
|
|
tDidierjean
|
b3b7dd32bf
|
// Context part 28
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7814 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-29 15:06:20 +00:00 |
|
|
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 |
|
|
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
|
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
|
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 |
|
|
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 |
|
|
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 |
|