Commit Graph

1780 Commits

Author SHA1 Message Date
rMalie 4e0b3ed2f7 // Improve multishop ergonomy (you edit this field for) on languages fields
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8136 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-22 09:33:16 +00:00
rMalie fd645ddb80 // Merge -> revision 8123
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8125 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-19 14:27:41 +00:00
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 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 c7d4290206 // Fix admin referrers for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8120 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-19 13:07: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 14a8c84bdd [*] Project : Helper multiple select
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8110 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-18 16:36:28 +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 d9a7af17cc // Fix cacheFS (path constant was not always defined)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8102 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-18 08:16:10 +00:00
rMalie 5638172b38 // Add copy data of group shops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8101 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-18 07:57:04 +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
rMalie 89bc665d48 // Fix admin modules positions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8098 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 15:30:44 +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 51f2bf2617 // Fix carrier lang copy when a new shop is created + can duplicate data when editing a shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8094 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 13:37:15 +00:00
rMalie 549d5be0c7 // Fix options with bad multishop visibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8091 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 13:12:10 +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 751ae5d740 // Fix shop selection in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8083 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 08:59:04 +00:00
rMalie e86d668a49 // Fix download products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8080 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-16 16:22:13 +00:00
rMalie f6162845ab // Add a message when a shop is created to indicate that the user should create an URL for this shop + fix some bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8078 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-16 15:53:33 +00:00
fBrignoli 8e64aa20e9 // Exception removed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8077 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-16 15:53:04 +00:00
rMalie a1303a0cb0 // Add Core prefix for Stock and ProductCompare classes + fix main URL on shop URL + add some translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8072 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-16 14:13:04 +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
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
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
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
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 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
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 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
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