dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,999 Commits 9 Branches 19 Tags
697a305848d090a2ed0ebb41eec6f7ce9d6a3be8
Commit Graph

8999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard
697a305848 // small text change 2013-04-23 15:51:30 +02:00
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
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
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
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
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
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
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
vAugagneur
828ffb74ad [-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller 2013-04-18 17:02:45 +02:00
gRoussac
e22fe455b3 [-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping 2013-04-18 16:44:55 +02:00
vAugagneur
e9b8af0e97 [-] BO - fixed bug #PSCFV-8614 2013-04-18 15:14:37 +02:00
Rémi Gaillard
53cc380a6a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 14:59:02 +02:00
Rémi Gaillard
986d57148f //AdminModulesController::extractArchive() now return something 2013-04-18 14:58:43 +02:00
gRoussac
ccfa343b0d [-] BO : Bad gender image when no gender 2013-04-18 14:54:12 +02:00
Rémi Gaillard
ab700a6285 [-] FO: send current product to some hook like displayProductTabContent on product page #PSCFV-8825 2013-04-18 14:24:50 +02:00
Rémi Gaillard
158ab771b6 [-] BO: Fix #PSCFV-8827 fixed price of specific price rules should be a float 2013-04-18 14:21:44 +02:00
Rémi Gaillard
5edfd03068 // don't try to clear smarty cache if smarty is not defined 2013-04-18 14:06:49 +02:00
Rémi Gaillard
f0c5407aa6 // Revert a93cfbec07 2013-04-18 11:36:55 +02:00
gRoussac
ee3e2ac6dc [-] FO : Fix bug #PSCFV-8728 context country not updated after changing delivery address in OPC 2013-04-18 11:26:50 +02:00
sLorenzini
b633b44ac7 [-] FO: fixed some css bug for ie7 2013-04-18 11:22:40 +02:00
Rémi Gaillard
5ba3fda95f [-] FO: Add the protocol content to the cache id of modules #PSCFV-8810 2013-04-17 18:14:58 +02:00
Rémi Gaillard
f83b91ae51 // Fix smarty cache after modules translation update 2013-04-17 14:44:20 +02:00
Rémi Gaillard
49ff8ae4a1 // pscleaner clean address inversion between customers and manufacturers/suppliers 2013-04-17 11:39:11 +02:00
Vincent Augagneur
34f2ff36a3 Merge pull request #179 from nturato/patch-1 
[-] WS: images are only shown as jpg or gif
 2013-04-17 01:56:57 -07:00
vAugagneur
de0ef82f74 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-17 10:02:37 +02:00
vAugagneur
de887cc078 Merge Pull request #98 - Thanks to @phproberto 2013-04-17 10:02:32 +02:00
gRoussac
701d9e50af [-] CORE : Fix bug last part #PSCFV-8636, cart rule with a reduction and free shipping 2013-04-16 18:56:00 +02:00
Gregory Roussac
5bae95dacc Merge pull request #391 from ldecoker/patch-5 
[-] [BO] error in form.tpl for attributes controller, thanks to ldecoker
 2013-04-16 08:50:45 -07:00
ldecoker
4783cb17c5 ";" in wrong place 
Should be after display but inside quotes
 2013-04-16 18:34:20 +03:00
Vincent Augagneur
1a795cfe4a Merge pull request #366 from kluevandrew/patch-2 
[FIX] Bug in Controller class
 2013-04-16 06:13:48 -07:00
gRoussac
47c118c3ca [-] FO : empty cache getContextualValue_ when updating cart quantity 2013-04-16 15:00:24 +02:00
Rémi Gaillard
22694898df Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 14:14:36 +02:00
Rémi Gaillard
96ee6386c1 [-] BO: Fix admin carts currency prices on view and listing 2013-04-16 14:14:04 +02:00
gRoussac
ce02baf658 [-] FO : Disable confirm order when already clicked 2013-04-16 14:09:37 +02:00
gRoussac
abbdb4d165 [-] FO : address alias lost 2013-04-16 14:08:51 +02:00