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

18910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vincent Augagneur 0cf68ade90 //productscategory now use bootstrap design 2013-09-26 15:09:18 +02:00
Jerome Nadaud 157ab0c8b9 // Prices rules list size 2013-09-26 15:01:23 +02:00
Jerome Nadaud 2cc6fe821b // Bootstraping template form checkbox 2013-09-26 14:56:24 +02:00
Jerome Nadaud 2d65f5a8c0 // Cart rules bootstrap design 2013-09-26 14:55:28 +02:00
Rémi Gaillard b6d3bf1bc3 // missing method 2013-09-26 13:49:17 +02:00
Rémi Gaillard 252ab56d75 // error message in double 2013-09-26 13:47:42 +02:00
Jerome Nadaud b9ccfe858b // Localization Bootstrap design 2013-09-26 11:36:28 +02:00
Jerome Nadaud 10e472e141 // List header template - Remove extra class attribute 2013-09-26 11:35:19 +02:00
Jerome Nadaud 4c5a6d1efb // Payment bootstrap design 2013-09-26 10:09:50 +02:00
Jerome Nadaud d6a59a1dbd // Maintenance bootstrap design 2013-09-26 09:37:38 +02:00
Jerome Nadaud eefccd0891 // Multistore check view now include button element 2013-09-26 09:36:57 +02:00
Damien Metzger 1b010da64f // Fixed typo and configuration parse error 2013-09-25 20:21:41 +02:00
Damien Metzger fd1cfe0c8c // Fixed group information label and a customer KPI 2013-09-25 20:16:34 +02:00
Damien Metzger d1ead319ef // Fixed exception on the customer 2013-09-25 20:06:23 +02:00
Damien Metzger cc75b4b912 // Temp fix for labels in the BO listings, before my eyes hurt 2013-09-25 19:59:00 +02:00
Damien Metzger 29e83489a7 // Small improvement of the performances tab 2013-09-25 19:47:55 +02:00
Damien Metzger 01e5cec634 [*] BO : improved performances (cache systems) and countries tabs 2013-09-25 19:41:46 +02:00
Jerome Nadaud 1a37fee8e7 // Bootstrap icons 2013-09-25 19:03:43 +02:00
Jerome Nadaud 56f27ae2c1 // Some missing icons and multistore problems 2013-09-25 19:00:29 +02:00
Gregory Roussac 37f928ade9 Merge pull request #746 from Mainmich/patch-1 
[-] MO : Blocklayered Fix pagination incompatibility
 2013-09-25 09:45:51 -07:00
Mainmich a6e67b078e Fix pagination incompatibility 
Javascript function paginateButton does not work with "p" GET parameter in first position, regex only takes &p and not ?p.
 2013-09-25 18:33:58 +02:00
Damien Metzger 336e29eb67 // Default tab is the dashboard 2013-09-25 18:08:56 +02:00
Jerome Nadaud 8cc892ecce // Trad 2013-09-25 17:47:10 +02:00
Jerome Nadaud bf86da782a // Add confirmation for memcached server delete 2013-09-25 17:44:57 +02:00
Damien Metzger 147591dbe3 [*] BO : improved automatic language creation 2013-09-25 17:05:30 +02:00
Jerome Nadaud b2b8a2eb19 // Fix list search form submit 2013-09-25 16:04:09 +02:00
Damien Metzger a7f9f23b73 // AdminStates code cleaning 2013-09-25 16:00:29 +02:00
Gregory Roussac 5245038ea1 Merge pull request #745 from djfm/localization_packs 
[*] TR : Localization packs
 2013-09-25 06:58:59 -07:00
Damien Metzger 337b7333a2 // Improved States tab 2013-09-25 15:45:00 +02:00