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
78a6821b2f
// handle img extensions in the end of query string in the dispatcher
2013-12-02 16:14:27 +01:00
970449148c
// Add footer toolbar to products panel
2013-12-02 16:08:44 +01:00
aea8f0285e
[-] FO : Fix bug #PSCFV-11190 double escaping on customization
2013-12-02 15:51:29 +01:00
6d473d5374
Merge pull request #1071 from TMMeilleur/bootstrap
...
//updated jqzoom and products compare page is responsive now
2013-12-02 06:49:24 -08:00
f99140113b
updated jqzoom and products compare page is responsive now
2013-12-02 16:41:13 +02:00
c8ca67eef5
// Fixed upgrade to 1.6.0.1
2013-12-02 15:28:02 +01:00
0d7a48095c
// tweak product tabs
2013-12-02 15:27:21 +01:00
0448ee697f
// Merging PR 1070 from DevNet
2013-12-02 15:23:29 +01:00
3cfafbfe10
// typo
2013-12-02 15:20:12 +01:00
89329dc865
// small fix
2013-12-02 15:15:17 +01:00
bf3c27e864
// fix dropdown menu
2013-12-02 14:13:41 +01:00
2ef8333e6a
// tweak import
2013-12-02 14:12:02 +01:00
79b1b07cce
// tweak on login form : it’s a trap!
2013-12-02 11:35:21 +01:00
909983bcbf
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-12-02 11:11:29 +01:00
bca9048a6b
// fix filter by category
2013-12-02 11:11:16 +01:00
2bdca4668e
Merge pull request #1063 from Shoprunners/patch-1
...
MO:blocklayered
2013-12-02 02:06:03 -08:00
5381e6007f
// fix Tab selection in modules favorites view
2013-12-02 10:47:15 +01:00
c83761b420
// Module configuration bar fix
2013-12-02 10:25:18 +01:00
TMMeilleur