Rémi Gaillard
37e3b9e9e4
[-] WS: 404 error should be returned if a multishop entity does not exists #PSCFV-10229
2013-08-30 11:13:30 +02:00
LOIC ROSSET ltd
24146181c6
Add APCu support
2013-08-29 20:13:58 +01:00
Francois Gaillard
e6abe1c5a0
// Release branch merged
2013-08-29 18:46:34 +02:00
Rémi Gaillard
eec8aaa4f8
// php noti
2013-08-29 18:15:51 +02:00
Damien Metzger
f24391be5a
// Fixed hook::getidbyname case
2013-08-29 09:39:48 +02:00
Damien Metzger
5dee3ca245
// Fixed hook::getidbyname case
2013-08-29 09:33:28 +02:00
ha99y
75303e82e0
Suppress Error at rename
...
If debugging is one (_PS_MODE_DEV_ set to TRUE)
there is a warning on line 142 in /classes/Autoload.php at function
rename()
2013-08-28 18:56:49 -07:00
Jerome Nadaud
4a7e68ae05
// Modules list fix
2013-08-28 10:18:43 +02:00
ha99y
ffd712312d
Add new argument to function getImages
...
1st: The function will return the product attribute id's with the list.
2nd: If product attribute id is passed to the function it will return
only the image id of the given attribute.
2013-08-28 00:27:52 -07:00
Rémi Gaillard
6a4680b4f0
[-] WS: Bad xlink for tax_rules_group in product
2013-08-27 18:58:21 +02:00
Vincent Augagneur
5c367cd6e7
//small fix
2013-08-27 18:52:34 +02:00
Vincent Augagneur
41a5eb8411
//small fix
2013-08-27 18:50:14 +02:00
Jerome Nadaud
ed0037c435
[+] BO : New page header toolbar
2013-08-27 18:21:27 +02:00
Vincent Augagneur
9b7f32cbac
[-] CORE : fixed bug #PSCFV-10175 - No virtuel download email send after accepted payment
2013-08-27 18:13:44 +02:00
Rémi Gaillard
598469e41e
// typo debug
2013-08-27 15:38:29 +02:00
Jerome Nadaud
6aad506c80
[-] FO : FixBug when route id is empty
2013-08-27 12:01:40 +02:00
Vincent Augagneur
99b162d16b
[-] CORE : fixed bug #PSCFV-10175 - No virtuel download email send after accepted payment
2013-08-27 10:09:35 +02:00
Vincent Augagneur
1673a080a0
//small fix #PSCFV-10194
2013-08-26 17:34:13 +02:00
Vincent Augagneur
0a4264c947
[-] BO : fixed bug when try to add jquery from ajax.googleapis.com in BO
2013-08-26 16:31:50 +02:00
Vincent Augagneur
ad428dfb2b
//MERGE branche release
2013-08-26 10:59:36 +02:00
Damien Metzger
bc071f2b04
// Fixed code typo
2013-08-26 09:48:26 +02:00
Jerome Nadaud
c4bb5a99e4
[+] BO : Improve mod rewrite check
2013-08-23 10:26:36 +02:00
Rémi Gaillard
a21d3fd22e
// shipping block was missplaced on order-detail
2013-08-22 15:41:34 +02:00
Vincent Augagneur
b67827772b
[-] BO : fixed bug when save carrier without range
2013-08-22 15:17:14 +02:00
Jerome Nadaud
bbea6c4a9b
[-] BO : FixBug #PSCFV-10152 - Multibyte string double encoded when send email by SMTP relay
2013-08-22 12:17:51 +02:00
Rémi Gaillard
907d81c32e
// duplication of tax_rules_group on adminproducts with multishop
2013-08-22 10:53:50 +02:00
Rémi Gaillard
3fcf166a9d
// small fix
2013-08-21 18:24:10 +02:00
Damien Metzger
df418a80db
[*] FO : added indexation of attributes references #PSCFV-7294
2013-08-21 15:31:10 +02:00
Damien Metzger
cf35d3762b
[-] MO : fixed the possibility to override/remove an override twice in the same session without redeclaration #PSCFV-10168
2013-08-21 14:32:18 +02:00
Kevin Granger
3005ca39f2
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/modules_positions/form.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
admin-dev/themes/default/template/controllers/products/shipping.tpl
admin-dev/themes/default/template/controllers/shipping/content.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/list/list_header.tpl
admin-dev/themes/default/template/toolbar.tpl
classes/helper/HelperList.php
controllers/admin/AdminCategoriesController.php
controllers/admin/AdminManufacturersController.php
controllers/admin/AdminModulesPositionsController.php
controllers/admin/AdminPerformanceController.php
controllers/admin/AdminStockInstantStateController.php
css/admin.css
js/admin-products.js
js/admin.js
2013-08-21 09:14:10 +02:00
gRoussac
50d5a71ca6
[-] Classes : fix memcache ext #PSCFV-5225 thanks @up2date
2013-08-20 23:09:12 +02:00
Rémi Gaillard
20e2f07939
[-] BO: Delete from attribute_shop when an attribute group is deleted #PSCFV-9902
2013-08-20 17:56:26 +02:00
Rémi Gaillard
3fcb65ca0f
[-] WS: Fix retrieve of stock_availables when stock is shared on the shop group
2013-08-20 17:18:07 +02:00
Jerome Nadaud
e80e2ac5e3
[-] BO : FixBug #PSCFV-10075 remove product attribute image association on delete product attribute
2013-08-20 17:05:48 +02:00
Damien Metzger
750f374036
// error log only in dev mode for pcre backtrack limit #PSCFV-9012
2013-08-20 16:40:17 +02:00
Kevin Granger
17be1e7528
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-08-20 16:40:14 +02:00
Kevin Granger
44655ecdef
// breaking things
2013-08-20 16:38:31 +02:00
Damien Metzger
43c544465e
// Removed deprecated parameter
2013-08-20 14:48:58 +02:00
Vincent Augagneur
f71d4a63cf
//small fix
2013-08-20 11:46:58 +02:00
Vincent Augagneur
258d381083
[-] BO fixed bug #PSCFV-9663 - .live() method is deprecated on 1.7 jquery and it is not present into the 1.9
2013-08-20 11:11:21 +02:00
Jerome Nadaud
00e1b7c0eb
[-] BO : FixBug language in label for
2013-08-20 09:36:00 +02:00
Vincent Augagneur
8a0745e8de
[-] BO : fixed bug #PSCFV-9782 - live edit bug with multistore
2013-08-19 17:21:03 +02:00
Damien Metzger
415ca83b62
// Code cleaning
2013-08-19 15:23:43 +02:00
Damien Metzger
1a81191c09
// Code cleaning
2013-08-19 15:14:05 +02:00
Jerome Nadaud
a7f6e91ac0
[-] BO : FixBug #PSCFV-9329 Alias problem in order by
2013-08-19 10:35:43 +02:00
Damien Metzger
c5097b19cc
[-] TR : fixed missing space in RMA PDF
2013-08-19 09:54:05 +02:00
Jerome Nadaud
8cd3fd0cfe
[-] FO : FixBug Missing PS_STOCK_MANAGEMENT smarty variable
2013-08-14 17:40:36 +02:00
Jerome Nadaud
274c90468f
// Syntax error
2013-08-14 16:14:56 +02:00
Rémi Gaillard
d40d841cf3
// something is missing in 3d591be8c6
2013-08-14 15:15:41 +02:00
Rémi Gaillard
3d591be8c6
[-] Core: Fix language link with multishop from another shop #PSCFV-10063
2013-08-14 11:25:46 +02:00
Rémi Gaillard