dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,949 Commits 9 Branches 19 Tags
4a013cf5377654536a4e4875fa27fa236a89c3ce
Commit Graph
20949 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zollner Robert 1787923c4c [-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency (changed NULL to lowercase) 2013-10-05 00:42:29 +03:00
Zollner Robert 481cb5c28a [-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency 2013-10-04 23:30:24 +03:00
Kevin Granger 2ab3f08eab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-04 19:13:13 +02:00
Kevin Granger c2ea0be841 // orders WIP 2013-10-04 19:13:02 +02: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
gRoussac d141f5bdc0 // wrong modif on ProductSale 2013-10-04 18:35:30 +02:00
gRoussac c2bcc5baa1 [*] FO : TM home modules preparation 2013-10-04 18:32:31 +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 2e4f5c0b07 // Menus details list is now bootstraped 2013-10-04 17:34:07 +02:00
Damien Metzger 337725bb86 // Fixed KPI with 0 value 2013-10-04 17:28:03 +02:00
Vincent Augagneur 5564b342f4 //wizard boostrap and title fix 2013-10-04 17:07:10 +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
Vincent Augagneur 828b838d22 //products comparison link 2013-10-04 16:25:47 +02:00
Jerome Nadaud 5557ac1aee // Remove attribute language desc from stock movement list when product attribute is removed 2013-10-04 15:30:27 +02:00
Damien Metzger 5c5a989cda // Added javascript validation functions (demo) 2013-10-04 15:24:50 +02:00
Rémi Gaillard 16dfa4e73d // missing file 2013-10-04 15:12:08 +02:00
Jerome Nadaud 887b68d3f2 // Customers Groups View list resize 2013-10-04 14:24:33 +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
Jerome Nadaud 5b203cf789 // Remove languages select when only one language 2013-10-04 13:51:38 +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 9ae6546d90 // Features - Remove select language with one language and add autosize to textarea 2013-10-04 12:23:01 +02:00
Jerome Nadaud 093bf9e065 [-] MO : Blocklayered - Fix expand/collapse tree problem 2013-10-04 11:51:12 +02:00