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

6828 Commits

Author SHA1 Message Date
Rémi Gaillard f4194bedd9 Merge pull request #978 from StanProg/bootstrap 
// FO : Removed unused local variable, tabs added, phpdoc tags
 2013-11-18 06:27:46 -08:00
TMMeilleur 95b9710eda fixed add to wishlist/compare buttons and added product review 2013-11-18 15:52:39 +02:00
Jerome Nadaud 8d90578cf7 // Add anchor to list 2013-11-15 16:04:27 +01:00
Jerome Nadaud 44f89053e4 // Invoice search fix 2013-11-15 15:00:56 +01:00
Jerome Nadaud 80957666cf // Hide collapse and expand button when not necessary 2013-11-14 19:21:31 +01:00
Stanislav Yordanov c5b1834870 [*] FO : Removed unused local variable, phpdoc return tag added 2013-11-14 19:22:39 +02:00
Jerome Nadaud 18a2e026ef // Adding more buttons to module configuration 2013-11-14 15:49:17 +01:00
Stanislav Yordanov e7e514dc77 Removed unused local variable, tab added, phpdoc tags fixed 2013-11-14 16:41:08 +02:00
Jerome Nadaud afaeb15b7d // Define default template dir on tree class 2013-11-13 20:10:13 +01:00
Francois Gaillard c9a2410c57 [-] Classes : AdminController - Changed admin-theme.css position 2013-11-13 17:48:21 +01:00
Rémi Gaillard fa3aa8c9d7 // strict standard 2013-11-13 15:46:06 +01:00
Rémi Gaillard 899dea47a1 // oups 2013-11-13 15:32:56 +01:00
Rémi Gaillard 2fe12b965b [-] Core: add possibility to choose the position of your css files 2013-11-13 15:31:29 +01:00
Vincent Augagneur 5963871a01 //small fix 2013-11-13 11:40:13 +01:00
Jerome Nadaud 0430d09753 // Better php def for Page header title edit and view 2013-11-12 11:36:26 +01:00
Jerome Nadaud ec37efdf8b // Add identifier name 2013-11-12 11:30:01 +01:00
Jerome Nadaud 94817a9371 // ooops 2013-11-12 11:16:31 +01:00
Jerome Nadaud db0e1e41a9 // Small Fix 2013-11-12 11:10:55 +01:00
Jerome Nadaud 41196f3c5f // General modification for view and edit title 2013-11-12 11:06:20 +01:00
Jerome Nadaud 3931914203 // Add Modernizr and Modernizr-loads check and loading for unsuported browsers 2013-11-12 09:54:20 +01:00
Jerome Nadaud a3082be2db // Remove unnecessary function 2013-11-08 17:53:26 +01:00
Jerome Nadaud 217a79eeae // Unify thumb param in files options 2013-11-08 17:49:56 +01:00
Jerome Nadaud ef469d7782 // Move spin and ladda js to products controller 2013-11-08 17:47:09 +01:00
Jerome Nadaud 5afe733e13 // Small fix on HelperUploader 2013-11-08 16:53:32 +01:00
Kevin Granger 42af175d22 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-07 21:49:11 +01:00
Kevin Granger 402221ad0f // load enquire.js 2013-11-07 21:48:17 +01:00
Rémi Gaillard e3cfacb90e // link to employee default tab and not index 2013-11-07 17:00:55 +01:00
Jerome Nadaud 01d8376ee7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-07 16:48:56 +01:00
Jerome Nadaud 18718792be // Uploader helper part 3 2013-11-07 16:42:00 +01:00
djfm 1bb550cf63 // allow hook exceptions on product comparison page 2013-11-07 13:01:54 +00:00
Jerome Nadaud 0c1b77b3da // Fix Combinations list actions button problem 2013-11-06 12:18:52 +01:00
Jérôme Nadaud 54db0b705c Merge pull request #923 from PrestaEdit/1.6.x-fancybox 
//remove unnecessary addCSS (fancybox)
 2013-11-06 00:31:57 -08:00
Kevin Granger 5ec5215919 // UI modules fixs 2013-11-05 18:17:39 +01:00
Damien Metzger a31dbeb68e // Fixed bootstrap mode for modules 2013-11-05 17:29:51 +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
Damien Metzger e4fe5f6df6 // Fixed htmlentities in KPIs 2013-11-05 16:01:48 +01:00
Kevin Granger eb383e580e // Organize css/sass + backward compatibility WIP 2013-11-05 12:32:41 +01:00
Jonathan Danse 9f396ada83 //remove unnecessary addCSS (fancybox) 2013-11-05 10:13:13 +01:00
Jerome Nadaud de8bd97831 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 19:50:48 +01:00
Jerome Nadaud cf44f8d0b4 // Uploader helper small fix 2013-11-04 19:50:04 +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
Jerome Nadaud fa68e015b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 18:34:51 +01:00
Jerome Nadaud d78a268730 // Uploader helper part 2 2013-11-04 18:31:43 +01:00
Rémi Gaillard 2c3a5c553d // small fix 2013-11-04 17:23:04 +01:00
Francois Gaillard a81cde11d6 [-] Classes : ProductSale - Merge fix 2013-11-04 15:35:59 +01:00
Damien Metzger 27273334e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:47:16 +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
Damien Metzger cfeeda7d9b // Assigned compared products to smarty 2013-11-04 11:00:50 +01:00
gRoussac c7323c2bfe [-] CORE : Fix bug #PSCFV-10901 warnings on htmlentities 2013-11-03 22:59:04 +01:00