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

3598 Commits

Author SHA1 Message Date
Kevin Granger
bcfd092a1d // fix nav 2013-09-13 17:48:46 +02:00
Jerome Nadaud
74237ff694 // Some fix 2013-09-13 17:11:12 +02:00
Jerome Nadaud
7b532d77fd // Fix some bootstrap design 2013-09-13 15:36:27 +02:00
Kevin Granger
b58dddf521 // moved search/reset of list header 2013-09-13 15:03:26 +02:00
Kevin Granger
4cde899834 // localization 2013-09-13 12:18:27 +02:00
Jerome Nadaud
2bf17241bd // Fix associated categories tree header 2013-09-13 11:50:27 +02:00
Kevin Granger
968f2a45d5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-13 11:41:26 +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
f20fa55308 // Fix filter by category checkbox 2013-09-13 09:49:07 +02:00
Kevin Granger
ce74aeb357 // nav 2013-09-13 09:35:36 +02:00
Jerome Nadaud
3cf4dc76b5 // Fix missing localizations page header toolbar 2013-09-12 18:54:28 +02:00
Damien Metzger
06a178b8fe // Replaced screencast option by menu option 2013-09-12 18:24:18 +02:00
Jerome Nadaud
81b6ec93f9 // Add count down to text input 2013-09-12 17:59:25 +02:00
Jerome Nadaud
29db737c10 // Add autosize to textarea 2013-09-12 16:52:55 +02:00
Jerome Nadaud
ba6699a378 // Fix Admin access 2013-09-12 15:55:14 +02:00
Jerome Nadaud
c105486fa3 // Tree bugs 2013-09-12 15:22:47 +02:00
Rémi Gaillard
f9b1f0ab5e [*] Core: don't re-generate the class_index.php file if a class is not known to avoid misuse of class_exists() 2013-09-12 15:03:23 +02:00
Damien Metzger
c2d15f4ade // Changed language display in back office dropdown menu 2013-09-12 14:53:12 +02:00
Jerome Nadaud
e63ce0a86d // Tree 2013-09-12 14:47:47 +02:00
Kevin Granger
91d3da310b // dashboard panel version 2013-09-12 14:42:20 +02:00
Kevin Granger
a1b0710f85 // fix menu + sass refacto 2013-09-12 12:26:08 +02:00
Vincent Augagneur
4a6c5979a8 //added new useful links on dashboard 2013-09-12 10:52:56 +02:00
Vincent Augagneur
6fa398e8e0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-12 10:08:32 +02:00
Vincent Augagneur
38822bfb5e //dashactivity configuration 2013-09-12 10:08:28 +02:00
Jerome Nadaud
e9dbadcabf // Tree 2013-09-11 20:41:14 +02:00
Kevin Granger
ab8d5bc265 // VT theme 2013-09-11 18:17:57 +02:00
Kevin Granger
18212420c3 // fix switch menu top // side 2013-09-11 17:26:44 +02:00
Kevin Granger
99263a1492 // switch menu top // side 2013-09-11 16:56:10 +02:00
gRoussac
dfdbe39ee3 [-] BO : Small changes when creating vouchers in back office orders 2013-09-11 16:28:11 +02:00
Jerome Nadaud
617b58ba2f //Fix Text input desc error 2013-09-11 15:40:21 +02:00
Jerome Nadaud
49c9afec40 // Categories tree 2013-09-11 15:08:24 +02:00
Kevin Granger
913ee1007c // menu top 2013-09-11 11:32:06 +02:00
Vincent Augagneur
3cc187a716 //dashactivity trafic source data_list & pie_chart 2013-09-11 10:34:01 +02:00
Kevin Granger
f29b1b3a31 // perts fix + menu top WIP 2013-09-10 20:23:06 +02:00
Jerome Nadaud
e0d33eae9e // Categories Tree changes 2013-09-10 18:40:05 +02:00
Vincent Augagneur
1aba28ff6f //typo 2013-09-10 16:42:54 +02:00
Jerome Nadaud
85dc552667 // Toolbar 2013-09-10 14:08:29 +02:00
Kevin Granger
03d1697e19 // treeview helper 2013-09-10 09:41:39 +02:00
Damien Metzger
1d8da79507 [-] BO : fixed notifications when there is too much data 2013-09-10 09:17:54 +02:00
Kevin Granger
2a7bc49190 // treeview 2013-09-09 19:03:38 +02:00
Vincent Augagneur
4e1a513371 //added rss and useful link on dashboard 2013-09-09 18:44:34 +02:00
Kevin Granger
69b38f4d6f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/products/helpers/tree/tree.tpl
	admin-dev/themes/default/template/controllers/products/helpers/tree/tree_header.tpl
 2013-09-09 18:13:49 +02:00
Kevin Granger
7774e46cb3 // tree view product 2013-09-09 18:12:31 +02:00
Jerome Nadaud
c502c9766f [-] BO : FixBug PSCFV-10331 - Tax rules Pagination 2013-09-09 15:04:14 +02:00
Jerome Nadaud
accd2d77c1 [+] BO : Adding tree templates and functions 2013-09-09 12:20:58 +02:00
Jerome Nadaud
b5f6e8a1d8 [+] BO : Add "tree-selected" class to tree.js 2013-09-09 12:10:26 +02:00
Jerome Nadaud
36a863df59 [+] BO : Adding Tree Helper 2013-09-06 17:05:19 +02:00
Kevin Granger
fa198aeabc // fix menu, design, css 2013-09-06 16:25:01 +02:00
Kevin Granger
8e1250dad1 // I hate <br /> 2013-09-06 11:13:18 +02:00
Kevin Granger
1b2bab6943 // performance 2013-09-06 11:03:36 +02:00