gRoussac
7140a63272
Merge branch '1.6-CSVAdvanced' of https://github.com/PhpMadman/PrestaShop into PhpMadman-1.6-CSVAdvanced
2013-12-04 18:39:33 +01:00
Vincent Augagneur
36a70d83d5
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-04 18:31:19 +01:00
Vincent Augagneur
b1304f0379
//carrier wizard range table auto size
2013-12-04 18:27:08 +01:00
gRoussac
72be705759
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-04 17:53:01 +01:00
Gregory Roussac
d81426bab2
Merge pull request #1102 from glafarge/patch-1
...
[-] FO : Fix newline trim
2013-12-04 08:52:02 -08:00
Gregory Roussac
8f34b61eec
Merge pull request #1101 from kpodemski/patch-1
...
[*] CORE: original search_query assign to .tpl
2013-12-04 08:48:23 -08:00
Guillaume Lafarge
39ded96964
Fix newline trim
...
When using with <br /> format it now allows for 'b' and 'r' chars at the end of last line.
I think rtrim is not suitable when used with a word rather than a charlist.
2013-12-04 17:42:32 +01:00
gRoussac
96fd3f3d32
[+] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/570
2013-12-04 17:41:10 +01:00
sLorenzini
d1959f87d4
// fixed bug url "add to cart" in product-list
2013-12-04 17:35:16 +01:00
sLorenzini
2db8c21376
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-04 17:29:46 +01:00
sLorenzini
4285882949
// update indent code
2013-12-04 17:29:35 +01:00
Krystian Podemski
665c5d155d
[*] CORE: original search_query assign to .tpl
...
Avoid problems with special characters for eg. in polish language like ąźćłó etc.
2013-12-04 17:24:30 +01:00
Damien Metzger
ab71b813be
[-] BO : fixed top right link with the "open in a new tab" button
2013-12-04 17:00:59 +01:00
sLorenzini
e702aca520
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-04 16:59:14 +01:00
sLorenzini
ad1c7b3962
// update product-list itemproperty
2013-12-04 16:59:00 +01:00
Kevin Granger
33b5327b4d
// data-id-product instead of using rel tag
2013-12-04 16:58:34 +01:00
Gregory Roussac
08cb7ee566
Merge pull request #1099 from djfm/blocktopmenu
...
// fixed undefined variable in blocktopmenu
2013-12-04 07:11:51 -08:00
Damien Metzger
fa804b9bf8
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-04 16:06:55 +01:00
Damien Metzger
2f088c4ac3
[*] BO : changed dashgoals system
2013-12-04 16:06:42 +01:00
djfm
a8e6dfe7f5
// fixed undefined variable in blocktopmenu
2013-12-04 15:03:04 +00:00
Kevin Granger
b450a9fa80
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
...
Conflicts:
themes/default-bootstrap/products-comparison.tpl
2013-12-04 15:48:16 +01:00
Kevin Granger
ad6ed3dcf1
// data-id-product instead of using rel tag
2013-12-04 15:46:42 +01:00
Rémi Gaillard
79198487ac
Merge pull request #1098 from djfm/1.6
...
// typo in default theme blockcart.tpl
2013-12-04 06:19:39 -08:00
sLorenzini
32237777e3
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-04 15:18:13 +01:00
sLorenzini
c127f9765a
// update code on footer and header
2013-12-04 15:17:35 +01:00
djfm
cb9dd448e1
// another typo in default theme blockcart.tpl
2013-12-04 14:14:01 +00:00
djfm
73e3e447f6
// typo in default theme blockcart.tpl
2013-12-04 14:12:16 +00:00
rGaillard
90f5560cb3
// add new hook on product comparator
2013-12-04 14:43:09 +01:00
Rémi Gaillard
a7f20fd986
Merge pull request #1097 from TMMeilleur/1.6
...
// added social's buttons on product's comparisions page
2013-12-04 05:34:09 -08:00
TMMeilleur
4ba424a72f
adedd social's buttons on products compare page
2013-12-04 14:12:36 +02:00
gRoussac
f6fed64472
[*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/636
2013-12-04 12:14:51 +01:00
rGaillard
be91ec02f2
// fix modules filter after category change
2013-12-04 12:03:12 +01:00
gRoussac
e505588688
[-] IN : Merge of https://github.com/PrestaShop/PrestaShop/pull/1095
2013-12-04 11:47:14 +01:00
Kevin Granger
68edf085d4
// fix «enter» on retrieve password panel
2013-12-04 11:29:21 +01:00
Kevin Granger
97dabf5b74
// upadate banner
2013-12-04 10:00:40 +01:00
Rémi Gaillard
360d68c5f7
Merge pull request #1091 from TMMeilleur/1.6
...
// small fixes
2013-12-04 00:45:33 -08:00
TMMeilleur
689fcb005d
small fixes
2013-12-04 10:08:35 +02:00
Jérôme Nadaud
f274103b0e
Merge pull request #1086 from rhyslk/1.6
...
[*] LO : Corrected units for weight/volume/distance
2013-12-03 22:25:17 -08:00
Gregory Roussac
9eea7203fe
Merge pull request #1084 from PhpMadman/1.6-ShipMaxInput
...
[*] BO : Fixes issue with not beeing able to edit weight beacuse string is longer then max length
2013-12-03 11:43:32 -08:00
Rhys
6640e47781
[*] LO : Corrected units for weight/volume/distance
...
UK uses Metric for weight, volume and short distances but uses Imperial for long distances (i.e. Miles). Yes, it's a silly system here in the UK!
// I will add counties (states) with correct ISO codes when I get chance.
2013-12-03 19:12:27 +00:00
PhpMadman
8949382e00
[-] BO : Better maxlength on shippinh input fields
2013-12-03 19:38:28 +01:00
gRoussac
81481d6105
[*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/48
2013-12-03 19:24:31 +01:00
Jérôme Nadaud
03239a32ea
Merge pull request #1082 from xBorderie/patch-1
...
Added an "About this repository" section.
2013-12-03 09:50:32 -08:00
Xavier
3115008443
Added an "About this repository" section.
2013-12-03 18:49:14 +01:00
Damien Metzger
b657115552
// Fixed bad entities in KPI
2013-12-03 18:12:02 +01:00
Kevin Granger
5a5c754dab
// clean css
2013-12-03 17:43:49 +01:00
Kevin Granger
3f2ce54efd
// gamification + multishop wip
2013-12-03 15:21:13 +01:00
Lucas CERDAN
da2d48890f
Merge pull request #1072 from PhpMadman/Boot-AutoSeoUrl
...
[*] BO : Option to always rewrite friendly url of product
2013-12-03 06:15:28 -08:00
Gregory Roussac
22c09ac367
Merge pull request #1073 from studiokiwik/sk-ps15x-012
...
[-] BO : Fix timeout handling on product images regeneration
2013-12-03 05:51:27 -08:00
Mikael Blotin
d81e81e4f3
[-] BO : Fix timeout handling on product images regeneration
2013-12-03 14:42:14 +01:00
gRoussac