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

248 Commits

Author SHA1 Message Date
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
ha99y
f4892686c1 Warning in AdminController.php 
If debugging is on (_PS_MODE_DEV_ set to TRUE)
On a fresh install there is a warning on line 1542 in
/classes/controller/AdminController.php in function
addToolBarModulesListButton().
Because of the warning xml files are not populated with data.

Warning: simplexml_load_file()
1: parser error : Document is empty
 2013-09-03 17:30:05 -07:00
gRoussac
6daf8ebbfa [-] BO : Fix error returned when first import of a localisation pack 2013-09-03 18:20:58 +02:00
Francois Gaillard
e6abe1c5a0 // Release branch merged 2013-08-29 18:46:34 +02:00
Rémi Gaillard
eec8aaa4f8 // php noti 2013-08-29 18:15:51 +02:00
Jerome Nadaud
4a7e68ae05 // Modules list fix 2013-08-28 10:18:43 +02:00
Vincent Augagneur
5c367cd6e7 //small fix 2013-08-27 18:52:34 +02:00
Vincent Augagneur
41a5eb8411 //small fix 2013-08-27 18:50:14 +02:00
Jerome Nadaud
ed0037c435 [+] BO : New page header toolbar 2013-08-27 18:21:27 +02:00
Vincent Augagneur
ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Rémi Gaillard
a21d3fd22e // shipping block was missplaced on order-detail 2013-08-22 15:41:34 +02:00
Kevin Granger
3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
 2013-08-21 09:14:10 +02:00
Kevin Granger
44655ecdef // breaking things 2013-08-20 16:38:31 +02:00
Jerome Nadaud
a7f6e91ac0 [-] BO : FixBug #PSCFV-9329 Alias problem in order by 2013-08-19 10:35:43 +02:00
Jerome Nadaud
5e2a3e3c13 [+] BO : Modal module list 2013-08-13 15:22:18 +02:00
Jerome Nadaud
1af9fdd1b2 [-] BO : Module list new action buttons 2013-08-13 12:28:07 +02:00
Jerome Nadaud
a06dfafb9a // Avoid some filters errors 2013-08-12 15:44:13 +02:00
Rémi Gaillard
567321dd3d // clean cookie after logout 2013-08-08 11:39:36 +02:00
Damien Metzger
a1cf8d462f // Keep remote file retrieval in the right order 2013-08-06 16:42:10 +02:00
jeromenadaud
48f041f035 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 16:12:04 +02:00
jeromenadaud
b81c021144 [-] BO : FixBug #PSCFV-8311 pagination, filter and order with multilist 2013-08-05 16:11:48 +02:00
gRoussac
ed887fd5c3 [*] BO : Add filter choices in title of List, thankx to @ccauw 2013-08-05 15:18:42 +02:00
gRoussac
6a073143f2 [-] BO : Fix bug #PSCFV-9990 bad count on list header helper 2013-08-01 16:15:41 +02:00
Sarah Lorenzini
d744b9dbf2 // update localization and modules tabs 2013-07-31 14:47:21 +02:00
Vincent Augagneur
3d40814739 //added name in errors array in validateRules 2013-07-30 11:33:30 +02:00
Rémi Gaillard
c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
Kevin Granger
77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
 2013-07-24 17:01:23 +02:00
gRoussac
a805941c1f // typo in EN string 2013-07-23 10:34:05 +02:00
Damien Metzger
9169995adc // Small fixes and code cleaning 2013-07-23 09:50:26 +02:00
François Gaillard
899dc30097 [-] Class : AdminController - Object id fixed 2013-07-17 11:33:33 +02:00
Damien Metzger
3d283000a0 // Fixed misplaced comma 2013-07-16 10:27:52 +02:00
Rémi Gaillard
4b492046c0 // add another logs information 2013-07-12 10:55:37 +02:00
sLorenzini
40967e6525 // update modules list tab 2013-07-11 17:27:11 +02:00
Rémi Gaillard
004e833b24 [+] BO: Addition, deletion and edition are now logged 2013-07-11 14:50:23 +02:00
Kevin Granger
f042d704d2 // field translatable + tpl products + fixs 2013-07-10 19:39:35 +02:00
Damien Metzger
47d343df90 // Fixed module positions in tabs 2013-07-04 09:33:43 +02:00
Damien Metzger
ae03669541 // Added the possibility to sort the modules in the tabs 2013-07-03 17:50:24 +02:00
Kevin Granger
d583cf25d2 // Bootstrap3 - Cart_rules > information.tpl + header + Font Awesome + Switch 2013-06-28 19:35:32 +02:00
Vincent Augagneur
c5e65e1360 [-] BO - fixed bug #PSCFV-9435 - AdminController - processUpdateOptions does not manage required field correctly in a non-mutltishop context 2013-06-26 11:38:08 +02:00
Kevin Granger
aa8d6d5872 //Porting more components to bootstrap 2013-06-21 17:47:05 +02:00
Kevin Granger
3bdf86e634 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-06-17 19:19:28 +02:00
gRoussac
aea53e034a [*] BO : Enable current subtab active class 2013-06-17 18:27:07 +02:00
Kevin Granger
6648fd3e97 // Reset Bootstrap for backward compatibility 2013-06-14 19:25:18 +02:00
Kevin Granger
b0eaf8124c [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:19:50 +02:00