dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,730 Commits 9 Branches 19 Tags
e1568a67a2cf142bafa1f4c6a8cdc24d15ba90d0
Commit Graph
6920 Commits
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 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
Fabio Chelly 92cf31e5c3 [-] MO : Fixed #PNM-1600 by modifying getPageLink() 2013-11-07 16:46:30 +01:00
Jerome Nadaud 18718792be // Uploader helper part 3 2013-11-07 16:42:00 +01:00
Fabio Chelly fa7d44d67f Merge remote-tracking branch 'origin/development' into development 2013-11-07 16:39:26 +01:00
Fabio Chelly b9c4b5d2a7 [-] FO : Prevents warning in safePostVars when $_POST has been unset 2013-11-07 16:38:53 +01:00
Gregory Roussac fbd28f3e49 Merge pull request #942 from Jacky75/20131107_payment_and_groups 
[-] FO : in multistore payment module restrictions by customer group was...
 2013-11-07 06:39:57 -08:00
Daniele Giachino 8c8340db4e [-] FO : in multistore payment module restrictions by customer group was not applied to specific shop 2013-11-07 15:18:59 +01:00
djfm 1bb550cf63 // allow hook exceptions on product comparison page 2013-11-07 13:01:54 +00:00
gRoussac e6f9f806bf [-] FO : Fix bug #PSCFV-10892, getCMSPages by id_shop thnaks @jd440 2013-11-07 12:03:35 +01:00
gRoussac 00887942d3 // preg_last_error not available on every stacks 2013-11-06 18:32:39 +01:00
gRoussac afe6c9bc6f // missing dir sep on is_dir (open_basedir) 2013-11-06 18:23:01 +01: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
PrestaLab b2e5c6090d Fixed tags with UTF-8 chars 
Fixed error Tag->Name is not valid if tag in non latin chars
 2013-11-05 23:33:44 -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
Rémi Gaillard d4253b9849 // small fix 2013-11-05 15:33:21 +01:00
Kevin Granger eb383e580e // Organize css/sass + backward compatibility WIP 2013-11-05 12:32:41 +01:00
gRoussac 26a43260c5 [-] CORE : invalid method name in displayAjax method of Controller action 2013-11-05 10:18:53 +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 f5cc6862cb // don't die on autoload 2013-11-04 18:08:24 +01:00
Rémi Gaillard 2c3a5c553d // small fix 2013-11-04 17:23:04 +01:00
Rémi Gaillard f4740088c1 // small fix 2013-11-04 17:22:08 +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
Rémi Gaillard b3c54a59dd // typo 2013-11-04 11:48:30 +01:00
Rémi Gaillard 06d73554be // preg instead strpos 2013-11-04 11:39:48 +01:00
Damien Metzger cfeeda7d9b // Assigned compared products to smarty 2013-11-04 11:00:50 +01:00
Rémi Gaillard 6ef7f258ea // small fix 2013-11-04 10:34:58 +01:00
gRoussac c7323c2bfe [-] CORE : Fix bug #PSCFV-10901 warnings on htmlentities 2013-11-03 22:59:04 +01:00
Jerome Nadaud 671062af07 // Add Disable overrides to debug mode 2013-10-31 18:41:56 +01:00
Rémi Gaillard 1b019dffc5 // Fix lang detection on dispatcher 2013-10-31 15:28:19 +01:00
Rémi Gaillard 9611ea1f70 [-] BO: Fix empty group list on changing opt or newsletter on customers listing 2013-10-31 11:22:40 +01:00
gRoussac cbfa8dfc30 // forgot to commit in https://github.com/PrestaShop/PrestaShop/commit/f78cde96d633f65ece5700d2bc9793f134bdb7e6 2013-10-30 19:02:24 +01:00
Rémi Gaillard 8aa369531e // employee avatar 2013-10-30 18:02:10 +01:00
Jerome Nadaud da43700361 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-30 16:48:26 +01:00
Jerome Nadaud d7b46e80af [+] BO : Add debug mode system 2013-10-30 16:48:16 +01:00
Rémi Gaillard c56e8471c2 [-] BO: fix the checkbox of shop activation on modules configuration 2013-10-30 14:57:15 +01:00