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

5280 Commits

Author SHA1 Message Date
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
Damien Metzger 58aa64fab7 // Code cleaning 2013-10-21 18:18:48 +02:00
Kevin Granger 2e13013657 // search field WIP 2013-10-21 18:03:00 +02:00
Jerome Nadaud 6275e7bcad // Remove translations on icon class 2013-10-21 09:57:13 +02:00
Jerome Nadaud cdab5ed6c9 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
 2013-10-18 18:47:42 +02:00
Jerome Nadaud 7e176b157b // Fix save and preview button 2013-10-18 18:44:13 +02:00
Kevin Granger 04b4e548f3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-18 18:38:17 +02:00
Kevin Granger 5f52a9e171 // fix products 2013-10-18 18:38:02 +02:00
Damien Metzger d1a2c33322 Merge pull request #849 from djfm/bootstrap 
// Translations fix
 2013-10-18 09:35:20 -07:00
Jerome Nadaud 1c1fb5fb5c // Update image fix 2013-10-18 17:59:45 +02:00
Jerome Nadaud 1bee0087c0 // Update image fix 2013-10-18 17:50:36 +02:00
Jerome Nadaud 964f546b0b // Update image when updated 2013-10-18 17:41:36 +02:00
Jerome Nadaud 0599d4f056 // Fix Localization page header title 2013-10-18 17:41:10 +02:00
djfm b5b18b9d2b // use sprintf 2013-10-18 13:55:30 +00:00
Jerome Nadaud 088d23f8f9 // Add edit button to customer groups view list 2013-10-17 18:27:00 +02:00
Jerome Nadaud 08525e5af4 // Fix missing commits !!!! 2013-10-17 15:59:46 +02:00
Jerome Nadaud 99f66e26d0 // Change datepicker class 2013-10-17 13:24:46 +02:00
Jerome Nadaud 1f93d071c2 // Add transplant module button to page header toolbar 2013-10-17 13:24:01 +02:00
Jerome Nadaud f9b115a2f8 // Date Range picker improvements 2013-10-17 11:39:02 +02:00
Jerome Nadaud 1f50e074f7 // New order button fix 2013-10-17 09:37:19 +02:00
Jerome Nadaud a85b931765 // Adding compare options 2013-10-16 19:07:23 +02:00
Vincent Augagneur c684fa13cb //module anchor now use instant search to filter module list 2013-10-16 16:09:44 +02:00
Kevin Granger bc5b807a7b // graph update 2013-10-16 12:18:27 +02:00
Rémi Gaillard 2e65214c39 // manually merge of modules search 2013-10-16 11:36:40 +02:00
Kevin Granger be2ea4ca77 // login 2013-10-15 20:04:19 +02:00
Damien Metzger 7b307094b6 // Added comparison to the dashboard 2013-10-15 13:52:12 +02:00
Jerome Nadaud 7e4329a4dc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-14 17:31:50 +02:00
Jerome Nadaud 07073afa1f // Fix CMS filter, reset and sort 2013-10-14 17:28:21 +02:00
Kevin Granger 67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	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/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
Jerome Nadaud 0fe3630a05 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 18:30:16 +02:00
Jerome Nadaud d575ba8273 // Adding compare dates to date range picker 2013-10-11 18:30:05 +02:00