Commit Graph

5386 Commits

Author SHA1 Message Date
rMalie 97c7e11df0 // Improve multishop ergonomy (new toolbar)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13333 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-15 10:04:05 +00:00
tDidierjean bc1580fcd4 [-] BO : fix PSTEST-753 - Warning Trying to get property of non-object in view.tpl sur la page commande
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13332 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-15 09:53:35 +00:00
rMalie 7ecda9a61d // French translations (by Xavier)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13330 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-15 09:36:22 +00:00
tDidierjean 8897f81335 // Fix bulk deletion of attributes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13327 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 17:34:08 +00:00
tDidierjean 3bf25c8205 // refactor AdminAttributesGroup
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13326 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 17:32:04 +00:00
mMarinetti 07a3754958 // fix upgrade fail when blockcms was not installed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13323 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 17:21:47 +00:00
bMancone 8b59727f67 // Fixed #PSTEST-650
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13322 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 17:20:57 +00:00
mDeflotte 20cfa8e266 [-] FO : #PSTEST-742 - Bad ajax return on authentification with unknow email address
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13321 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 17:10:01 +00:00
vChabot 79611fef59 // fix about upgrader and position in category_shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13319 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 16:54:22 +00:00
mDeflotte 0f8a9a9f69 // Add translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13318 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 16:39:55 +00:00
tDidierjean 2e0d20d9f1 [-] BO : fix bug #PSFV-421 - bug with redirection after login
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13317 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 16:29:21 +00:00
mDeflotte 302ec45f56 // Add translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13316 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 16:29:06 +00:00
mDeflotte b6a46aad6e [-] MO : #PSFV-468 - In layered navigation, when you filter on some criteria, the "see the product" for resulting products targets to the regular product URL without filters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13315 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 16:09:22 +00:00
mDeflotte 33eb953495 // Fix bug with product image color loading on firefox
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13314 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 15:36:11 +00:00
bMancone b161565662 // Fixed #PSFV-508
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13313 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 15:30:04 +00:00
aFolletete 3f5d7edf0b // fixed bug #PSTEST-552
// Clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13312 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 15:08:40 +00:00
bMancone 605fb24471 // Fixed #PSFV-511
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13311 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 14:54:48 +00:00
mMarinetti 58d50f2e30 // fix update_order_canada missing column display method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13310 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 14:42:18 +00:00
tDidierjean cfd5143fe4 [-] BO : PSFV-435 : revert changes to tinyMCE formatting tools
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13309 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 14:33:53 +00:00
mDeflotte 1edd58883a // Blocklayered : change version number to the 1.8 + fix bug with smarty v2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13307 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 14:30:06 +00:00
rMalie 48ee130542 // French translations (by Xavier)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13306 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 14:10:17 +00:00
mDeflotte 92fdfd36bb // Use id_order for reference order for old orders (1.4)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13305 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 14:02:42 +00:00
rMalie b2ad614fd9 // Remove shop url when a shop is deleted #PSTEST-747
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13304 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 13:50:04 +00:00
rMalie cecc3721d4 // Improve multishop ergonomy with a link to missing url on shop list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13303 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 13:20:17 +00:00
rMalie 6af101f339 // class_index
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13302 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 13:19:18 +00:00
vChabot 6800f9f67d [-] BO : BugFix : #PSTEST-750 : upgrade sql updated (position field added to the category_shop table)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13301 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 13:14:07 +00:00
tDidierjean 3311fd7d25 // AdminController refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13300 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 10:47:40 +00:00
bMancone 79f75172c8 // Fixed #PSFV-513
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13299 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 10:47:30 +00:00
tDidierjean c2eaa4af59 [-] BO : fix Save&Stay not working on combination page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13298 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 10:44:08 +00:00
bMancone a2f5ef3084 // Missing translation in AdminWarehousesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13297 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 10:40:08 +00:00
aFolletete 8170309cfa // CHANGELOG
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13296 b9a71923-0436-4b27-9f14-aed3839534dd
1.5.0.5
2012-02-14 10:38:44 +00:00
bMancone 8717d76664 // Improved AdminWarehousesController form
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13294 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 10:37:56 +00:00
mDeflotte e58ca980cd [-] Classes : #PSTEST-717 - Fix an infinite loop
// Add missing params $products

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13293 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 10:36:53 +00:00
rMalie 4d90475bb1 // Theme installator is now installed by default
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13291 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 10:27:33 +00:00
rMalie 21069be951 [-] MO : theme installator module does not erase anymore already existing modules #PSFV-476
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13287 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 10:07:56 +00:00
bMancone 1268bfb92a // Improved Suppliers view
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13286 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 10:07:20 +00:00
rMalie bc016fc498 // Optimization on Product cache
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13283 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 09:39:18 +00:00
rMalie b6b7800c2b // Improve PS profiling
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13281 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 09:27:41 +00:00
vChabot 66eea2abb5 [-] BO : BugFix : #PSFV-497 : Root category in AdminTracking removed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13280 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 08:42:47 +00:00
mDeflotte 7d64fa4d60 [-] Classes : #PSTEST-275 #PSFV-304 - Method Module::getPosition() was missing
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13279 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 08:35:31 +00:00
dMetzger 89286d1b44 [-] Installer : set_time_limit is set to infinite then set to 300 seconds... Second one changed.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13278 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 08:25:38 +00:00
rGaillard 45be084be5 // Add default quantity in BackOffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13277 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 18:52:44 +00:00
rGaillard 8c2a9eb4e8 // Fix product deletion in backOffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13276 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 18:38:59 +00:00
dMetzger ec0798fe8a [-] FO : If a product is given for free in a cart rule and is already in the cart, the price is subtracted #PSTEST-715
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13275 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 17:47:40 +00:00
tDidierjean 1c6b736418 // revert wrong change ($_FILES is needed in afterImageUpload()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13274 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 17:38:03 +00:00
tDidierjean 4b9bcd5932 [-] BO : #PSTEST-705 fix scene image upload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13273 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 17:36:34 +00:00
rMalie e15452ce61 // Fix quick link access for multishop #PSFV-478 #PSTEST-687
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13272 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 17:22:12 +00:00
mDeflotte f562effdbd [-] BO : #PSFV-498 - On editing attribute (group) the attribute is dupplicated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13271 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 17:14:45 +00:00
rMalie d92c298178 // Fix redirection to index when friendly url are activated #PSFV-488
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13270 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 16:56:28 +00:00
rMalie 59de645ec9 // Fix last smiley in installer + some translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13269 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 16:45:43 +00:00