fa804b9bf8
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-04 16:06:55 +01:00
2f088c4ac3
[*] BO : changed dashgoals system
2013-12-04 16:06:42 +01:00
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
ad6ed3dcf1
// data-id-product instead of using rel tag
2013-12-04 15:46:42 +01:00
79198487ac
Merge pull request #1098 from djfm/1.6
...
// typo in default theme blockcart.tpl
2013-12-04 06:19:39 -08:00
32237777e3
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-04 15:18:13 +01:00
c127f9765a
// update code on footer and header
2013-12-04 15:17:35 +01:00
cb9dd448e1
// another typo in default theme blockcart.tpl
2013-12-04 14:14:01 +00:00
73e3e447f6
// typo in default theme blockcart.tpl
2013-12-04 14:12:16 +00:00
90f5560cb3
// add new hook on product comparator
2013-12-04 14:43:09 +01:00
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
4ba424a72f
adedd social's buttons on products compare page
2013-12-04 14:12:36 +02:00
f6fed64472
[*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/636
2013-12-04 12:14:51 +01:00
be91ec02f2
// fix modules filter after category change
2013-12-04 12:03:12 +01:00
e505588688
[-] IN : Merge of https://github.com/PrestaShop/PrestaShop/pull/1095
2013-12-04 11:47:14 +01:00
68edf085d4
// fix «enter» on retrieve password panel
2013-12-04 11:29:21 +01:00
97dabf5b74
// upadate banner
2013-12-04 10:00:40 +01:00
360d68c5f7
Merge pull request #1091 from TMMeilleur/1.6
...
// small fixes
2013-12-04 00:45:33 -08:00
689fcb005d
small fixes
2013-12-04 10:08:35 +02:00
f274103b0e
Merge pull request #1086 from rhyslk/1.6
...
[*] LO : Corrected units for weight/volume/distance
2013-12-03 22:25:17 -08:00
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
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
8949382e00
[-] BO : Better maxlength on shippinh input fields
2013-12-03 19:38:28 +01:00
81481d6105
[*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/48
2013-12-03 19:24:31 +01:00
03239a32ea
Merge pull request #1082 from xBorderie/patch-1
...
Added an "About this repository" section.
2013-12-03 09:50:32 -08:00
3115008443
Added an "About this repository" section.
2013-12-03 18:49:14 +01:00
b657115552
// Fixed bad entities in KPI
2013-12-03 18:12:02 +01:00
5a5c754dab
// clean css
2013-12-03 17:43:49 +01:00
3f2ce54efd
// gamification + multishop wip
2013-12-03 15:21:13 +01:00
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
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
d81e81e4f3
[-] BO : Fix timeout handling on product images regeneration
2013-12-03 14:42:14 +01:00
98d02d94b9
[-] BO : carrier wizard range tab now overflow scroll
2013-12-03 14:15:24 +01:00
a9f2bd053a
[-] BO : carrier wizard fixed when select zone and set no shipping fees
2013-12-03 11:45:43 +01:00
de456e45ec
[*] Bo : removed empty filters from the cookie (thus limiting its size)
2013-12-03 11:44:51 +01:00
8a72e4d810
// small fix
2013-12-03 11:18:58 +01:00
0de9c3ac6c
[*] BO : Added option to always rewrite friendly url of product
2013-12-03 10:57:25 +01:00
0a2ba0015b
[-] BO : carrier wizard, remove fees when desabled zone
2013-12-03 10:34:53 +01:00
08ef0667ca
Revert "// update some css&tpl bugs"
...
This reverts commit 01d5087067
2013-12-02 19:25:21 +01:00
2931ebeeae
[-] FO : fixed product comparator when there are no products anymore
2013-12-02 19:21:54 +01:00
e8088892b5
[-] FO : Added condition to display the phone number only if it is set up in the admin
2013-12-02 19:12:49 +01:00
8bf49049eb
// Prevent click event in tree toolbar buttons
2013-12-02 19:07:28 +01:00
2316bb50ba
// Fixed import button in AdminImport
2013-12-02 18:53:51 +01:00
804fe56ba0
// Change order button language
2013-12-02 18:20:42 +01:00
6edf14ed71
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-12-02 18:20:03 +01:00
102b99eb1c
// small fix
2013-12-02 18:15:37 +01:00
703d790910
// Changed hook in update
2013-12-02 17:40:01 +01:00
01d5087067
// update some css&tpl bugs
2013-12-02 16:40:43 +01:00
a88b2b6ab5
// fix footer actions
2013-12-02 16:27:24 +01:00
9078290c01
// small fix
2013-12-02 16:18:59 +01:00
Damien Metzger