dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,926 Commits 9 Branches 19 Tags
e448ac8de5d59fdb697dfe071fdf4eabb53b6aaa
Commit Graph
20926 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Francois Gaillard 77b2b4b6ca // Manual merge PS 1.5.6.0 2013-10-07 18:22:55 +02:00
cedricfontaine d63288affd Update loyalty.php 
Price should apply tax as in configuration.
 2013-10-07 12:14:13 -04:00
Damien Metzger c51fe5b22d // Changelog 1.5.6.0 1.5.6.0 2013-10-07 18:07:25 +02:00
cedricfontaine 717e195f57 Update LoyaltyModule.php 
Voucher should be without taxes, otherwise points would be negative.
 2013-10-07 12:07:03 -04:00
Gregory Roussac f78a093a1c Merge pull request #815 from PrestanceDesign/development 
[*] TR : Italian translation of the country instead of English
 2013-10-07 08:39:39 -07:00
Sarah Lorenzini 8f1b19a30b // update customer service page 2013-10-07 16:45:48 +02:00
PrestanceDesign f9f5a4b090 Italian translation of the country instead of English 2013-10-07 16:45:22 +02:00
Jerome Nadaud e94a32f80e // Localization Countries edit bootstraped 2013-10-07 14:50:57 +02:00
Jerome Nadaud 6f2358a0da // Manufacturer view bootstraped 2013-10-07 14:16:41 +02:00
Jerome Nadaud 2c4a20e21a // Add form group to referer view form items 2013-10-07 13:44:04 +02:00
Jerome Nadaud efb041b747 // New referer Bootstraped 2013-10-07 13:40:36 +02:00
Jerome Nadaud 483aa8ad7d // Add block name fieldset and input_row 2013-10-07 13:34:35 +02:00
Gregory Roussac 92ffb1eab1 Merge pull request #812 from djfm/release 
[*] TR : updated Russian installer
 2013-10-07 03:25:42 -07:00
Francois Gaillard f4610c06e0 [-] BO : Bug fix - Modules confirmation messages 2013-10-07 12:21:16 +02:00
Francois Gaillard 68cba08303 [-] BO : Bug fix - Modules confirmation messages 2013-10-07 12:18:44 +02:00
djfm 2969a7f74c // updated Russian installer 2013-10-07 10:14:43 +00:00
Rémi Gaillard 1ed26e2d4e // default perms profiles 2013-10-07 12:13:59 +02:00
gRoussac 302260539b // Report from https://github.com/Lupul/PrestaShop/commit/ebf09792e95598c30d8ac2617c4eabdd571be475 2013-10-07 12:08:39 +02:00
gRoussac d125ca0a36 [-] FO : isVirtualCart was forced to false 2013-10-07 12:06:28 +02:00
Jerome Nadaud 8c67235c2e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-07 12:03:43 +02:00
Jerome Nadaud 6fc12968b8 // Fix missing module configuration bar #PSCSX-3 2013-10-07 12:03:37 +02:00
Jerome Nadaud 97824b2335 // License 2013-10-07 12:02:51 +02:00
gRoussac adb1779764 [-] FO : isVirtualCart was forced to false 2013-10-07 12:02:47 +02:00
gRoussac 900209f93c // bad commit https://github.com/PrestaShop/PrestaShop/commit/c2bcc5baa1e6dd73f46a0811bf8889b80bcdc982 2013-10-07 11:44:09 +02:00
Fabio Chelly a652590885 Merge remote-tracking branch 'origin/development' into development 2013-10-07 11:34:56 +02:00
Fabio Chelly 2515d81bdd [*] BO Module search: Quick search can now search modules by name and not only display name 2013-10-07 11:34:16 +02:00
Gregory Roussac bf65404413 Merge pull request #810 from studiokiwik/sk-ps15x-001 
[-] MO : button tag on line 56 weren't closed
 2013-10-07 02:29:19 -07:00
gRoussac e3db5570d0 [-] BO : Retro compat, PS_ADMIN_DIR not defined //bad commit sorry 2013-10-07 11:24:42 +02:00
Kevin Granger 2c3bf85ca7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-07 11:12:59 +02:00
Kevin Granger ba7d9eec21 // fix Orders 2013-10-07 11:11:21 +02:00
Jerome Nadaud 9b79a02e88 // Remove unused function 2013-10-07 11:03:42 +02:00
Jerome Nadaud a1f5455d07 // Fix Mark as favorite not updated 2013-10-07 11:03:03 +02:00
Gregory Roussac 68131dc28b Merge pull request #811 from studiokiwik/sk-ps15x-002 
[-] TR : typo fixed in polish installer translation (line 85)
 2013-10-07 01:59:10 -07:00
gRoussac 7a7da1097d [-] BO : Employee's default_tab may not exists, switching to AdminOrders 2013-10-07 10:53:03 +02:00
gRoussac df0a24d63c [-] BO : Retro compat, PS_ADMIN_DIR not defined 2013-10-07 10:47:41 +02:00
Vincent Augagneur 46fef35348 //homefeatured now use bootstrap design 2013-10-07 10:25:10 +02:00
Tomasz Slominski 4254ae6edc typo fixed in polish installer translation (line 85) 2013-10-07 10:05:43 +02:00
Vincent Augagneur 3f4f298ad4 [-] CORE fixed bug #PSCFV-10595 - small fix in function addJqueryPlugin() 2013-10-07 10:01:26 +02:00
Gregory Roussac 2a475d066f Merge pull request #803 from ldecoker/patch-8 
[-] BO : Missing $php_self variable in OrderDetailController.php
 2013-10-07 01:00:42 -07:00
Tomasz Slominski b941ac007b bugfix: button tag on line 56 weren't closed 2013-10-07 09:57:55 +02:00
Damien Metzger d6ffb45eb1 Merge pull request #809 from djfm/kill_miss 
[*] LO : Removed 'Miss' from the default genders because too country specific
 2013-10-07 00:57:13 -07:00
djfm b6bba0c787 [*] LO : Removed 'Miss' from the default genders because too country specific 2013-10-07 07:53:19 +00:00
Rémi Gaillard 3477cac1e0 Merge pull request #800 from Ha99y/20131004_retro-compat.js.php 
__DIR__ is available since PHP 5.3
 2013-10-07 00:35:02 -07:00
Vincent Augagneur 5c605067f0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-07 09:09:26 +02:00
Vincent Augagneur 8a6dc6233d //jquery.smartWizard use bootstrap css classes 2013-10-07 09:08:20 +02:00
indesign47 d3d0897012 [-] MO : productcomments round average up not down 
200 comments with 5 stars and only 1 with 4 stars give only 4 stars
Thanks to manit4c
 2013-10-07 04:02:42 +02:00
indesign47 e0978a0b84 [-] MO : productcomments errors translated in multi-language 2013-10-07 03:18:56 +02:00
ldecoker 148348855e Update OrderDetailController.php 
Missing $php_self variable
 2013-10-06 16:31:54 +02:00
indesign47 b61e3e68b9 Update AdminImportController.php 2013-10-05 10:50:19 +02:00
ha99y 98aea24fc3 __DIR__ was never defined 
The JS files would not lode, when in dev mode because __DIR__ was not
defined
 2013-10-04 17:18:23 -07:00