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

3930 Commits

Author SHA1 Message Date
Vincent Augagneur 2f34af4646 //remove debug 2013-10-17 09:26:47 +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
Vincent Augagneur 22df963c72 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-16 16:09:51 +02:00
Vincent Augagneur c684fa13cb //module anchor now use instant search to filter module list 2013-10-16 16:09:44 +02:00
Rémi Gaillard 7c096d9769 // small fix 2013-10-16 15:48:52 +02:00
Kevin Granger f225fb5f2c // replaced class .row with class .form-group inside forms 2013-10-16 14:19:26 +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 486e6c1b66 // datepicker 2013-10-16 10:55:47 +02:00
Damien Metzger 04999f7624 // Small fixes 2013-10-16 09:43:38 +02:00
Jerome Nadaud 476bf72bcc // Ooops 2013-10-16 09:21:49 +02:00
Kevin Granger be2ea4ca77 // login 2013-10-15 20:04:19 +02:00
Jerome Nadaud dcbe3cb8e8 // Small datapicker fix 2013-10-15 19:16:23 +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
Rémi Gaillard 1b8526cd05 // fix ajax on module list 2013-10-15 18:35:04 +02:00
Jerome Nadaud aefd5947d2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-15 18:12:28 +02:00
Jerome Nadaud ed2e9bee70 // Small datepicker fix 2013-10-15 18:12:01 +02:00
Kevin Granger 0e7a7f8be4 // replace fieldset with div for responsive table 2013-10-15 18:09:53 +02:00
Damien Metzger 953f4c4686 // Fixed login social links 2013-10-15 18:08:57 +02:00
Jerome Nadaud a85c1d7933 // Add index.php files to dashboard folder 2013-10-15 18:05:02 +02:00
Jerome Nadaud 2157311f11 // Some improvement for range datepicker 2013-10-15 18:04:28 +02:00
Jerome Nadaud 6c6c3b240e // Fix bug display final price when country have no display tax 2013-10-15 15:06:38 +02:00
Jerome Nadaud 5fd6b9aac6 // Add overflow-y to module payments 2013-10-15 14:53:31 +02:00
Damien Metzger eed6b65914 // Added Addons block in the dashboard 2013-10-15 14:18:50 +02:00
Damien Metzger 7b307094b6 // Added comparison to the dashboard 2013-10-15 13:52:12 +02:00
Kevin Granger d19b0ed8e0 // icon for error notice 2013-10-15 12:31:17 +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
Kevin Granger 2bc927c810 // login css 2013-10-14 18:08:33 +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
Kevin Granger 3eeac7f2bb Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-14 16:35:01 +02:00
Kevin Granger 3f22a6b6c9 // login flip 2013-10-14 16:34:02 +02:00
Damien Metzger 8f10e42b60 // Small fixes 2013-10-14 15:49:57 +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
Kevin Granger 59435fa2ee // login flip WIP 2013-10-14 09:57:02 +02:00
Jerome Nadaud 80c8605264 // Adding RTL to calendar helper 2013-10-14 09:14:18 +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
Kevin Granger 89251a667b // feedback button 2013-10-11 18:26:12 +02:00