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

5170 Commits

Author SHA1 Message Date
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
Damien Metzger a6d8ffa293 // More breadcrumbs improvements 2013-09-30 15:38:22 +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 c2b9ff40ef [-] BO : FixBig #PSCFV-10442 - Members Cutomer Group list 2013-09-27 19:20:46 +02:00
Nino Uzelac ca01b58262 fix multilingual field validity in AdminProductsController 2013-09-27 18:22:07 +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
Jerome Nadaud 9ea723d07e // Slip and Statuses bootstrap design 2013-09-26 17:30:34 +02:00
Jerome Nadaud fa2f10ffc6 // Add row break to color element 2013-09-26 16:43:57 +02:00
Jerome Nadaud a93ce00af8 // Groups view bootstrap design 2013-09-26 15:59:28 +02:00
Jerome Nadaud 157ab0c8b9 // Prices rules list size 2013-09-26 15:01:23 +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
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 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
Damien Metzger a7f9f23b73 // AdminStates code cleaning 2013-09-25 16:00:29 +02:00
Damien Metzger 337b7333a2 // Improved States tab 2013-09-25 15:45:00 +02:00
Damien Metzger b80b363a2e [*] BO : Added Customer Service KPIs 2013-09-25 15:24:30 +02:00
Jerome Nadaud e81c9490b0 // Advanced parameters bootstrap design 2013-09-25 15:15:28 +02:00
Jerome Nadaud 15b6017ad7 // Logs list resize 2013-09-25 11:54:31 +02:00
Jerome Nadaud e2c04db881 // Administration list column size 2013-09-25 11:46:12 +02:00
Jerome Nadaud 7b14759aec // Webservice controller bootstrap design 2013-09-25 11:30:38 +02:00
Jerome Nadaud 2a8d251cd6 // Webservice controller bootstrap design 2013-09-25 11:29:11 +02:00
dlage 81ca3ac1f9 BO: Modules - show update button even if module is not installed but don't 
warn for modules with updates available but not installed.
 2013-09-24 17:42:43 +01:00
Damien Metzger d05ab45543 // KPIs improvments 2013-09-24 18:08:06 +02:00
Damien Metzger 6e6fe384ff // KPIs updated 2013-09-24 17:26:05 +02:00
Jerome Nadaud a175e603ef // Wharehouse view bootstrap fix 2013-09-24 16:20:05 +02:00
Damien Metzger d26336aa77 // Copy KPIs from customer to cart 2013-09-24 15:54:45 +02:00
Damien Metzger 799efcba3f [*] BO : Customers KPIs 2013-09-24 15:32:05 +02:00
Damien Metzger 8f08f67812 [+] BO : Added fees configuration for the dashboard 2013-09-24 12:22:40 +02:00
Gregory Roussac 4c399875d9 Merge pull request #737 from codeurWeb/patch-3 
[-] BO : fix postProcess override on AdminImportController
 2013-09-24 01:54:18 -07:00
Julien 6acebca8fa [-] BO : fix postProcess override on AdminImportController 
When we override the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
Default case of switch is never used.
 2013-09-23 21:04:55 +02:00
Julien 6850db0612 [-] BO : fix contructor override on AdminImportController 
When we overload the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
 2013-09-23 20:23:45 +02:00
Jerome Nadaud 69f97baa6a // Search conf list size 2013-09-23 18:04:48 +02:00
Jerome Nadaud 202c6fe463 // Carrier list size 2013-09-23 18:04:18 +02:00
Jerome Nadaud e128e17f4e // Geoloc bootstrap design 2013-09-23 14:04:15 +02:00
Jerome Nadaud 748d6271a9 // Stores controller bootstrap 2013-09-23 13:56:30 +02:00
Jerome Nadaud f4e0f63ef7 // Add lingerie to activities list 2013-09-23 10:14:23 +02:00
Jerome Nadaud 45c7cb7757 // Cms categories list 2013-09-23 10:13:45 +02:00
Damien Metzger 1fe17f0eb1 // Removed deprecated option form in stats 2013-09-20 18:18:04 +02:00
Damien Metzger 02e5913dd6 // Fixed potential warning 2013-09-20 18:12:10 +02:00
Jerome Nadaud f44ecb9fc8 // Products section list adjustment 2013-09-20 16:19:50 +02:00