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

136 Commits

Author SHA1 Message Date
TMMeilleur
95b9710eda fixed add to wishlist/compare buttons and added product review 2013-11-18 15:52:39 +02:00
Rémi Gaillard
fa3aa8c9d7 // strict standard 2013-11-13 15:46:06 +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
Jonathan Danse
9f396ada83 //remove unnecessary addCSS (fancybox) 2013-11-05 10:13:13 +01:00
Damien Metzger
cfeeda7d9b // Assigned compared products to smarty 2013-11-04 11:00:50 +01:00
Damien Metzger
e8f68441db // Assigned shop phone to frontend smarty 2013-10-21 19:02:25 +02:00
Damien Metzger
fa6d09a756 // Fixed warning 2013-10-14 15:56:53 +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
Rémi Gaillard
1316bd7e1f // add check stock value for color list if needed 2013-10-11 14:11:12 +02:00
Rémi Gaillard
3b677092bf [*] FO: You can now choose the anchor separator for attributes 2013-10-09 11:01:18 +02:00
Rémi Gaillard
f2c6887497 // quickview 2013-10-08 17:44:10 +02:00
Rémi Gaillard
0db2372724 // add color list to some controllers 2013-10-08 15:39:06 +02:00
gRoussac
e4a642128a [-] FO : Fix bug #PSCFV-10606 could not have correct taxCalculationMethod when vat number in customer address 2013-10-08 11:09:52 +02:00
thoma202
1ccc25f56c Merge branch 'development' of github.com:202-ecommerce/PrestaShop into development 2013-10-02 14:38:44 +02:00
thoma202
eb7655e318 [+] Added hook in maintenance page 2013-10-02 11:58:35 +02:00
Rémi Gaillard
7aa348eb93 // bad char 2013-09-20 15:48:22 +02:00
Rémi Gaillard
9b878a33a8 // fix canonical and ssl page without ssl 2013-09-20 14:12:41 +02:00
gRoussac
4e1d6de9b0 [-] FO : Fix bug #PSCFV-10328 Set country currency if defined when geolocated 2013-09-18 17:57:00 +02:00
Rémi Gaillard
0452979ce7 [*] FO: Allow to enable SSL on all the pages 2013-09-18 16:30:34 +02:00
Francois Gaillard
e1d0347757 [-] Classes : Bug fix - FrontController, mobile & JS minifier fixed 2013-09-09 10:17:15 +02:00
Vincent Augagneur
8a0745e8de [-] BO : fixed bug #PSCFV-9782 - live edit bug with multistore 2013-08-19 17:21:03 +02:00
Jerome Nadaud
8cd3fd0cfe [-] FO : FixBug Missing PS_STOCK_MANAGEMENT smarty variable 2013-08-14 17:40:36 +02:00
gRoussac
9ccd9b7cad [-] FO : Do not redirect on 301 when POST request 2013-08-08 19:19:34 +02:00
Gregory Roussac
bf355e934e Merge pull request #634 from PhpMadman/RefSort 
[*] FO : Sort by Product reference
 2013-08-06 09:13:06 -07:00
PhpMadman
6a54f6efd5 [*] BO: Add reference to FrontController 2013-08-06 15:32:30 +02:00
Damien Metzger
3389cf8acb [-] FO : fixed pagination for p = 0 #PSCFV-9746 2013-07-19 14:08:24 +02:00
Damien Metzger
219ec6e8be [-] FO : Removed useless live edit query #PSCFV-9845 2013-07-19 09:50:30 +02:00
Rémi Gaillard
ba1c4b9f3a [-] FO: http page should be redirected to http when accessed with https #PSCFV-9212 2013-06-04 16:27:47 +02:00
gRoussac
f00d0e8471 [*] FO : Check if grid_prestashop.css is available in theme before including 2013-04-04 12:48:22 +02:00
gRoussac
c3ce452405 [-] FO : Fix bug #PSCFV-7825 removing import of grid_prestashop.css and displaying errors in AdminPerformances 2013-04-03 15:20:15 +02:00
gRoussac
2a3373eb1d [-] BO : Fix bug #PSCFV-8481 no live edit on index when one language is active only 2013-03-29 11:37:08 +01:00
Francois Gaillard
70d79c5983 Revert "[-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler" 
This reverts commit da77ce1029.
 2013-03-14 17:01:16 +01:00
Francois Gaillard
505d3be5c3 [-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler 2013-03-14 16:37:22 +01:00
Francois Gaillard
9f2de77e36 [-] FO : Mobile theme updated, templates added/improved 2013-03-13 15:28:42 +01:00
Damien Metzger
3919fe810c [-] FO : the option that disable the tax display in the cart wasn't used anymore, I used it again #PSCFV-8033 2013-03-05 17:55:07 +01:00
Rémi Gaillard
9b85cb1f76 // delete useless commented code 2013-02-19 14:45:25 +01:00
Rémi Gaillard
0ec4f02502 [-] FO: don't load medias if error on product page to avoid JS bugs 2013-02-11 17:33:19 +01:00
Rémi Gaillard
8fd63e0f6e // PHP_SELF is only index.php 2013-02-04 14:22:59 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
e472ff7239 [-] FO : fixed loop redirect when pagination have 0 product 2012-12-17 15:25:56 +01:00
vAugagneur
cfa1359c87 [-] FO : small fix on mobile logo url 2012-12-13 09:30:55 +01:00
Damien Metzger
e6ad7ec815 [-] FO : jquery mobile was not compatible with js minifier, I updated both 2012-12-11 14:01:40 +01:00
vAugagneur
712f0c3d6d [-] FO : fixed bug #PSCFV-5826 #PSCFV-4697 Live edit only works for home page && Live edit can't load module 2012-12-04 18:29:10 +01:00
Rémi Gaillard
da5c5fb4a0 [-] Core: Locales should be setted anywhere #PSCFV-5953 2012-12-04 15:40:17 +01:00
Vincent Augagneur
539011c057 Merge pull request #55 from PrestaEdit/mobile_logo 
[+] FO: Mobile logo
 2012-11-30 02:06:19 -08:00
PrestaEdit
99b97d9bb7 [*] FO: use initLogoAndFavicon() function 2012-11-29 21:57:04 +01:00
PrestaEdit
f7b40b24b9 [*] FO: add initLogoAndFavicon() 2012-11-29 21:56:03 +01:00
PrestaEdit
36851aaa58 [+] FO: modifiy width and height smarty vars for the mobile logo 2012-11-28 01:31:43 +01:00
PrestaEdit
59035bd99a [+] BO: modifiy smarty var $logo_url to have the mobile logo image if mobile version 2012-11-28 01:23:24 +01:00
vAugagneur
0993d57862 [-] FO : fixed bug #PSCFV-5865 - Payment modules are not visible in the hookPayment for a foreigner country 2012-11-27 16:33:32 +01:00