Commit Graph

17570 Commits

Author SHA1 Message Date
Damien Metzger 5f4b6a6534 // After a successful install of a single module that has a configuration method, to the configuration page 2013-06-18 09:12:41 +02:00
Kevin Granger 3bdf86e634 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-06-17 19:19:28 +02:00
Rémi Gaillard c5069aaa15 [-] WS: Fix accessories duplication on product update 2013-06-17 18:56:09 +02:00
Kevin Granger 993690801e // Small changes with layout an css 2013-06-17 18:49:45 +02:00
gRoussac aea53e034a [*] BO : Enable current subtab active class 2013-06-17 18:27:07 +02:00
sLorenzini 8fabee091b [-] FO: Fixed bug PrestaShop 1.5.4.1 Catalog Mode Display Incorrect Header (mis-aligned) - #PSCFV-9327 2013-06-17 16:35:16 +02:00
Damien Metzger d9245a31c8 // Removed deprecated parameter in AdminCustomerThreads / displaydate 2013-06-17 12:17:09 +02:00
Damien Metzger 3f0fa3f925 // Fixed warning 2013-06-17 12:15:10 +02:00
Damien Metzger aefc22bb10 [-] BO : fixed quote issue with magic quote in customization in adminorders #PSCFV-9311 2013-06-17 11:40:35 +02:00
Damien Metzger c53d2d04ce [-] BO : fixed parsing of discount value in AdminOrders #PSCFV-9481 2013-06-17 11:16:16 +02:00
Axome 6e383a2d38 Prevent false error for product duplication 2013-06-17 10:16:13 +02:00
Gregory Roussac 3a5a9dea14 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-15 01:57:46 +02:00
Gregory Roussac ce9f262feb [-] BO : Upload image name with trailing slash in name 2013-06-15 01:55:02 +02:00
Kevin Granger 6648fd3e97 // Reset Bootstrap for backward compatibility 2013-06-14 19:25:18 +02:00
Damien Metzger 319413ca25 // Added errors to user assistance 2013-06-14 15:08:36 +02:00
Vincent Augagneur 148cb6c123 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-14 15:01:27 +02:00
Vincent Augagneur 6778b17b23 [-] BO - fixed bug #PSCFV-9347 - Saving the E-Mail preferences loses the smtp server password 2013-06-14 15:01:22 +02:00
Damien Metzger eae2a16442 // Removed button hide in contact form (create issues with the back button in the browser for example) 2013-06-14 11:56:47 +02:00
Rémi Gaillard 909a459e5d // miss ; 2013-06-14 11:49:04 +02:00
Rémi Gaillard 7a65f478b6 // miss ; 2013-06-14 11:48:27 +02:00
Damien Metzger 12e13e275f [-] BO : fixed ajax in permissions tab #PSCFV-7442 2013-06-14 11:20:38 +02:00
Vincent Augagneur 2ae0e4f844 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-14 11:17:18 +02:00
Vincent Augagneur ff63e0a28c [-] BO : fixed bug #PSCFV-9405 - Delete file of downloadable product when cancel 2013-06-14 11:17:07 +02:00
Damien Metzger 331dcc4d6e [-] BO : Fixed permission update #PSCFV-7441 2013-06-14 10:48:24 +02:00
Damien Metzger 5493010e67 [-] BO : postcode required in manufacturer address 2013-06-14 10:25:37 +02:00
gRoussac 39320ad866 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-14 10:22:51 +02:00
gRoussac 9260a43d7d [-] INSTALLER : Shown index can return empty array 2013-06-14 10:20:48 +02:00
Damien Metzger ff876034b4 // Fixed display of the image option "legacy system" 2013-06-14 09:57:00 +02:00
Damien Metzger 76f686a95b Merge pull request #496 from matthieume/master
[*] FO : NewProductController: new products page must display latest products first.
2013-06-14 00:28:39 -07:00
Rémi Gaillard 7a91d4b4dd // small fix on toolbar 2013-06-13 19:23:58 +02:00
Damien Metzger 1a2ee6c8be Merge pull request #489 from axome/core_cartrule_gift_with_same_category_restriction
[-] CORE : CartRule::checkProductRestrictions : A gift product in the same category as its restrictions causes the gift to stay in the cart even if emptied
2013-06-13 10:13:22 -07:00
Damien Metzger cd6f415dc1 [-] BO : fixed link in AdminTracking #PSCFV-7409 2013-06-13 18:38:00 +02:00
Kevin Granger b0eaf8124c [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:19:50 +02:00
Vincent Augagneur 4a1de9bf31 Merge pull request #495 from SebSept/development
[-] BO : fix require path to config.inc.php
2013-06-13 09:07:26 -07:00
Kevin Granger 86ef69c9ba [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:03:34 +02:00
Seb 6a2eddd81f [-] BO : fix require path to config.inc.php 2013-06-13 17:59:01 +02:00
Vincent Augagneur 518998ded2 //added bootstrap in BO 2013-06-13 16:35:14 +02:00
Damien Metzger 80908e0a6f [-] MO : do not check the VAT number if the module is disabled #PSCFV-9397 2013-06-13 16:34:34 +02:00
Damien Metzger be0d6f1c6c // Just to be sure that we will not have any regression 2013-06-13 15:35:17 +02:00
Damien Metzger 534c10562f [*] Installer : added cookie mode instead of session for the installer 2013-06-13 15:28:16 +02:00
Rémi Gaillard fafb7fdef7 [-] BO: Fix #PSCFV-8904 bad id_warehouse is stored on ps_address table 2013-06-13 15:05:55 +02:00
Rémi Gaillard f5dfb12e4d [-] BO: association of product attributes on associating a product to another shop #PSCFV-8735 2013-06-13 14:30:21 +02:00
Rémi Gaillard e8288c5d7a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-13 12:02:09 +02:00
Rémi Gaillard 5bf4c17f4a [-] WS: Fix webservice sort for multishop fields #PSCFV-5634 2013-06-13 12:01:51 +02:00
Damien Metzger ecf59957ba [-] FO : fixed pdf template #PSCFV-9430 2013-06-13 11:18:03 +02:00
Damien Metzger babfbaa2d2 // Added missing space in installer 2013-06-13 11:00:01 +02:00
Damien Metzger d6b884b7b5 [-] MO : removed doubled "/" in homeslider template #PSCFV-9439 2013-06-13 10:34:35 +02:00
Damien Metzger e4535e892d [-] MO : fixed editorial issue when the entity does not exist yet for a shop #PSCFV-9442 2013-06-13 10:31:39 +02:00
Damien Metzger a4e6ddf29c [*] MO : blocklayered optimization 2013-06-13 09:42:34 +02:00
Damien Metzger b401ceb9d9 [-] MO : do not truncate order return state in pscleaner #PSCFV-9431 2013-06-13 08:57:31 +02:00