 rMalie
|
f0be4af34e
|
// Add skeleton core classes in override/classes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8065 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-16 09:49:28 +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
|
9e0333a664
|
[+] BO : CB-30 - Customer receive an email when a voucher is created in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8055 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-12 14:24:48 +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
|
4079e1c159
|
// Fix #PSFV-13
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8041 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 15:22:57 +00:00 |
|
|
rMalie
|
0e4b7fbd72
|
// Fix PDF controllers + order-detail template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8039 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 15:14:38 +00:00 |
|
|
tDidierjean
|
1dc910a60c
|
// fix pdf invoice when called from FO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8037 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 15:10:36 +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 |
|
|
tDidierjean
|
5ef6b3b0d6
|
// fix autoExecute with null values
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8030 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 14:32:04 +00:00 |
|
|
rMalie
|
3ab2ba9a75
|
// HTML flag can be used in ObjectModel->getTranslationsFieldsChild() to keep html on language fields
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8026 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 13:39:30 +00:00 |
|
|
rMalie
|
3c9fdb4e2c
|
// Fix install of ps_stock table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8025 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 12:45:43 +00:00 |
|
|
lBrieu
|
03596be790
|
[+] Add the TinyMCE editor on categories description
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8024 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 12:35:47 +00:00 |
|
|
lBrieu
|
a9b94cee4b
|
[+] Add the TinyMCE editor on categories description
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8023 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 12:34:52 +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
|
a01a13274a
|
// Fix Product->setStock()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8018 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 09:59:23 +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 |
|
|
lBrieu
|
eec48ed7b5
|
[+] Add the TinyMCE editor on categories description
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8013 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 09:10:28 +00:00 |
|
|
tDidierjean
|
09977516c2
|
// fix product comparison
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8012 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 08:39:52 +00:00 |
|
|
tDidierjean
|
7c67fd84c2
|
// Context part 30
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8008 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-10 16:45:48 +00:00 |
|
|
rMalie
|
183e1289c4
|
// Fix bug of toto on line 451 of carrier.php (he report modifications after change on signature function)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8007 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-10 16:04:59 +00:00 |
|
|
fBrignoli
|
aad6d1b6f3
|
// validateControler => validateController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8004 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-10 15:39:15 +00:00 |
|
|
bMancone
|
4de7854629
|
// Fix ObjectModel->associateTo()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8002 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-10 15:16:37 +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 |
|
|
rMalie
|
f4a3e88283
|
// Fix virtual uri rewrite in htaccess + keep old specific code in htaccess
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7980 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-10 08:08:32 +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 |
|
|
gBrunier
|
d36b369b45
|
// Fix getProductLink (double slash when id_shop)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7977 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 16:31:53 +00:00 |
|
|
rMalie
|
671162a5f5
|
[-] Add a new option in admin preference to recompile smarty templates only when they are updated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7976 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 16:25:40 +00:00 |
|
|
tDidierjean
|
d61637c5e5
|
// fix front controller initialization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7974 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 16:08:18 +00:00 |
|
|
fBrignoli
|
5f778cb23a
|
// debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7971 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 15:24:40 +00:00 |
|
|
fBrignoli
|
e22bc403e6
|
[-] Project : index file is now regenerated when a class is removed from the override directory
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7970 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 15:24:03 +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
|
f48b1ffc45
|
// Add cache on products stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7966 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 14:50:48 +00:00 |
|
|
rMalie
|
6e46649631
|
// Add cache on products stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7965 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 14:50:30 +00:00 |
|
|
tDidierjean
|
8d1435dfd0
|
// fix uninitialized front controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7964 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 14:46:03 +00:00 |
|
|
rMalie
|
269121a9c4
|
// Add cache on products stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7963 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 14:43:04 +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
|
a86e95fc5a
|
// Fix shop_url when no physical_uri + fix shop association when multistore is disactivated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7958 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-09 13:20:26 +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 |
|
|
fBrignoli
|
58769824ce
|
// replace !is_core by substr($classname, -4) != 'Core'
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7947 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 15:52:23 +00:00 |
|
|
rMalie
|
f0ee603966
|
// Fix some bugs on multistore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7944 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 15:31:32 +00:00 |
|
|
rMalie
|
f48792054a
|
// Fix some bugs on multistore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7942 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 15:24:21 +00:00 |
|
|
rMalie
|
8508481d36
|
// Add some comments in new autoload class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7939 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-08 14:24:32 +00:00 |
|