dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,132 Commits 9 Branches 19 Tags
1782bc082f2bb2daaed6b45e41403aebb2dd948a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Granger 42af175d22 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-07 21:49:11 +01:00
Kevin Granger 9c4ee27f20 // mobile nav WIP 2013-11-07 21:48:55 +01:00
Kevin Granger 402221ad0f // load enquire.js 2013-11-07 21:48:17 +01:00
Kevin Granger 51e962195c // This Controller needs a toolbar and a title 2013-11-07 17:15:40 +01:00
Kevin Granger 3eb9a7e772 // update bootstrap + add enquire.js 2013-11-07 14:19:23 +01:00
Kevin Granger 63e31a4585 Merge pull request #939 from djfm/bootstrap 
Translations (EN) / Mails / Fix Column
 2013-11-07 05:08:16 -08:00
Kevin Granger 866e7f831b // fixs highlight search 2013-11-06 19:26:22 +01:00
Kevin Granger 93717e910b // Repairs sake of performance on tables with many lines. 2013-11-06 18:15:17 +01:00
Kevin Granger df865eb827 Merge pull request #936 from TMMeilleur/bootstrap 
// improved  scss variables
 2013-11-06 07:00:31 -08:00
Kevin Granger 05c71145c2 // dashboard 2013-11-06 12:14:49 +01:00
Kevin Granger 5ec5215919 // UI modules fixs 2013-11-05 18:17:39 +01:00
Kevin Granger b68d8c5d4a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 17:15:51 +01:00
Kevin Granger 332101614a // moved nv.d3.css to vendor directory 2013-11-05 17:15:36 +01:00
Kevin Granger 2581acd505 // fix tooltip carrier wizard 2013-11-05 16:52:41 +01:00
Kevin Granger eb02711042 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 16:42:24 +01:00
Kevin Granger e702af6a67 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
 2013-11-05 16:42:09 +01:00
Kevin Granger 533ebc0f6d // backward CSS 2013-11-05 16:40:21 +01:00
Kevin Granger eb383e580e // Organize css/sass + backward compatibility WIP 2013-11-05 12:32:41 +01:00
Kevin Granger fbc93e5632 // moved admin css and backward compatibility css to admin theme css directory 2013-11-04 19:48:53 +01:00
Kevin Granger 8aedd4eb04 // Cleaned CSS files 2013-11-04 18:31:59 +01:00
Kevin Granger 9611c17980 // removed install.css http://www.youtube.com/watch?v=Y9mq7Qc4oSM 2013-11-04 17:28:50 +01:00
Kevin Granger ddd722dc14 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 17:08:43 +01:00
Kevin Granger 667848d1df // removed csshover.htc 2013-11-04 17:08:32 +01:00
Kevin Granger f3fa65f9be // removed admin-ie.css 2013-11-04 16:58:27 +01:00
Kevin Granger 68cda947ed // removed login.css 2013-11-04 16:53:43 +01:00
Kevin Granger 48025838df // fixs referrers 2013-11-04 16:08:38 +01:00
Kevin Granger d0c6d86eb9 // fixs for merge 2013-11-04 15:56:24 +01:00
Kevin Granger 92bd59fbea Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:43:10 +01:00
Kevin Granger 889a2006ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/message.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/favorites.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
	admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/combinations.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/ProductSale.php
	classes/helper/HelperList.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminCustomersController.php
	controllers/admin/AdminMetaController.php
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminProductsController.php
	controllers/front/ParentOrderController.php
	install-dev/theme/views/welcome.phtml
	modules/blocknewproducts/blocknewproducts.php
	modules/blocktopmenu/blocktopmenu.php
	modules/importerosc/importerosc.php
	modules/mailalerts/mailalerts.php
	modules/shopimporter/shopimporter.php
	modules/statsstock/statsstock.php
	themes/default/css/product_list.css
 2013-11-04 14:43:01 +01:00
