d744b9dbf2
// update localization and modules tabs
2013-07-31 14:47:21 +02:00
e1b7470845
[-] BO : FixBug Install currency on Localization Pack
2013-07-31 09:38:10 +02:00
e0f1041070
// Performance improvements for the cart page
2013-07-30 19:16:05 +02:00
9bf6871e8d
[-] FO : FixBug #PSCFV-9766 All products in products list for email confirmation with multi-shipping
2013-07-30 17:50:36 +02:00
3d40814739
//added name in errors array in validateRules
2013-07-30 11:33:30 +02:00
5929727be1
Merge pull request #601 from PrestaEdit/carrier_wizard2
...
[-] Carrier Wizard: fix
2013-07-30 02:22:45 -07:00
4185026880
[-] CORE : Fix warning #PSCFV-9678 when sending message to customer
2013-07-30 10:37:07 +02:00
a36ac7784d
// trailing space
2013-07-30 10:35:23 +02:00
39a6d0a42d
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-29 18:37:18 +02:00
0ecc2fb0a0
[-] BO : FixBug #PSCFV-9965 currency not active by default in Localization pack
2013-07-29 18:36:55 +02:00
0e6f1598f7
[-] BO : fixed some bug on carrier wizard - added tabindex on input - new default carrier img
2013-07-29 18:36:50 +02:00
ab0189a726
[-] CORE : Fix bug #PSCFV-9572 when seizing in 0 in forms input fields for objects
2013-07-29 14:39:35 +02:00
c1b0d32d32
[-] Carrier Wizard: fix
2013-07-29 13:57:31 +02:00
4291b23e23
Update CartRule.php
...
Removed "502" from the notice of license.
2013-07-29 11:41:35 +02:00
1c37fdbc23
// foloww up https://github.com/PrestaShop/PrestaShop/commit/2e6e5a2604be05da859154f5369ec026ee55e44d
2013-07-29 10:24:36 +02:00
a786606c9a
// small fix on carrierwizard
2013-07-26 20:27:25 +02:00
77f4eec64f
// Fix group association on carrierwizard
2013-07-26 19:38:06 +02:00
9f9c0ef416
[+] BO Orders
2013-07-26 18:54:28 +02:00
c0cf92cbdf
[+] BO: Add a wizard to create and edit your carriers
2013-07-26 18:27:21 +02:00
42c5335f27
[*] WS : order history add(POST) send customer email if sendemail=1 url parameter, thanks @gerdus
2013-07-26 17:55:53 +02:00
076b6d11a2
[-] CORE: Copy live_edit bool when register alias hook
2013-07-26 17:15:36 +02:00
23e0467993
[-] MO dateofdelivery : FixBug #PNM-1478 Now take care of product available date
2013-07-26 11:48:18 +02:00
5015f88a46
Merge pull request #595 from codl/fix/too-many-packs
...
[-] WS: Sanity check before creating packs
2013-07-26 00:51:08 -07:00
a35011e9a5
Update Module.php
2013-07-25 19:16:46 +01:00
eff81dfe05
// Moved a condition/function from SQL to PHP.
2013-07-25 17:07:28 +02:00
a9e233b209
Update Cart.php
...
If magic_quotes_gpc is enabled, there is no need to escape the characters from $ _POST as they already are.
2013-07-25 15:46:08 +02:00
a54ac39632
Merge pull request #356 from arnolem/dev-wsSetProductTags
...
[*] WS : Allow to set the tags list of product
2013-07-25 06:17:15 -07:00
f8ff755067
[+] BO : Product "For"
2013-07-25 14:50:10 +02:00
53526304a5
[-] WS: Sanity check before creating packs
...
As it is before this commit, every product that is created from the
schema without removing the empty bundle item in the schema will become
a pack containing one broken item.
Sorry, this bug was introduced by my previous pull request.
2013-07-25 14:45:17 +02:00
2e7f3c296b
[-] FO : Force browser language detection in Tools::setCookieLanguage
2013-07-25 11:44:45 +02:00
ef22b9d5d4
Merge pull request #162 from bumbu/patch-2
...
[-] CORE : updateMultishopTable() where argument is not mandatory anymore
2013-07-24 10:07:56 -07:00
aaaa5cb086
[-] WS: Enable feature request #PSCFV-5581, thanks @codl for pull request #593
2013-07-24 18:22:04 +02:00
a406778e17
// norm
2013-07-24 17:32:58 +02:00
77f80b1774
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
.gitignore
admin-dev/themes/default/css/admin.css
admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/modules/page.tpl
admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
admin-dev/themes/default/template/controllers/orders/_documents.tpl
admin-dev/themes/default/template/controllers/orders/_shipping.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/payment/restrictions.tpl
admin-dev/themes/default/template/controllers/products/images.tpl
admin-dev/themes/default/template/controllers/products/informations.tpl
admin-dev/themes/default/template/header.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/modules_list/list.tpl
classes/Tools.php
controllers/admin/AdminCartRulesController.php
controllers/admin/AdminProductsController.php
css/admin.css
2013-07-24 17:01:23 +02:00
71c0a483e1
// Small fix
2013-07-24 16:16:40 +02:00
056ced75b5
// Fixed double module call
2013-07-24 15:55:40 +02:00
26247a18c3
Merge pull request #564 from sylwit/patch-1
...
[*] CORE : Translations shouldn't be cached if they contain dynamic vars (sprintf) in Translate.php
2013-07-23 10:22:54 -07:00
9b9e5a122a
Merge pull request #586 from Captain-FLAM/patch-7
...
[-] BO : Hook.php : Missing _DB_PREFIX_, thanks @Captain-FLAM
2013-07-23 09:52:15 -07:00
71271ded7f
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-23 18:38:33 +02:00
d241013692
[-] BO : FixBug #PSCFV-9894 undefined quantity_all_version variable in product.tpl
2013-07-23 18:36:51 +02:00
abf6f0d626
Merge pull request #587 from ChristopheBoucaut/patch-2
...
[-] CORE : Search terms can now have dashes in Search.php
2013-07-23 09:18:16 -07:00
c829ac5b7d
// Fixed fix
2013-07-23 14:19:13 +02:00
6ed713e847
[-] Fix #PSCFV-9038 carrier warehouse association after carrier edition
2013-07-23 11:57:44 +02:00
0ddf5d1025
// Fixed getMainShopDomain
2013-07-23 11:33:07 +02:00
a805941c1f
// typo in EN string
2013-07-23 10:34:05 +02:00
209615d4f4
// Missing }
2013-07-23 09:52:41 +02:00
07e3354d0e
// Code cleaning
2013-07-23 09:50:26 +02:00
9169995adc
// Small fixes and code cleaning
2013-07-23 09:50:26 +02:00
91c5d184b6
// Small backend optimization
2013-07-23 09:50:26 +02:00
4b6642d76c
// Small optimization
2013-07-23 09:50:25 +02:00
Sarah Lorenzini