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

68 Commits

Author SHA1 Message Date
Jerome Nadaud
22dcaf246c // Add icon and specific title to list 2013-10-10 15:36:50 +02:00
Kevin Granger
f168dd7c50 // list icon backward compat 2013-10-02 17:38:53 +02:00
Jerome Nadaud
a891c9277a // Advanced stock management details list 2013-10-02 12:09:03 +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
Rémi Gaillard
6ee6317fee // orderby position 2013-09-17 11:07:29 +02:00
Jerome Nadaud
c0afb55d11 [-] BO : FixBug #PSCFV-9900 Double quote escape problem in delete button link 2013-09-16 09:25:10 +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
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
Jerome Nadaud
0e353fe655 [-] BO : Fix bug to check filter values 2013-08-13 15:42:00 +02:00
Jerome Nadaud
a0d870c4eb [+] BO : Button action list improvements 2013-08-13 10:10:24 +02:00
Vincent Augagneur
627e3d8a77 [-] BO : fixed multistore thumbnail on product list 2013-08-12 11:27:25 +02:00
Jerome Nadaud
ecfe61972b [+] BO : Change action link for button 2013-08-09 16:07:07 +02:00
jeromenadaud
b81c021144 [-] BO : FixBug #PSCFV-8311 pagination, filter and order with multilist 2013-08-05 16:11:48 +02:00
jeromenadaud
174dfa9a6b [+] BO : Filter button default css class style 2013-08-01 17:13:02 +02:00
jeromenadaud
a29fa2dd09 [+] BO Better filters display 2013-08-01 16:59:08 +02:00
jeromenadaud
017e5ccbc8 [+] BO Pagination, filter and display 2013-07-31 18:37:01 +02:00
jeromenadaud
683818ebd4 [+] BO : Remove advanced header on empty list 2013-07-31 18:04:28 +02:00
Kevin Granger
9f9c0ef416 [+] BO Orders 2013-07-26 18:54:28 +02:00
Damien Metzger
3556e75ce3 // Moved useless code into the block where it is useful 2013-07-22 10:49:41 +02:00
Jérôme Nadaud
3693349643 [-] BO : FixBug #PSCFV-5316 Translation problem in delete button link 2013-07-18 15:49:53 +02:00
Axome
f4fc1d3cab [*] BO : AdminControllers : Keep active filter on pagination 2013-06-24 10:57:05 +02:00
vAugagneur
3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
Rémi Gaillard
20f8709940 [-] BO: Fix #PSCFV-8872 HelperList::displayWarning() don't exists 2013-04-22 10:50:41 +02:00
Rémi Gaillard
5cecff7251 // fix php warning 2013-01-14 14:12:14 +01:00
Rémi Gaillard
ef904c9083 [-] BO: Fix #PSCFV-5930 #PSCFV-5939 the filters are handled as the same between tabs which can cause sql errors 2013-01-14 12:08:12 +01:00
vAugagneur
108dfb292c [-] BO : fixed bug #PSCFV-4961 - Strange behavior when reordering categories 2013-01-09 13:44:19 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
DamienMetzger
edf3a3b10e [-] BO : fixed filters on statuses tab #PSCFV-5763 2012-11-22 19:49:20 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
rGaillard
bfb5f6058c // Fix #PSCFV-4512 2012-10-04 13:05:43 +00:00
dMetzger
84b0aa79b2 // Changed image system to new default + #PSCFV-4068 2012-09-24 09:08:57 +00:00
rGaillard
ec0fd17bcd [-] BO: Fix display of filter listings PSCFV-3992 2012-09-11 13:12:02 +00:00
dMetzger
ab6ae48023 // Opti 2012-08-23 16:16:16 +00:00
vAugagneur
b18f9b179c //norme 2012-07-24 08:23:21 +00:00
dMetzger
1f54744397 [-] BO : fixed alt text for duplication #PSCFV-3180 2012-07-12 15:12:29 +00:00
lLefevre
12c69a6dc6 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
vAugagneur
d4c728c4ff //small fix 2012-06-14 12:41:19 +00:00
rGaillard
99b22fbbb8 // Improve performance and bug fixes 2012-06-06 16:22:48 +00:00
vChabot
5a96ffbd64 [-] BO : BugFix : #PSCFV-2209 : Multishop : cannot delete shops with dependencies 2012-05-10 14:09:11 +00:00
tDidierjean
954f7e52f7 // Helpers : remove param 'float' 2012-04-10 13:07:19 +00:00
tDidierjean
6d09599fb4 // HelperList cleanup 2012-04-06 12:15:13 +00:00
tDidierjean
1c964d455d // PI-116 - attribute default refactoring 2012-04-06 11:59:29 +00:00
tDidierjean
215ca93f95 // Rename fieldsDisplay to fields_list part1 (timeout) 2012-03-29 16:26:54 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
tDidierjean
30a7dbff75 // HelperList : remove id_category parameter when useless 2012-03-13 16:49:49 +00:00
tDidierjean
eb8447eb2a [*] BO : #PSFV-481 - Refactor HelperList position management 2012-03-13 16:22:23 +00:00
mDeflotte
5d023b4c0c // Add hover to the new button 
// Add the avaibility to add alt/title attribute to the icon on helper list
 2012-03-08 14:05:16 +00:00
tDidierjean
d29e810d8d // rename $toolbar_fix to $toolbar_scroll part1 2012-02-28 17:38:42 +00:00