Kevin Granger 84be298dc5 // some W3C fixs 2013-11-01 17:25:18 +01:00
Kevin Granger 1bcb8d5c82 // sass-bootstrap 3.0.1 update 2013-11-01 16:44:55 +01:00
Kevin Granger 9c499dc8a4 // Placeholder instead of label for list filter date 2013-11-01 16:28:21 +01:00
Kevin Granger bf781ed267 // horizontal nav 2013-11-01 15:50:33 +01:00
Kevin Granger 87eb9bba26 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-31 19:13:53 +01:00
Kevin Granger 64598535bd // Avatar + Vertical Nav WIP 2013-10-31 19:13:34 +01:00
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
Kevin Granger 03564fe0e5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-31 11:34:58 +01:00
Kevin Granger 4334364b36 // cart rules > conditions > product rules 2013-10-31 11:34:47 +01:00
Kevin Granger 09dcff959e // cart rules > conditions > product rules WIP 2013-10-30 19:25:58 +01:00
Kevin Granger df80e6ec8b // btn-group-action adjustments 2013-10-29 18:55:33 +01:00
Kevin Granger 0b564c0107 // oups 2013-10-29 18:15:17 +01:00
Kevin Granger aee725839e // fixs btn-group 2013-10-29 18:10:07 +01:00
Kevin Granger 5fa36abcaf // fixs UI 2013-10-29 17:32:57 +01:00
Kevin Granger b3d7b8754b // fixs date range picker Wip 2013-10-29 10:40:33 +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
Kevin Granger 7126397bfe // fix scroll vertical nav 2013-10-28 10:13:35 +01:00
Kevin Granger 8353bc5ac2 // fix attributes-color-container 2013-10-28 09:32:46 +01:00
Kevin Granger 50bc046671 // fix panel header tree actions (search + button) 2013-10-25 17:24:49 +02:00
Kevin Granger cae4770e0f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-25 14:58:30 +02:00
Kevin Granger 339f428c23 // fix login - (tabindex, loading, ellipsis) 2013-10-25 14:58:10 +02:00
Kevin Granger ddf65f3b97 // toolbar nav fixs 2013-10-25 10:33:45 +02:00
Kevin Granger acfc3bc266 // fixe buttons group wrap 2013-10-24 19:34:25 +02:00
Kevin Granger 5c3058d45b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-24 18:02:42 +02:00
Kevin Granger e3dad946e3 // fixs 2013-10-24 18:02:13 +02:00
Kevin Granger a02c31f106 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
 2013-10-24 17:53:30 +02:00
Kevin Granger 32d146d880 // admin orders 2013-10-24 17:36:50 +02:00
Kevin Granger 7a8cdf3913 // admin create order WIP 2013-10-23 18:54:44 +02:00
Kevin Granger 5ee716ff9e // fix admin edit countries 2013-10-23 11:18:31 +02:00
Kevin Granger aa95454c4e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/images/content.tpl
 2013-10-22 10:07:03 +02:00
Kevin Granger eb82297f45 // small fixs 2013-10-22 10:04:45 +02:00
Kevin Granger fadbc4c250 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 19:00:18 +02:00
Kevin Granger c89f6c1adb // css fix 2013-10-21 18:58:23 +02:00
Kevin Granger 3ae1f68b3b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 18:03:15 +02:00
Kevin Granger 2e13013657 // search field WIP 2013-10-21 18:03:00 +02:00
Kevin Granger 957f9f0467 // categories group 2013-10-21 12:21:35 +02:00
Kevin Granger a5ca6f11a7 // css email 2013-10-21 09:51:46 +02:00
Kevin Granger 1f02bcaa75 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-18 19:07:15 +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
Kevin Granger e17c5f7c91 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 18:43:31 +02:00
Kevin Granger 9c07cb9302 // fix informations 2013-10-17 18:43:15 +02:00
Kevin Granger d933466d04 // fixs add product informations 2013-10-17 18:11:47 +02:00
Kevin Granger 7189aa9de9 // fix yes/no, alert success, cache clear button 2013-10-17 17:33:55 +02:00
Kevin Granger c43a7093ac // fix calendar 2013-10-17 15:57:23 +02:00
Kevin Granger 7ae123227e // fix nav collapsed and clipping on page loading 2013-10-17 15:39:53 +02:00
Kevin Granger 1097bb56f9 // calendar 2013-10-17 14:35:51 +02:00
Kevin Granger b391d833d3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 14:01:50 +02:00
Kevin Granger 9abb9a9b15 // removed version fix bootstrap, please report forms where margin could miss between fields (.row => .form-group) 2013-10-17 14:01:26 +02:00
Kevin Granger dc43c0f7d3 // fix delete categories 2013-10-17 13:50:14 +02:00
Kevin Granger 193d3921fa // calendar date range picker compare 2013-10-17 11:40:02 +02:00
Kevin Granger ca1a03e81d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 11:22:17 +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
Kevin Granger 561c036240 // calendar 2013-10-16 19:03:02 +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
Kevin Granger 486e6c1b66 // datepicker 2013-10-16 10:55:47 +02:00
Kevin Granger be2ea4ca77 // login 2013-10-15 20:04:19 +02:00
Kevin Granger 8dce01e633 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-15 18:20:40 +02:00
Kevin Granger 0e7a7f8be4 // replace fieldset with div for responsive table 2013-10-15 18:09:53 +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
Kevin Granger 2bc927c810 // login css 2013-10-14 18:08:33 +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