dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,123 Commits 9 Branches 19 Tags
855c8a8de4fe07afcba50089feb997fe033dcf62
Commit Graph
5403 Commits
Author SHA1 Message Date
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
Gregory Roussac 7f9183b1d4 Merge pull request #743 from dlage/modules_update 
[*] BO : Show modules update button even if module is not installed but not notices
 2013-09-24 20:40:56 +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
gRoussac 6f840eceba [-] BO : Fix bug #PSCFV-9675 could not import non existent parent category 2013-09-24 18:00:01 +02:00
Damien Metzger 6e6fe384ff // KPIs updated 2013-09-24 17:26:05 +02:00
gRoussac 0f4781053b [-] BO : Bad entity pre selected in AdminImport 2013-09-24 17:08:33 +02:00
gRoussac 10d6e97aca [-] BO : Fix bug #PSCFV-10483, could not import other language product link_rewrite 2013-09-24 16:42:22 +02:00
gRoussac 3448027861 // report of pull request 737 2013-09-24 16:41:15 +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
djfm 6195d0c319 [*] LO : Use single quote as thousands separator for CHF currency 2013-09-23 16:32:40 +00: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
Jerome Nadaud f312a055b1 // Multistore bootstrap design 2013-09-20 15:04:43 +02:00
Jerome Nadaud 74a262f2ed // Shopping carts bootsrap design 2013-09-20 10:29:32 +02:00
Kevin Granger 724ab12122 // orders cleanup 2013-09-19 20:12:05 +02:00
Jerome Nadaud 39edb5a546 // Fix cart rules bootstrap design 2013-09-19 19:33:55 +02:00
Jerome Nadaud e6780f7a86 // Fix menu list position col 2013-09-19 18:08:20 +02:00
Sarah Lorenzini 550f6c190b // update stats tabs 2013-09-19 17:36:27 +02:00
gRoussac 0361d5db8d [-] BO : do not reaffect import_type for categories 2013-09-19 16:59:04 +02:00
gRoussac 803b6ce8ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 
Conflicts:
	controllers/admin/AdminImportController.php
 2013-09-19 16:38:01 +02:00
gRoussac 0c511dead5 [*] FIX #PSCFV-8106 do not regenerate thumbnails if not 2013-09-19 16:28:19 +02:00
Vincent Augagneur d1a35838cf //small fix 2013-09-19 16:09:53 +02:00
Jerome Nadaud 15622fbf45 // Customers group 2013-09-19 14:25:17 +02:00
Jerome Nadaud cd627113b6 // Some fix 2013-09-19 12:13:24 +02:00
Jerome Nadaud c23f01cdc8 // Attributes Groups view 2013-09-19 10:48:16 +02:00
Rémi Gaillard e7286c44f2 // typo 2013-09-18 18:08:22 +02:00
Jerome Nadaud 5bed29a538 // Fix Employees fields 2013-09-18 17:40:46 +02:00
Jerome Nadaud 38d565110f // List header fix 2013-09-18 17:23:22 +02:00
Jerome Nadaud 4413d04525 // Customer fix 2013-09-18 17:05:16 +02:00