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

5310 Commits

Author SHA1 Message Date
Kevin Granger ba28c5f527 // UI fixs 2013-10-31 15:49:57 +01:00
Kevin Granger 534421fb6b // UI fixs 2013-10-31 12:20:29 +01:00
Jerome Nadaud 9f2424db41 // Fix Module exception in transplant 2013-10-30 18:11:33 +01:00
Rémi Gaillard 8aa369531e // employee avatar 2013-10-30 18:02:10 +01:00
Vincent Augagneur ad68105467 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-30 10:52:04 +01:00
Vincent Augagneur 0020412aea //added Preactivation request on dashboard 2013-10-30 10:51:58 +01:00
Damien Metzger 4fe4d71361 // Stats cleaning 2013-10-29 15:29:55 +01:00
Damien Metzger dabb23ac8d // Added KPIs to the category page and fixed dashboard data 2013-10-29 11:03:09 +01:00
Jerome Nadaud a466c6f5f7 // Add tagify system to product information 2013-10-28 16:32:17 +01:00
Kevin Granger 3798adff2f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-28 16:19:02 +01:00
Kevin Granger d523d739e7 // dashboard date range picker wip 2013-10-28 16:18:43 +01:00
Jerome Nadaud 5760718b85 // Add Save button to page header toolbar 2013-10-28 15:55:58 +01:00
Damien Metzger 08732eda50 // Fixed default selection in the stats submenu 2013-10-28 12:08:46 +01:00
Damien Metzger b6799d4f2f [*] BO : download attachments directly from the list 2013-10-28 11:57:40 +01:00
Damien Metzger 39f6a2354a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	classes/helper/HelperForm.php
	classes/helper/HelperUploader.php
 2013-10-25 18:58:07 +02:00
Damien Metzger 03857c0576 [*] BO : you can know download the previous file near the upload file input 2013-10-25 18:55:25 +02:00
Rémi Gaillard 8b1f9d0560 // small changes on admincms 2013-10-25 18:42:54 +02:00
Damien Metzger e9a802cf23 [*] BO : Added the number of associated products in the product attachments list 2013-10-25 18:04:27 +02:00
Rémi Gaillard 5ac471deaf // product toolbar 2013-10-25 16:11:33 +02:00
Damien Metzger aa322e4777 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
 2013-10-25 15:22:01 +02:00
Damien Metzger e8d5dc8a62 [*] BO : search results improvements (no unaccessible tabs, better display, better information) 2013-10-25 15:19:03 +02:00
Jerome Nadaud 81482df1e5 // Fix merge 2013-10-25 14:33:29 +02:00
Jerome Nadaud 8d1765f2df Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	controllers/admin/AdminCategoriesController.php
 2013-10-25 14:29:02 +02:00
Jerome Nadaud bff1ad8833 // Some changes to integrate uploader helper 2013-10-25 14:20:42 +02:00
Rémi Gaillard 3997543e7f // notice 2013-10-25 11:35:01 +02:00
Damien Metzger 087d0d8206 // Fields resizing 2013-10-25 11:25:13 +02:00
Damien Metzger 0ca5a24e84 // Added field (bootstrap) size in helper form 2013-10-25 10:16:39 +02:00
Damien Metzger cd5fa81025 // Fixed boulette 2013-10-24 19:29:22 +02:00
Jerome Nadaud ea7b8b175e // Fix list title 2013-10-24 17:18:14 +02:00
Damien Metzger df639337af // Code cleaning and small fixes 2013-10-24 17:04:55 +02:00
Damien Metzger 2931c20914 // Fixed rounding 2013-10-24 16:38:48 +02:00
Damien Metzger a1df97776a // Set default values 2013-10-24 13:54:55 +02:00
emilien-puget 92c2f6953f changed path from dirname(__FILE__) to PS_ROOT_DIR 2013-10-24 11:44:52 +02:00
Rémi Gaillard 9a7c3dd88f // small fix 2013-10-24 10:14:44 +02:00
Kevin Granger 7a8cdf3913 // admin create order WIP 2013-10-23 18:54:44 +02:00
Rémi Gaillard e1887425fa [*] BO: Add an option to choose to not import the behavior of taxes displaying for the groups in localization pack import 2013-10-23 18:22:53 +02:00
Damien Metzger 9930c375c7 // Dashgoals :) 2013-10-23 15:37:43 +02:00
Rémi Gaillard be1299d8d7 // small fix 2013-10-23 14:19:19 +02:00
Kevin Granger 5ee716ff9e // fix admin edit countries 2013-10-23 11:18:31 +02:00
Jerome Nadaud 45ea4aefad // Fix Combinations ajax problem 2013-10-23 10:50:18 +02:00
Vincent Augagneur c61cec9f2a //display date on dashproducts && added param date_from & date_to on dashboard hooks 2013-10-23 09:59:16 +02:00
Jerome Nadaud 67fc91e2c9 // Categories thumbnails 2013-10-22 17:43:10 +02:00
Damien Metzger 3539a779f8 // Oops 2013-10-22 17:32:02 +02:00
Damien Metzger 4e8ba711d9 // Oops 2013-10-22 17:15:08 +02:00
Damien Metzger 8ef9e71966 // Refine dashboard net profits 2013-10-22 15:16:22 +02:00
Damien Metzger 857c66454b // Typo 2013-10-22 11:47:47 +02:00
Damien Metzger 16cf10d586 // New profitability calculation 2013-10-22 11:39:57 +02:00
Jerome Nadaud 96766a311e // Unify form fields for image preferences 2013-10-22 10:10:15 +02:00
Kevin Granger eb82297f45 // small fixs 2013-10-22 10:04:45 +02:00
Jerome Nadaud f336cc599b // Btn-primary replacement 2013-10-21 18:56:41 +02:00