48b7a49b1a
// Product image upload failed with bad content-type header
2013-10-28 14:58:19 +01:00
12a257db7a
Merge pull request #898 from Jacky75/blulab20131028-slider-virtualuri
...
[-] MO : homeslider stores slider about multistore with virtual uri
2013-10-28 06:53:41 -07:00
63141a9c4d
[-] FO: fixed bug #PSCFV-10654 - TinyMCE editor: List of products by manufacturer, products by supplier - Long description is not hidden.
2013-10-28 14:48:48 +01:00
c84689ec71
homeslider stores slider about multistore with virtual uri
2013-10-28 14:09:35 +01:00
4103339f53
[-] BO : AdminImport, fix bug from https://github.com/indesign47/PrestaShop/commit/84454bbc1c7a315e232245c5e43b300b8f153473#commitcomment-4418502
2013-10-28 11:21:25 +01:00
9a879bc133
Merge pull request #897 from freedayko/development
...
[*] BO : improved unicode characters replacement in URLs
2013-10-28 03:09:16 -07:00
e1d1479f22
[*] FO : Fix bug #PSCFV-10689 handle image legend
2013-10-27 23:31:36 +01:00
2dbaa5f73b
[-] BO : Fix bug #10689 , could not set image legend in back office
2013-10-27 22:49:25 +01:00
9a3cfece69
//missing line feed after disable_modsec
2013-10-27 16:05:55 +01:00
ee06d3114d
[*] BO : improved unicode characters replacement in URLs (Russian and Ukrainian characters added)
2013-10-27 15:05:49 +02:00
c5c861b59e
[-] MO : Blockwishlist no product image when id_product_attribute is defined, thanks @Broceliande
2013-10-27 13:28:34 +01:00
4c484afda1
[-] MO : Fix bug #PSCFV-10841, blockcart hides on product page when last product is removed from cart
2013-10-25 17:37:32 +02:00
025b62f995
// norms
2013-10-25 17:33:44 +02:00
8f6a5bb3a1
Merge remote-tracking branch 'origin/development' into development
2013-10-25 17:01:51 +02:00
a7d0794c43
[-] BO : Fixed bug PSCFV-9910 using basic queries to prevent locking errors
2013-10-25 17:01:28 +02:00
6359c1ca33
Merge pull request #893 from neemzy/development
...
[*] FO : Turned "true" and "false" strings to proper booleans in address.tpl
2013-10-25 07:42:59 -07:00
9a26cf02a8
Turned "true" and "false" strings to proper booleans
...
It's cleaner this way, and matches how it is done on similar templates.
2013-10-25 16:36:39 +02:00
eb8ea1cba5
[-] CORE : SetEnv in if statement
2013-10-25 15:29:15 +02:00
4e6585a1b8
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-10-25 15:21:55 +02:00
a03efe152c
[-] CORE : SetEnv not available on all config // @todo curl request on dummy .htacces
2013-10-25 15:21:40 +02:00
942d3c7151
[-] MO : Fixbug #PSCFV-10679 dateofdelivery PDF invoice array and array
2013-10-25 00:01:25 +02:00
1e094f4016
[-] FO: Fix bug #PSCFV-10623 blocknewproducts shows products when PS_NB_DAYS_NEW_PRODUCT == 0
2013-10-24 23:29:23 +02:00
a9643c80c3
// bad commit sorry
2013-10-24 22:45:43 +02:00
438a3dda2b
[-] BO : Fix bug #PSCFV-10718 AdminAttachments old file not deleted on update
2013-10-24 22:42:13 +02:00
4cd3e1b830
[-] FO: Fix bug #PSCFV-10230, Blockspecials still caching when files cache limit is 0
2013-10-24 21:59:32 +02:00
97ef888345
[-] FO: Fix bug #PSCFV-10625 Js error on carriers step if AjaxCart disabled
2013-10-24 21:28:22 +02:00
4207bdff32
Merge pull request #890 from indesign47/patch-14
...
[-] BO : AdminImport change width height depth
2013-10-24 09:43:54 -07:00
6f57093f50
[-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security
2013-10-24 18:36:36 +02:00
8cb1806e49
// small fixes for Width Height Depth
...
change
0,1;0,2;0,3
to
1,2,3
2013-10-24 18:13:05 +02:00
759fe2f671
// norms
2013-10-24 18:09:21 +02:00
0416aca547
Merge pull request #889 from PhpMadman/PSCFV-10728
...
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
2013-10-24 09:06:43 -07:00
cc3363011e
// rewrited urls for feeder module
2013-10-24 17:54:44 +02:00
c516035e0e
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
2013-10-24 17:19:28 +02:00
c5324a653b
[-] IN: Fix bug #PSCFV-10644 no carrier available after upgrade from 1.4.x
2013-10-24 16:31:50 +02:00
3cd702da42
[-] WS: Fix stockavailables list when stock is shared between shops #PSCFV-10793
2013-10-24 16:30:02 +02:00
65401efcb6
Merge pull request #887 from indesign47/patch-13
...
[*] BO : AdminImport add img manufacturers-suppliers
2013-10-24 07:22:57 -07:00
84454bbc1c
[*] BO : AdminImport add img manufacturers-suppliers
2013-10-24 16:16:29 +02:00
f0ed5a303c
[*] BO : AdminImport add img suppliers
2013-10-24 15:49:56 +02:00
4803530eed
[*] BO : AdminImport add img manufacturers
2013-10-24 15:47:31 +02:00
ea8a5277f2
[*] BO : AdminImport add img manufacturers-suppliers
2013-10-24 15:44:11 +02:00
2ffc296279
FO : https://github.com/PrestaShop/PrestaShop/pull/878
2013-10-24 12:03:33 +02:00
971722a13f
// note updated by ajax in admincustomers should be url encoded
2013-10-24 11:56:50 +02:00
fc9b39968b
// remove notice
2013-10-24 11:46:09 +02:00
81945cef71
[-] FO : Follow up https://github.com/PrestaShop/PrestaShop/pull/879
2013-10-24 10:00:19 +02:00
1cc0134ec3
Merge pull request #879 from neemzy/development
...
[-] FO : OPC hide VAT fields fail if there are no company fields
2013-10-24 00:55:55 -07:00
b9de912dd3
[-] MO : Fixed bug PNM-1431 - referralprogram Lack the % sign
2013-10-24 09:53:16 +02:00
6d3640e895
Conditions to hide VAT fields fail if there are no company fields
...
"Company" fields may or may not be rendered on this form, whereas "VAT" fields are always rendered and depend on the former ones to be shown (or hidden) with CSS.
This fixes an edge case where there are no "Company" fields rendered and "VAT" fields still wrongly appear, which was caused by the fact that `$('#field').val() != ''` is truthy when `$('#field').length` is zero (since `'' != undefined`).
2013-10-24 09:43:50 +02:00
56693da6e0
// remove warning Notice: Undefined variable: connections in AdminCustomersController.php on line 702
2013-10-23 19:02:13 +02:00
3e33a259ef
[-] BO : FIx bug #PSCFV-10736 again, fixing query when product is not in base
2013-10-23 18:33:37 +02:00
8e506ddff2
[-] BO : FIx bug #PSCFV-10736, could not load a product given from getBoughtProducts
2013-10-23 18:16:45 +02:00
Jerome Nadaud