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

487 Commits

Author SHA1 Message Date
Jerome Nadaud 0bf6410773 //Fix save and stay combinations problem 2013-10-23 12:10:36 +02:00
Jerome Nadaud 45ea4aefad // Fix Combinations ajax problem 2013-10-23 10:50:18 +02:00
Jerome Nadaud 766d0e01f4 // Adding reset button to form template 2013-10-22 18:00:39 +02:00
Vincent Augagneur fea7cd5983 //helper list must be wrapped by a form even if it's a simple header 2013-10-22 14:48:44 +02:00
Jerome Nadaud 73e9d966a6 // list bulk actions fix 2013-10-22 11:24:50 +02:00
Jerome Nadaud fb167d94f9 // Remove duplicate class 2013-10-21 19:13:19 +02:00
Jerome Nadaud f336cc599b // Btn-primary replacement 2013-10-21 18:56:41 +02:00
Jerome Nadaud 766e409476 // Wrong end block position 2013-10-21 18:34:03 +02:00
Jerome Nadaud d6ad300625 // List pagination improvements 2013-10-21 17:59:48 +02:00
Jerome Nadaud 5f75439a6b // Date range picker improvements 2013-10-21 17:07:57 +02:00
Jerome Nadaud e53e63c257 // Add Back button to list footer 2013-10-21 13:45:39 +02:00
Jerome Nadaud 53a7b75d7a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 12:36:02 +02:00
Jerome Nadaud 101df4c0b9 // Add check list filters value 2013-10-21 12:35:57 +02:00
Kevin Granger 957f9f0467 // categories group 2013-10-21 12:21:35 +02:00
Kevin Granger 067eecdc70 // small fix 2013-10-18 19:07:03 +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
Jerome Nadaud ac112c38df // File imput improvement 2013-10-18 17:32:29 +02:00
Kevin Granger 7189aa9de9 // fix yes/no, alert success, cache clear button 2013-10-17 17:33:55 +02:00
Jerome Nadaud 205e00d4a7 // small fix 2013-10-17 15:43:52 +02:00
Jerome Nadaud 0393e6bc6d // Date Range Picker improvement 2013-10-17 15:28:47 +02:00
Kevin Granger 1097bb56f9 // calendar 2013-10-17 14:35:51 +02:00
Jerome Nadaud 185c518d3d // Force cast on select filter 2013-10-17 14:06:48 +02:00
Jerome Nadaud 99f66e26d0 // Change datepicker class 2013-10-17 13:24:46 +02:00
Jerome Nadaud cee6c2b2d6 // Add class to calendar.tpl 2013-10-17 11:40:58 +02:00
Jerome Nadaud f9b115a2f8 // Date Range picker improvements 2013-10-17 11:39:02 +02:00
Kevin Granger 86ef9b5461 // calendar 2013-10-17 11:22:03 +02:00
Kevin Granger 89d7b9ab96 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 09:24:59 +02:00
Kevin Granger 334d0a01bd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/helpers/calendar/calendar.tpl
 2013-10-17 09:24:09 +02:00
Jerome Nadaud a85b931765 // Adding compare options 2013-10-16 19:07:23 +02:00
Kevin Granger 561c036240 // calendar 2013-10-16 19:03:02 +02:00
Jerome Nadaud 6a7990869a // Range datepicker special compare actions 2013-10-16 18:26:00 +02:00
Jerome Nadaud 6ed8afd1be // Fix names 2013-10-16 16:36:05 +02:00
Jerome Nadaud c7f8b30e88 // Add compare system to daterange picker 2013-10-16 16:30:41 +02:00
Kevin Granger f225fb5f2c // replaced class .row with class .form-group inside forms 2013-10-16 14:19:26 +02:00
Damien Metzger 04999f7624 // Small fixes 2013-10-16 09:43:38 +02:00
Jerome Nadaud 3aa6976e31 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-15 19:14:51 +02:00
Jerome Nadaud 04e760512f // Fix month overlapping on datapicker 2013-10-15 19:14:45 +02:00
Kevin Granger 0e7a7f8be4 // replace fieldset with div for responsive table 2013-10-15 18:09:53 +02:00
Jerome Nadaud 2157311f11 // Some improvement for range datepicker 2013-10-15 18:04:28 +02:00
Jerome Nadaud 5fd6b9aac6 // Add overflow-y to module payments 2013-10-15 14:53:31 +02:00
Kevin Granger d23714e9e8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-15 12:11:15 +02:00
Kevin Granger d1bc5eb6e0 // calendar WIP 2013-10-15 12:10:05 +02:00
Jerome Nadaud 7d85b21e92 // Pagination fix 2013-10-14 18:22:55 +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 7e9cdbb163 // Pagination fix 2013-10-14 17:30:56 +02:00
Jerome Nadaud f4118c4f9d // Fix some table header column title 2013-10-14 15:06:09 +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 833091674c // Adding translations and PHP date format for datepicker 2013-10-14 11:34:04 +02:00
Jerome Nadaud 80c8605264 // Adding RTL to calendar helper 2013-10-14 09:14:18 +02:00