dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,706 Commits 9 Branches 19 Tags
38f034f4e01866d423d7353e593073c1dd1fbd1c
Commit Graph

291 Commits

Author SHA1 Message Date
Jerome Nadaud
38f034f4e0 // Remove header and footer display when ajax 2013-10-28 17:10:53 +01:00
Rémi Gaillard
c67e71ca59 // layout fix 2013-10-25 17:30:10 +02:00
Jerome Nadaud
b141975d57 // Fix fields_list check 2013-10-21 11:49:08 +02:00
Vincent Augagneur
37712f0193 //when a module is disabled, first option is enable 2013-10-16 16:20:51 +02:00
Kevin Granger
67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
Damien Metzger
1849995291 // Code cleaning 2013-10-11 15:35:45 +02:00
Damien Metzger
809eac6308 // Fix upgrade and dashboard 2013-10-11 14:07:03 +02:00
Damien Metzger
c68101653d // Fixed tabs 2013-10-11 12:10:24 +02:00
Damien Metzger
77551c03f5 // Fixed potential warning 2013-10-10 18:49:27 +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
Jerome Nadaud
067c78f868 // Fix notifications 2013-10-10 11:02:33 +02:00
Damien Metzger
079534f039 // Fix header/footer override in admincontroller 2013-10-09 18:51:31 +02:00
Jerome Nadaud
c8347cbc59 // Restore save button on header toolbar 2013-10-09 15:24:19 +02:00
Damien Metzger
c982d08b68 // Removed useless link to the current page in the breadcrumb 2013-10-09 11:12:33 +02:00
Damien Metzger
d9b40b8f35 // Added Modules KPIs 2013-10-08 19:39:52 +02:00
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02: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
121fcdc39f // Fix list start 2013-10-04 16:56:35 +02:00
Jerome Nadaud
43a60f1b57 [-] BO : FixBug #PSCFV-9044 - Missing state in new order, and now you can edit customer addresses 2013-10-03 11:06:08 +02:00
Damien Metzger
e82f0feacf // Fixed customer tab 2013-10-03 09:52:25 +02:00
Jerome Nadaud
c88ea275ab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 17:50:50 +02:00
Jerome Nadaud
2a984186a9 // Fix output for ajax content 2013-10-02 17:50:39 +02:00
Kevin Granger
19af1cfda5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 17:39:03 +02:00
Kevin Granger
f168dd7c50 // list icon backward compat 2013-10-02 17:38:53 +02:00
Damien Metzger
84a251a575 [*] BO : you can noww override header and footer for each controller 2013-10-02 17:04:18 +02:00
Kevin Granger
f5a4aeeab5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 13:59:04 +02:00
Kevin Granger
0867e8b7c1 // fix AdminController array unique 2013-10-02 13:58:57 +02:00
Jerome Nadaud
a891c9277a // Advanced stock management details list 2013-10-02 12:09:03 +02:00
Rémi Gaillard
99f325dc3c // validation of carrierwizard 2013-10-02 11:24:08 +02:00
gRoussac
c466320887 [-] Bo : Fix again #PSCFV-10474 again, not deleting start page after import 2013-10-01 19:11:51 +02:00
gRoussac
a5dc1ce6f6 [-] Bo : Fix again #PSCFV-10474 coul not export more than 300 products 2013-10-01 18:02:12 +02:00
Jerome Nadaud
a2aa90a4b6 // Fix page header title bug 2013-10-01 15:32:34 +02:00
gRoussac
f899380e3b [-) BO : #PSCFV-10474 coul not export more than 300 products 2013-09-30 19:04:04 +02:00
Damien Metzger
a6d8ffa293 // More breadcrumbs improvements 2013-09-30 15:38:22 +02:00
Damien Metzger
85abfde45c // Added links to breadcrumbs 2013-09-30 14:45:21 +02:00
Damien Metzger
4ebc47856e [-] BO : fixed breadcrumbs and filters (in the breadcrumbs) 2013-09-30 14:16:33 +02:00
Kevin Granger
8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
 2013-09-30 11:01:23 +02:00
Damien Metzger
336e29eb67 // Default tab is the dashboard 2013-09-25 18:08:56 +02:00
Rémi Gaillard
beb0a74135 // use ObjectModel::validateField on validaterules 2013-09-24 17:12:28 +02:00
Damien Metzger
8f08f67812 [+] BO : Added fees configuration for the dashboard 2013-09-24 12:22:40 +02:00
Rémi Gaillard
41af17e06b [-] BO: Fix data validation when iframe is allowed on some entities like CMS 2013-09-24 10:28:04 +02:00
gRoussac
27f14b9a31 [-] BO : Fix proces and save buttons for Modules and AdminControllers 2013-09-18 17:23:08 +02:00
Damien Metzger
8934f9c7ed [*] BO : Connected the first KPIs to real data 2013-09-16 18:40:34 +02:00
Jerome Nadaud
235af94a92 // Fix Page header toolbar 2013-09-16 17:05:27 +02:00
Kevin Granger
c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
 2013-09-13 11:41:14 +02:00
Jerome Nadaud
14a9d914d8 // Fix module uninstall button 2013-09-12 18:23:27 +02:00
gRoussac
5095b45e47 [-] BO : Fix bug, orders states not ordered by order state name 2013-09-12 15:09:21 +02:00
Damien Metzger
ec11b7e064 // Better control of the requests when our website is down 2013-09-06 10:18:48 +02:00
Kevin Granger
b4ecaf3ddb // Carrier Wizard with bootstrap WIP 2013-09-04 15:38:45 +02:00