dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,079 Commits 9 Branches 19 Tags
ea6b4eaef84a0d1f1fdb9de48086efa7faefb67f
Commit Graph
9079 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
vAugagneur ece02e6bf3 Merge Pull Request #167 - Thanks @Zeyckler 2013-04-23 14:22:40 +02:00
Vincent Augagneur 5e9ba185ef 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 d8313760ec // Remove "core" for the themes translations in the translation tool 2013-04-23 12:37:09 +02:00
Rémi Gaillard 9282e310f4 // add static page to replace white page for exceptions in FO 2013-04-23 11:54:11 +02:00
vAugagneur 2d2b9f76e0 Merge Pull Request #53 - Thanks @Caleydon 2013-04-23 11:40:08 +02:00
Francois Gaillard e61bd7c185 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-23 11:39:14 +02:00
Damien Metzger b9a877625c // Fixed warning 2013-04-23 11:36:13 +02:00
Damien Metzger 7ce6502600 // Changed translation tool behavior with dev mode and overrides 2013-04-23 11:21:10 +02:00
vAugagneur da96eb6651 Merge Pull request #67 - Thanks @Ha99y 2013-04-23 10:02:29 +02:00
vAugagneur 18ed37127d Merge Pull Request #21 - thanks @Caleydon 2013-04-23 09:34:24 +02:00
Rémi Gaillard d8453cccfb Merge pull request #398 from djfm/release 
[*] TR : added russian installer tabs
 2013-04-22 09:42:39 -07:00
djfm 88dce29e32 [*] TR : added russian installer tabs 2013-04-22 18:37:28 +02:00
Rémi Gaillard 4adc9f2ccf Merge pull request #397 from djfm/release 
[*] TR : Fixed wrong use of translation functions
 2013-04-22 08:46:15 -07:00
djfm 19ce381cba [*] TR : Fixed wrong use of translation functions in AdminTranslationsController 2013-04-22 17:24:47 +02:00
Damien Metzger 260dd12edd Merge pull request #396 from djfm/installer_tabs 
[*] TR : Added tab translations for installer languages
 2013-04-22 07:01:40 -07:00
djfm 6a70093416 [*] TR : Added tab translations for installer languages 2013-04-22 15:40:25 +02:00
vAugagneur 3d6d97af5f [*] BO : added new button on manufacturers view 2013-04-22 14:56:59 +02:00
gRoussac bcdb85c309 [*] FO : one_phone_at_least should be set 2013-04-22 12:20:39 +02:00
gRoussac 5be95a8a98 [-] Fo : Remove additionnal space in phone field value 2013-04-22 12:20:23 +02:00
gRoussac 58884b2da7 [-] 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 d8b39d060d [*] FO : one_phone_at_least should be set 2013-04-22 12:18:26 +02:00
gRoussac c5ed733cfc [-] CORE : Fix bug #PSCFV-8705 stocks update for when no current state 2013-04-22 12:09:35 +02:00
vAugagneur aead567def Merged Pull request #355 - thanks to @bibendi 2013-04-22 12:06:19 +02:00
Damien Metzger e7b22ad8d4 // Fixed a few UI bugs in the stats 2013-04-22 11:57:36 +02:00
gRoussac 6b8c3d8612 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-22 11:34:02 +02:00
gRoussac 1acd07e063 [-] 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 20f8709940 [-] BO: Fix #PSCFV-8872 HelperList::displayWarning() don't exists 2013-04-22 10:50:41 +02:00
Vincent Augagneur c643abcfa2 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 ec051deb31 [*] Modules : use jQuery in blocknewsletter to remove @todo comment - thanks @romainberger 2013-04-22 09:48:30 +02:00
vAugagneur 50528a5fe3 [*] 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 c96b4ca248 [-] 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 9c1bf63ab9 // fix display of accessories for products without combinations 2013-04-19 15:15:25 +02:00
Rémi Gaillard ba7f9620c3 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-04-19 15:14:51 +02:00
vAugagneur 2cde30c118 //new addons url in install process 2013-04-19 11:44:29 +02:00
vAugagneur ce44e9a95c [-] CORE : fixed bug #PSCFV-8787 - URL Rewriting remove accent 2013-04-19 11:07:59 +02:00
gRoussac 6e1f99f4b2 [-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper 2013-04-19 10:34:20 +02:00
Damien Metzger 17536ff682 // Fixed potential warning 2013-04-18 17:12:59 -03:00
Damien Metzger c4ae13af75 // Changed link to documentation in the installer 2013-04-18 16:57:05 -03:00
Damien Metzger bfbc46cf51 // Removed useless message 2013-04-18 16:53:27 -03:00
Damien Metzger 550ee435e8 // Fixed truncate / escape order 2013-04-18 16:39:33 -03:00
gRoussac b840b6bd2b [-] Fo : Remove additionnal space in phone field value 2013-04-18 19:43:04 +02:00
gRoussac 65a73c7d4b [-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO 2013-04-18 19:12:07 +02:00
Francois Gaillard 8251e98323 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 18:23:18 +02:00
gRoussac dcb46e7867 [-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop 2013-04-18 17:28:16 +02:00
Rémi Gaillard 103513bf28 // performance improve for ObjectModel::displayFieldName #PSCFV-8713 2013-04-18 17:12:05 +02:00
vAugagneur ea0203f43f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 17:02:51 +02:00
vAugagneur 75d395c84a [-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller 2013-04-18 17:02:45 +02:00
gRoussac 2a3789d48b [-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping 2013-04-18 16:44:55 +02:00
vAugagneur b52c71c7ad [-] BO - fixed bug #PSCFV-8614 2013-04-18 15:14:37 +02:00
Rémi Gaillard 45fdb3f79d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 14:59:02 +02:00