dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,926 Commits 9 Branches 19 Tags
e448ac8de5d59fdb697dfe071fdf4eabb53b6aaa
Commit Graph
20926 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Metzger 9fcb039068 // A few CSS fixes 2013-10-09 14:57:15 +02:00
Rémi Gaillard 6f1cdba40e // typo 2013-10-09 14:56:41 +02:00
Jerome Nadaud 4242e485c7 // Bootstrap design on getPath 2013-10-09 14:25:46 +02:00
Jerome Nadaud a1ced4ee32 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 14:07:17 +02:00
Jerome Nadaud 3cca8206b9 // Fix missing unwanted div 2013-10-09 14:06:22 +02:00
gRoussac df97566018 [-] BO : AdminImport no default value for separators 2013-10-09 13:57:36 +02:00
gRoussac 338efcad7f [-] CORE : $smarty->compile_check is not set to false, thanks @prestamodule 2013-10-09 12:14:49 +02:00
Vincent Augagneur ced6554133 //loyalty module now use bootstrap design 2013-10-09 11:19:32 +02:00
Damien Metzger c982d08b68 // Removed useless link to the current page in the breadcrumb 2013-10-09 11:12:33 +02:00
Rémi Gaillard 3b677092bf [*] FO: You can now choose the anchor separator for attributes 2013-10-09 11:01:18 +02:00
Damien Metzger 623b8c7960 // Added expense management to profitability KPI 2013-10-09 10:55:12 +02:00
Vincent Augagneur e16676efaa //added prefix & suffix on helper form 2013-10-09 10:51:04 +02:00
Sylvain Gougouzian 7a6dea4964 [~] BO : Export DeliverySlip 
The dates range wasn't using the correct sql fields.
 2013-10-09 10:39:24 +02:00
Damien Metzger 38143e1245 // Fixed stats bug (bad id for ajax request) 2013-10-09 10:05:24 +02:00
Jerome Nadaud 8c9dffd854 // Add pagination to states list 2013-10-09 10:03:27 +02:00
Jerome Nadaud 9bdde5c5c0 // Add pagination to countries list 2013-10-09 09:59:49 +02:00
Jerome Nadaud 18d909c05d // Add cache control to ajax request for ipad 2013-10-09 09:55:17 +02:00
Jerome Nadaud d448891065 // Add new country button to countries controller 2013-10-09 09:51:25 +02:00
Kevin Granger daa1cc47db Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 09:43:10 +02:00
Kevin Granger b4459e39a4 // Orders WIP 2013-10-09 09:43:04 +02:00
Jerome Nadaud 57c34488ff // Orders refund buttons 2013-10-09 09:41:51 +02:00
Jerome Nadaud 5a4548bd51 // Toolbar for search 2013-10-09 09:41:10 +02:00
gRoussacandJerome Nadaud fcc2930693 [-] BO : Remove duplicate sql insert in setProductOutOfStock in monoshop 2013-10-09 09:19:22 +02:00
Jerome Nadaud f9373e6178 // Fix toolbar button and toolbar title for invoices 2013-10-09 08:53:36 +02:00
Rémi Gaillard 60214d8fb6 // nothing 2013-10-08 22:11:28 +02:00
Damien Metzger d9b40b8f35 // Added Modules KPIs 2013-10-08 19:39:52 +02:00
Kevin Granger 797a6c121a // Orders WIP 2013-10-08 18:53:41 +02:00
Jerome Nadaud d595cd2f12 // Toolbar modif for products 2013-10-08 18:51:10 +02:00
Jerome Nadaud b9cfc24922 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-08 18:42:19 +02:00
Jerome Nadaud d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
gRoussac 008c6ce759 [-] FO : Fix bug #PSCFV-10497 cart_block hooked on column disappearing 2013-10-08 18:37:50 +02:00
gRoussac 85946bacbe // small cast 2013-10-08 18:35:56 +02:00
Rémi Gaillard f2c6887497 // quickview 2013-10-08 17:44:10 +02:00
Damien Metzger 180a778e51 [*] Installer : replaced radio buttons by a select for the installer language list (too many languages) 2013-10-08 17:06:02 +02:00
Rémi Gaillard 0db2372724 // add color list to some controllers 2013-10-08 15:39:06 +02:00
Damien Metzger 53748c3119 // Code cleaning 2013-10-08 15:01:46 +02:00
Gregory Roussac cd8af9ae67 Merge pull request #824 from Prestaworks/patch-14 
[-] BO : Fixes issue where path is not printed when error with email template saves occur.
 2013-10-08 05:57:21 -07:00
Daniel fa88a0bd93 Update AdminTranslationsController.php 
Fixes issue where path is not printed when error with email template saves occur.
 2013-10-08 20:54:52 +08:00
Rémi Gaillard 2899dfba5e // Fix AdminTranslationsController::addNewTabs() 2013-10-08 14:53:02 +02:00
Damien Metzger c75cb99b51 // Code cleaning 2013-10-08 14:45:22 +02:00
Damien Metzger a14118863e // Code cleaning 2013-10-08 14:45:21 +02:00
Kevin Granger 3e6f425bd4 // Orders WIP 2013-10-08 12:26:48 +02:00
Damien Metzger b7e13e2e7f // Code cleaning 2013-10-08 11:55:10 +02:00
Krystian Podemski ae7d33effe [*] CORE: Add phone_mobile to address format 
I honestly do not know why you decided by default to show only the first field of the phone :)

Users often ask me why they don't see their mobile phone on orders in BO.
 2013-10-08 11:11:24 +02:00
gRoussac e4a642128a [-] FO : Fix bug #PSCFV-10606 could not have correct taxCalculationMethod when vat number in customer address 2013-10-08 11:09:52 +02:00
Zollner Robert 30adb0932d [-] BO : pass correct typed parameter to setCurrency 2013-10-07 23:42:26 +03:00
Rémi Gaillard 7d0e9a5f06 // Fix double entities on AdminLog listing #PSCFV-10472 2013-10-07 19:37:58 +02:00
Gregory Roussac 4daaa206d2 Merge pull request #818 from cedricfontaine/patch-2 
[-] MO : Price should apply tax as in configuration.
 2013-10-07 09:55:35 -07:00
Kevin Granger 3e2d2e2afc // fix Orders 2013-10-07 18:54:28 +02:00
Gregory Roussac 644e38c05f Merge pull request #817 from cedricfontaine/patch-1 
[-] MO :Loyalty voucher should be without taxes, otherwise points would be negative.
 2013-10-07 09:54:22 -07:00