dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,083 Commits 9 Branches 19 Tags
83167fee67add73445fca375c8656c8e77cdc92f
Commit Graph
9083 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Metzger 8d4723247e [-] FO : Fixed product comparator CSS 2013-04-23 15:35:21 +02:00
Damien Metzger 4162591e3e // Fixed Chrome issue with cart rules 2013-04-23 15:30:17 +02:00
Damien Metzger bec335441e // Change link to the documentation in the installer 2013-04-23 14:57:24 +02:00
vAugagneur 0156ddc30a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-23 14:22:45 +02:00
vAugagneur e363dc8759 Merge Pull Request #167 - Thanks @Zeyckler 2013-04-23 14:22:40 +02:00
Vincent Augagneur d1c7f9c012 Merge pull request #390 from ccauw/patch-7 
[*] BO : Add block "override_form_extra" in helper
 2013-04-23 05:20:43 -07:00
Damien Metzger 4be1bef203 // Remove "core" for the themes translations in the translation tool 2013-04-23 12:37:09 +02:00
Rémi Gaillard ceddfdd8e6 // add static page to replace white page for exceptions in FO 2013-04-23 11:54:11 +02:00
vAugagneur 38eb16eb48 Merge Pull Request #53 - Thanks @Caleydon 2013-04-23 11:40:08 +02:00
François Gaillard f1e34c20b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-23 11:39:14 +02:00
Damien Metzger 13c435a54b // Fixed warning 2013-04-23 11:36:13 +02:00
Damien Metzger 4e21c56d1b // Changed translation tool behavior with dev mode and overrides 2013-04-23 11:21:10 +02:00
vAugagneur e466ede051 Merge Pull request #67 - Thanks @Ha99y 2013-04-23 10:02:29 +02:00
vAugagneur 5b7da618b5 Merge Pull Request #21 - thanks @Caleydon 2013-04-23 09:34:24 +02:00
Rémi Gaillard 75fed1a2cc Merge pull request #398 from djfm/release 
[*] TR : added russian installer tabs
 2013-04-22 09:42:39 -07:00
djfm da1f92b85b [*] TR : added russian installer tabs 2013-04-22 18:37:28 +02:00
Rémi Gaillard cd079f7a1a Merge pull request #397 from djfm/release 
[*] TR : Fixed wrong use of translation functions
 2013-04-22 08:46:15 -07:00
djfm 0da1eb9e35 [*] TR : Fixed wrong use of translation functions in AdminTranslationsController 2013-04-22 17:24:47 +02:00
Damien Metzger 38adc4aaf3 Merge pull request #396 from djfm/installer_tabs 
[*] TR : Added tab translations for installer languages
 2013-04-22 07:01:40 -07:00
djfm 7912aba499 [*] TR : Added tab translations for installer languages 2013-04-22 15:40:25 +02:00
vAugagneur 5fb2bb9ee2 [*] BO : added new button on manufacturers view 2013-04-22 14:56:59 +02:00
gRoussac 59ab9b63cf [*] FO : one_phone_at_least should be set 2013-04-22 12:20:39 +02:00
gRoussac 90bf119624 [-] Fo : Remove additionnal space in phone field value 2013-04-22 12:20:23 +02:00
gRoussac 116df3b3fd [-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO 2013-04-22 12:20:07 +02:00
gRoussac 34688d6933 [*] FO : one_phone_at_least should be set 2013-04-22 12:18:26 +02:00
gRoussac 4bf41c590b [-] CORE : Fix bug #PSCFV-8705 stocks update for when no current state 2013-04-22 12:09:35 +02:00
vAugagneur 31e7c6a08e Merged Pull request #355 - thanks to @bibendi 2013-04-22 12:06:19 +02:00
Damien Metzger 141772725b // Fixed a few UI bugs in the stats 2013-04-22 11:57:36 +02:00
gRoussac fd46c87786 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-22 11:34:02 +02:00
gRoussac 34a2c0191c [-] CORE :Fix #PSCFV-8631 when order directly in payment state does not update stocks 2013-04-22 11:33:13 +02:00
Rémi Gaillard 7c4a188ae8 [-] BO: Fix #PSCFV-8872 HelperList::displayWarning() don't exists 2013-04-22 10:50:41 +02:00
Vincent Augagneur 7c43ae05fc Merge pull request #123 from rynge/admin_category_breadcrumbs 
[-] BO : Fixed a problem with the breadcrumbs in the admin category edit...
 2013-04-22 01:18:15 -07:00
vAugagneur b1a839263d [*] Modules : use jQuery in blocknewsletter to remove @todo comment - thanks @romainberger 2013-04-22 09:48:30 +02:00
vAugagneur 5f6d0614df [*] FO : Wait for the image to be loaded before displaying the big image on product page - thanks to @romainberger 2013-04-22 09:40:48 +02:00
Rémi Gaillard 16906d8590 [-] Core: fix redirection loop for bugged versions of mysql using column name aliases on order by 2013-04-19 15:48:18 +02:00
Rémi Gaillard cc3f9212ac // fix display of accessories for products without combinations 2013-04-19 15:15:25 +02:00
Rémi Gaillard 236675544b Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-04-19 15:14:51 +02:00
vAugagneur 22135487ab //new addons url in install process 2013-04-19 11:44:29 +02:00
vAugagneur da4c87d9ba [-] CORE : fixed bug #PSCFV-8787 - URL Rewriting remove accent 2013-04-19 11:07:59 +02:00
gRoussac f93c7ec8c7 [-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper 2013-04-19 10:34:20 +02:00
Damien Metzger 54b75b9818 // Fixed potential warning 2013-04-18 17:12:59 -03:00
Damien Metzger 65c1198480 // Changed link to documentation in the installer 2013-04-18 16:57:05 -03:00
Damien Metzger 29c0761645 // Removed useless message 2013-04-18 16:53:27 -03:00
Damien Metzger b1000d63b9 // Fixed truncate / escape order 2013-04-18 16:39:33 -03:00
gRoussac 62836d65ab [-] Fo : Remove additionnal space in phone field value 2013-04-18 19:43:04 +02:00
gRoussac e2905ca845 [-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO 2013-04-18 19:12:07 +02:00
François Gaillard b6d9c89b99 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 18:23:18 +02:00
gRoussac 1a8ab7f68c [-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop 2013-04-18 17:28:16 +02:00
Rémi Gaillard 38bdd421f7 // performance improve for ObjectModel::displayFieldName #PSCFV-8713 2013-04-18 17:12:05 +02:00
vAugagneur 803447b88d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 17:02:51 +02:00