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

19089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Nadaud ba2494fa8b // Remove language select on textarea with 1 langue 2013-10-02 09:43:24 +02:00
Kevin Granger 65fc1fea63 // orders WIP 2013-10-01 18:50:41 +02:00
Jerome Nadaud 301de7a3a1 // Webservice and advanced stock list bootstraping 2013-10-01 18:29:35 +02:00
Jerome Nadaud dd60eb66cf // Fix features list filters and sort 2013-10-01 18:10:52 +02:00
Jerome Nadaud f2849bdb70 // Remove unnecessary function 2013-10-01 17:56:17 +02:00
Jerome Nadaud 68831ffbe9 // Fix attribute group view list 2013-10-01 17:55:20 +02:00
Jerome Nadaud 9c40dbb222 // Fix group view for bootstrap - removing limit restriction 'cause is now fixed 2013-10-01 17:00:56 +02:00
Jerome Nadaud 88be78d096 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-01 16:44:20 +02:00
Jerome Nadaud 99a4ffe583 // Fix enable friendly url button generator on multishop 2013-10-01 16:44:03 +02:00
Kevin Granger c4c15917ab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-01 16:24:27 +02:00
Kevin Granger a866de41e7 // login form 2013-10-01 16:24:14 +02:00
Jerome Nadaud 55a5c69d40 // Remove language select on only one language 2013-10-01 16:03:34 +02:00
Jerome Nadaud a2aa90a4b6 // Fix page header title bug 2013-10-01 15:32:34 +02:00
Jerome Nadaud bc8e972dfa // Fix language id in features and quantities 2013-10-01 15:32:13 +02:00
Jerome Nadaud f469b69113 // Fix fixed home category And Norm 2013-10-01 15:18:56 +02:00
Jerome Nadaud 299d1f65ec //Fix Stats bug 2013-10-01 15:15:02 +02:00
Jerome Nadaud 759a3e191a // Groups and language bootsrapify 2013-10-01 15:14:46 +02:00
Jerome Nadaud 14b584fc01 // Remove language select if exist only 1 language 2013-10-01 14:36:48 +02:00
Vincent Augagneur f2a760c245 //small fix 2013-10-01 12:31:07 +02:00
Vincent Augagneur f4f1b6e831 //vatnumber now use bootstrap design 2013-10-01 11:03:37 +02:00
Rémi Gaillard eb40f7db24 // Improve cache colors list 2013-09-30 18:48:59 +02:00
Rémi Gaillard b2a9ec57bf // cache 2013-09-30 17:25:12 +02:00
Rémi Gaillard c2857add42 // add color list on product listing 2013-09-30 17:19:02 +02:00
Damien Metzger a6d8ffa293 // More breadcrumbs improvements 2013-09-30 15:38:22 +02:00
Kevin Granger 0db013f1c8 // fix checkbox 2013-09-30 15:13:08 +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
Damien Metzger 80376e9034 // Fixed meta title 2013-09-30 11:27:01 +02:00
Vincent Augagneur d6a541df58 //pscleaner now use bootstrap design 2013-09-30 11:23:41 +02:00
Damien Metzger 7019af3a11 // Bound the menu to the employee option 2013-09-30 11:20:49 +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
Gregory Roussac 3e85622972 Merge pull request #767 from enumag/patch-3 
[-] BO : Fix #PSCFV-10520 id_attribute_group can not be null
 2013-09-30 00:47:12 -07:00
Jáchym Toušek 5ebc2e5e91 [-] BO : Fix #PSCFV-10520 2013-09-29 14:43:14 +02:00
Jerome Nadaud c2b9ff40ef [-] BO : FixBig #PSCFV-10442 - Members Cutomer Group list 2013-09-27 19:20:46 +02:00
Gregory Roussac 40617c0a81 Merge pull request #761 from nuzelac/patch-1 
[-] BO : fix multilingual field validity in AdminProductsController
 2013-09-27 09:50:03 -07:00
Nino Uzelac ca01b58262 fix multilingual field validity in AdminProductsController 2013-09-27 18:22:07 +02:00
Damien Metzger f84a3c7fda // Add missing index 2013-09-27 17:47:10 +02:00
Fabio Chelly 9d94337c9b [-] MO sendtoafriend: The method used to check all required input fields could lead to errors 2013-09-27 16:08:00 +02:00
Damien Metzger 650c18e9f7 // Added Translations KPIs 2013-09-27 14:51:12 +02:00
Jerome Nadaud 6449ecfb32 [-] BO : Force invoice footer text to 1 ligne 2013-09-27 14:41:50 +02:00
Jerome Nadaud 9e58e3edfd // Advanced stock bootstrap design 2013-09-27 12:24:44 +02:00
Fabio Chelly 345d4cdbcf [-] MO productcomments: prevents guests to add comments when guest comment is disabled in backoffice 2013-09-27 11:27:58 +02:00
Damien Metzger 48966f7916 // Fixed language iso code consistency 2013-09-27 10:22:12 +02:00
Gregory Roussac 19fb32545d Merge pull request #749 from enumag/patch-1 
[-] FO : Fixed products without images
 2013-09-27 00:56:46 -07:00
Jáchym Toušek 30367e6427 [-] FO : Fixed products without images 2013-09-26 22:21:18 +02:00
Jerome Nadaud 9ea723d07e // Slip and Statuses bootstrap design 2013-09-26 17:30:34 +02:00
Jerome Nadaud a1c7dd3ee9 // Add row break to color element 2013-09-26 16:44:26 +02:00
Jerome Nadaud fa2f10ffc6 // Add row break to color element 2013-09-26 16:43:57 +02:00
Jerome Nadaud bc80846d7d // Requiered fields bootstrap design 2013-09-26 16:25:18 +02:00
Jerome Nadaud a93ce00af8 // Groups view bootstrap design 2013-09-26 15:59:28 +02:00