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
5524 Commits
Author SHA1 Message Date
gRoussac 286084c42d Merge branch 'master' of https://github.com/DarkHack/PrestaShop into contrib/master 
Conflicts:
	controllers/admin/AdminImportController.php
 2013-10-10 17:06:13 +02:00
gRoussac 39a543188a [-] BO : Fix bug #PSCFV-10660, could not delete csv file on NT 2013-10-10 14:54:12 +02:00
Rémi Gaillard 278dc32482 [*] BO: Add an option to autologout to the backoffice after 15 minutes 2013-10-10 12:20:10 +02:00
Rémi Gaillard 7fdf6e614f // don't display some field when an employee edit it's own profile 2013-10-10 11:35:05 +02:00
Jerome Nadaud 5ec76a759a // Fix Dashboard toolbar 2013-10-09 19:12:20 +02:00
Vincent Augagneur d796d0012e [-] BO : fixed bug #PSCFV-10637 PS_CARRIER_DEFAULT is not updated after edit default carrier 2013-10-09 15:25:02 +02:00
Damien Metzger a2371067bf // CSS fixes 2013-10-09 15:11:04 +02:00
Damien Metzger 9fcb039068 // A few CSS fixes 2013-10-09 14:57:15 +02:00
gRoussac df97566018 [-] BO : AdminImport no default value for separators 2013-10-09 13:57:36 +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
Damien Metzger 38143e1245 // Fixed stats bug (bad id for ajax request) 2013-10-09 10:05:24 +02:00
Jerome Nadaud d448891065 // Add new country button to countries controller 2013-10-09 09:51:25 +02:00
Jerome Nadaud f9373e6178 // Fix toolbar button and toolbar title for invoices 2013-10-09 08:53:36 +02:00
Damien Metzger d9b40b8f35 // Added Modules KPIs 2013-10-08 19:39:52 +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
Damien Metzger 53748c3119 // Code cleaning 2013-10-08 15:01:46 +02: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 a14118863e // Code cleaning 2013-10-08 14:45:21 +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
Francois Gaillard 77b2b4b6ca // Manual merge PS 1.5.6.0 2013-10-07 18:22:55 +02:00
Jerome Nadaud 6f2358a0da // Manufacturer view bootstraped 2013-10-07 14:16:41 +02:00
Jerome Nadaud efb041b747 // New referer Bootstraped 2013-10-07 13:40:36 +02:00
Jerome Nadaud 6fc12968b8 // Fix missing module configuration bar #PSCSX-3 2013-10-07 12:03:37 +02:00
Kevin Granger 2c3bf85ca7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-07 11:12:59 +02:00
Kevin Granger ba7d9eec21 // fix Orders 2013-10-07 11:11:21 +02:00
Jerome Nadaud 9b79a02e88 // Remove unused function 2013-10-07 11:03:42 +02:00
indesign47 b61e3e68b9 Update AdminImportController.php 2013-10-05 10:50:19 +02:00
Zollner Robert 1787923c4c [-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency (changed NULL to lowercase) 2013-10-05 00:42:29 +03:00
Zollner Robert 481cb5c28a [-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency 2013-10-04 23:30:24 +03:00
Kevin Granger 2ab3f08eab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-04 19:13:13 +02:00
Kevin Granger c2ea0be841 // orders WIP 2013-10-04 19:13:02 +02:00
Jerome Nadaud 2e4f5c0b07 // Menus details list is now bootstraped 2013-10-04 17:34:07 +02:00
Vincent Augagneur 5564b342f4 //wizard boostrap and title fix 2013-10-04 17:07:10 +02:00
Jerome Nadaud 5557ac1aee // Remove attribute language desc from stock movement list when product attribute is removed 2013-10-04 15:30:27 +02:00
Jerome Nadaud 887b68d3f2 // Customers Groups View list resize 2013-10-04 14:24:33 +02:00
Jerome Nadaud 9ae6546d90 // Features - Remove select language with one language and add autosize to textarea 2013-10-04 12:23:01 +02:00
indesign47 75cb92c329 Update AdminImportController.php 2013-10-04 11:44:52 +02:00
indesign47 96646b5c7a [-] BO : AdminImport add products available fields 2013-10-04 10:56:41 +02:00
indesign47 0af24ab034 [-] BO : AdminImport add adresses required fields 2013-10-04 04:31:51 +02:00
Kevin Granger bb7dd876af // orders WIP 2013-10-03 21:04:35 +02:00
gRoussac 31f421153d [-] BO : Fix bug #PSCFV-9323 supplier_reference can be unset 2013-10-03 18:20:45 +02:00
Jerome Nadaud 874e17aa6f // remove javascript include from tpl 2013-10-03 17:55:30 +02:00
gRoussac c75cda2429 [*] BO : AdminImport, retrieve separators and lang selected 2013-10-03 17:35:20 +02:00
gRoussac 7f32e8d187 [-] BO : Fix bug #PSCFV-10064, could not import feature in multilang, thanks @E.Bigfoot 2013-10-03 16:09:43 +02:00
gRoussac 8b2215eec5 // remove warning 2013-10-03 15:02:48 +02:00