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

18608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
gRoussac adb1779764 [-] FO : isVirtualCart was forced to false 2013-10-07 12:02:47 +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
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
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
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
Rémi Gaillard b2b0c4f00b // remove debug 2013-10-04 18:45:18 +02:00
Rémi Gaillard 2aee99c0b0 [-] FO: Fix display of quantity discounts on product pages if the customer is allowable for multiple discount for the same quantity #PSCFV-10580 2013-10-04 18:37:30 +02:00
Fabio Chelly 48f20a4393 Merge remote-tracking branch 'origin/development' into development 2013-10-04 18:15:32 +02:00
Fabio Chelly 139a74e4cd [*] BO Module search: the PHP search has been replace by a quick search in JS to display results instantly 2013-10-04 18:15:12 +02:00
Jerome Nadaud 121fcdc39f // Fix list start 2013-10-04 16:56:35 +02:00
Vincent Augagneur fe6494bf35 //fixed bug PSCFV-10567 2013-10-04 16:33:50 +02:00
gRoussac a4b7fc942f [-] CORE : #PSCFV-10389 Avoid eventual empty Specific Price Rule 2013-10-04 14:11:42 +02:00
Rémi Gaillard fef8d2beac // Fix group reduction per category 2013-10-04 14:00:42 +02:00
Rémi Gaillard 6dacc07e62 // sometimes, translations files could not exist 2013-10-04 13:19:34 +02:00
indesign47 805989da39 [-] BO : AdminImport add products available fields 2013-10-04 13:04:52 +02:00
Jerome Nadaud 093bf9e065 [-] MO : Blocklayered - Fix expand/collapse tree problem 2013-10-04 11:51:12 +02:00
indesign47 75cb92c329 Update AdminImportController.php 2013-10-04 11:44:52 +02:00
Gregory Roussac f28131fe9b Merge pull request #795 from indesign47/patch-3 
[-] BO : AdminImport add combinations available fields
 2013-10-04 02:40:29 -07:00
indesign47 96646b5c7a [-] BO : AdminImport add products available fields 2013-10-04 10:56:41 +02:00
indesign47 a92ced814a [-] BO : AdminImport add combinations available fields 2013-10-04 10:26:38 +02:00
Jerome Nadaud 3d8591c588 [-] MO : Blocklayered - Fix empty fancy box after template edit 2013-10-04 10:14:07 +02:00
Gregory Roussac 09ad15730b Merge pull request #794 from indesign47/release 
[-] BO : AdminImport add adresses required fields
 2013-10-04 01:02:46 -07:00
indesign47 6c9b71ee58 [-] BO : AdminImport add adresses required fields 2013-10-04 04:35:00 +02:00
indesign47 0af24ab034 [-] BO : AdminImport add adresses required fields 2013-10-04 04:31:51 +02:00
Rémi Gaillard f100027e5d [-] FO: packages should be splitted with advanced stock management when carrier is not associated to multiple warehouse 2013-10-03 19:21:49 +02:00
Jerome Nadaud 6a0c376a18 [-] MO : Blocklayered - Fix empty fancy box after template edit 2013-10-03 18:58:09 +02:00
gRoussac 62d946ea68 [-] CORE : Fix bug #PSCFV-10179 Duplicate specific price records when updating a product 2013-10-03 18:41:06 +02:00
gRoussac 31f421153d [-] BO : Fix bug #PSCFV-9323 supplier_reference can be unset 2013-10-03 18:20:45 +02:00
gRoussac c75cda2429 [*] BO : AdminImport, retrieve separators and lang selected 2013-10-03 17:35:20 +02:00