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

556 Commits

Author SHA1 Message Date
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
Jerome Nadaud d575ba8273 // Adding compare dates to date range picker 2013-10-11 18:30:05 +02:00
Kevin Granger 41f5d9f1f1 // fix datepicker 2013-10-11 17:21:45 +02:00
Jerome Nadaud 0f28393c8f // Fix data range picker 2013-10-11 16:16:03 +02:00
Jerome Nadaud bedcacf0b4 // Starting development of data range picker 2013-10-11 16:12:40 +02:00
Kevin Granger 40d4da04bb // cleaned admin-theme.js - added date range picker 2013-10-11 11:18:27 +02:00
Kevin Granger 7d717ea207 // fix css + kpi + dashboard 2013-10-10 16:29:40 +02:00
Jerome Nadaud 22dcaf246c // Add icon and specific title to list 2013-10-10 15:36:50 +02:00
Jerome Nadaud 6245b05b6e // Remove flags from language select 2013-10-09 19:39:05 +02:00
Jerome Nadaud 0e4cb5bcd5 // Form group bootstraping 2013-10-09 18:59:20 +02:00
Jerome Nadaud 2d9a54c19e // Remove button icon class 2013-10-09 18:43:22 +02:00
Jerome Nadaud eae76eb63e // Pagination bootstraping 2013-10-09 18:36:19 +02:00
Jerome Nadaud d4bf765dd6 // Pagination bootstraping 2013-10-09 18:31:51 +02:00
Damien Metzger 9fcb039068 // A few CSS fixes 2013-10-09 14:57:15 +02:00
Damien Metzger 623b8c7960 // Added expense management to profitability KPI 2013-10-09 10:55:12 +02:00
Vincent Augagneur e16676efaa //added prefix & suffix on helper form 2013-10-09 10:51:04 +02:00
Jerome Nadaud b9cfc24922 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-08 18:42:19 +02:00
Jerome Nadaud d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Kevin Granger 3e6f425bd4 // Orders WIP 2013-10-08 12:26:48 +02:00
Jerome Nadaud 483aa8ad7d // Add block name fieldset and input_row 2013-10-07 13:34:35 +02:00
Kevin Granger 2ab3f08eab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-04 19:13:13 +02:00
Kevin Granger c2ea0be841 // orders WIP 2013-10-04 19:13:02 +02:00
Damien Metzger 337725bb86 // Fixed KPI with 0 value 2013-10-04 17:28:03 +02:00
Jerome Nadaud 5b203cf789 // Remove languages select when only one language 2013-10-04 13:51:38 +02:00
Jerome Nadaud 33b5971a7a [-] BO : FixBug #PSCFV-10558 - Invalid HTML markup. 2013-10-03 09:11:26 +02:00
Kevin Granger 19af1cfda5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-02 17:39:03 +02:00
Kevin Granger f168dd7c50 // list icon backward compat 2013-10-02 17:38:53 +02:00
Jerome Nadaud 7454d75fb9 // List simple header bootstraping 2013-10-02 17:08:28 +02:00
Jerome Nadaud 68c5318706 // Icon change for list details button 2013-10-02 14:49:42 +02:00
Jerome Nadaud a891c9277a // Advanced stock management details list 2013-10-02 12:09:03 +02:00
Jerome Nadaud ba2494fa8b // Remove language select on textarea with 1 langue 2013-10-02 09:43:24 +02:00
Jerome Nadaud 301de7a3a1 // Webservice and advanced stock list bootstraping 2013-10-01 18:29:35 +02:00