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

175 Commits

Author SHA1 Message Date
Jerome Nadaud
22dcaf246c // Add icon and specific title to list 2013-10-10 15:36:50 +02:00
Damien Metzger
623b8c7960 // Added expense management to profitability KPI 2013-10-09 10:55:12 +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
Vincent Augagneur
f2a760c245 //small fix 2013-10-01 12:31:07 +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
Jerome Nadaud
d6a59a1dbd // Maintenance bootstrap design 2013-09-26 09:37:38 +02:00
Jerome Nadaud
479662aa10 // Fix missing table id for shop asso in helper 2013-09-24 16:19:38 +02:00
Jerome Nadaud
6e2337df44 // Add id attribute to tree header button 2013-09-24 12:27:51 +02:00
Jerome Nadaud
e9cd8ac145 // Search tree toolbar button 2013-09-20 16:20:27 +02:00
Jerome Nadaud
f312a055b1 // Multistore bootstrap design 2013-09-20 15:04:43 +02:00
gRoussac
27f14b9a31 [-] BO : Fix proces and save buttons for Modules and AdminControllers 2013-09-18 17:23:08 +02:00
gRoussac
93aae26269 [-] Bo : Modules 'save' button not active 2013-09-18 15:41:30 +02:00
Damien Metzger
f7855f2a3a // Always more KPIs 2013-09-17 12:47:13 +02:00
Rémi Gaillard
6ee6317fee // orderby position 2013-09-17 11:07:29 +02:00
Damien Metzger
8934f9c7ed [*] BO : Connected the first KPIs to real data 2013-09-16 18:40:34 +02:00
Jerome Nadaud
7e8d119213 // Textarea autosize 2013-09-16 14:25:49 +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
Jerome Nadaud
74237ff694 // Some fix 2013-09-13 17:11:12 +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
29db737c10 // Add autosize to textarea 2013-09-12 16:52:55 +02:00
Jerome Nadaud
c105486fa3 // Tree bugs 2013-09-12 15:22:47 +02:00
Jerome Nadaud
873eee8ad0 // Tree list bug 2013-09-12 14:55:45 +02:00
Jerome Nadaud
e63ce0a86d // Tree 2013-09-12 14:47:47 +02:00
Jerome Nadaud
e9dbadcabf // Tree 2013-09-11 20:41:14 +02:00
Jerome Nadaud
49c9afec40 // Categories tree 2013-09-11 15:08:24 +02:00
Jerome Nadaud
e0d33eae9e // Categories Tree changes 2013-09-10 18:40:05 +02:00
Jerome Nadaud
85dc552667 // Toolbar 2013-09-10 14:08:29 +02:00
Jerome Nadaud
4e8658f1d6 [+] BO : Helper Tree js improvement 2013-09-09 18:57:42 +02:00
Jerome Nadaud
accd2d77c1 [+] BO : Adding tree templates and functions 2013-09-09 12:20:58 +02:00
Jerome Nadaud
c7e4f0ce5f [+] BO : Adding Tree Helper 2013-09-06 17:06:19 +02:00
Jerome Nadaud
36a863df59 [+] BO : Adding Tree Helper 2013-09-06 17:05:19 +02:00
Sarah Lorenzini
73524c7a4c // update maintenance and email pages 2013-09-05 14:16:06 +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
00e1b7c0eb [-] BO : FixBug language in label for 2013-08-20 09:36:00 +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
Jérôme Nadaud
f8ff755067 [+] BO : Product "For" 2013-07-25 14:50:10 +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
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
Gregory Roussac
44debd682f Merge pull request #517 from axometeam/patch-4 
[*] BO : AdminControllers Keep "active" filter on pagination
 2013-07-12 02:07:51 -07:00