958d92c9fa
[*] BO: Add an option to allow iframes on descriptions
2013-07-18 18:31:31 +02:00
c70fe92dac
// Validate::isGenericName now allow "#" #PSCFV-6530
2013-07-18 18:22:50 +02:00
a71a5d7c18
[-] MO : Fix bug discount display in mail, manual merge from https://github.com/202-ecommerce/PrestaShop/commit/1d5df338c46aef723d13aef3e213792df6ea92e2
2013-07-18 18:18:57 +02:00
e3d9dd89e9
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 18:18:12 +02:00
caf321e691
[-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer lsit even if products was set as hidden
2013-07-18 18:16:57 +02:00
d879fb15a9
[-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer list even hidden products
2013-07-18 18:10:29 +02:00
dd78e97b4a
[-] FO : FixBug #PSCFV-7723 Bad manufacturers list pagination
2013-07-18 17:09:44 +02:00
3693349643
[-] BO : FixBug #PSCFV-5316 Translation problem in delete button link
2013-07-18 15:49:53 +02:00
2c6978e97c
[-] BO : FixBug #PSCFV-6140 Pagination link error
2013-07-18 14:55:28 +02:00
6ae0717e32
// PS Cleaner now clean the img/tmp dir
2013-07-18 14:48:47 +02:00
a6b2299ed1
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 14:08:36 +02:00
a6da3e94f0
[-] BO : FixBug #PSCFV-9723 Exporting quantity in instant stock was not returning all rows
2013-07-18 14:02:22 +02:00
6293631ac4
[-] FO : fixed group query for cart rules #PSCFV-8992
2013-07-18 13:47:43 +02:00
69066361a6
[-] BO : FixBug #PSCFV-8234 Products tags not correctly indexed in search
2013-07-18 12:15:42 +02:00
d99a1eba24
[-] BO : Bad return value for AdminCountries::processStatus()
2013-07-18 12:12:05 +02:00
108bd92c3b
[-] FO : Fixed partial use of cart rules which does not offer free shipping #PSCFV-9216
2013-07-18 12:09:48 +02:00
c1a4dd6b66
// Added readme in the override directory
2013-07-18 11:31:08 +02:00
3be36f9897
[*] MO : added configuration cleaning to pscleaner
2013-07-18 09:36:01 +02:00
2e3ec0f038
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 08:52:56 +02:00
40389822c3
[-] BO : FixBug Directory Separator on URL
2013-07-18 08:52:39 +02:00
5939f65fac
//norms
2013-07-17 19:05:01 +02:00
eecfdae0b6
[-] BO : FixBug #PSCFV-8217 Shop logo image not refresh after change
2013-07-17 18:23:59 +02:00
1537f0e9eb
Merge pull request #566 from PrestaEdit/patch-45
...
[*] FO: display Error500 if no database access
2013-07-17 09:02:28 -07:00
312e066751
Merge pull request #550 from PrestaEdit/patch-44
...
[-] Class: PaymentModule / Be sure to have the right "TaxCalculationMeth...
2013-07-17 09:01:32 -07:00
cf04c18ce6
Merge pull request #537 from PrestaEdit/patch-43
...
[-] FO: OrderHistory - Unclosed tag
2013-07-17 08:53:31 -07:00
8d5027a89b
Merge pull request #530 from PrestaEdit/patch-42
...
[-] BO: remove old icon into New Version block
2013-07-17 08:44:49 -07:00
5c6640c258
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 17:34:44 +02:00
458838e598
[-] BO : FixBug #PSCFV-9613 Fix product tax to be shop dependent
2013-07-17 17:33:53 +02:00
ffb62426d8
Merge pull request #516 from PrestaEdit/patch-41
...
[*] BO: more than one image in HelperForm
2013-07-17 07:44:26 -07:00
8d5a632c92
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 16:34:50 +02:00
014758d1d8
Merge branch 'PrestaEdit-translate' into development
2013-07-17 16:34:26 +02:00
3f7bf5c6b0
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 16:34:03 +02:00
c9d2cf8ed2
Merge branch 'translate' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-translate
...
Conflicts:
admin-dev/header.inc.php
2013-07-17 16:31:49 +02:00
6884d7c5de
[-] BO : FixBug #PSCFV-8287 Breadcrumbs label was wrong
2013-07-17 16:19:15 +02:00
24b2e1ec8c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 15:36:03 +02:00
d55f31d3b5
Merge branch 'tools-fileAttachment' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-tools-fileAttachment
...
Conflicts:
classes/Tools.php
controllers/front/ContactController.php
2013-07-17 15:35:18 +02:00
2d1ec5f642
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 15:14:05 +02:00
421c199e1f
[-] BO : FixBug #PSCFV-8229 Default country value set to manufacturer country
...
Default country value set to manufacturer country
Click on manufacturer address line now redirect to manufacturer address
edition
2013-07-17 15:13:34 +02:00
1b9892b944
// removed deprecated message
2013-07-17 13:42:45 +02:00
899dc30097
[-] Class : AdminController - Object id fixed
2013-07-17 11:33:33 +02:00
1199ad8cf2
[-] BO : FixBug #PSCFV-6365 Missing message confirmation for Images modification in Preferences > Images
2013-07-17 10:51:34 +02:00
02921dc9d0
[+] Helper form WIP
2013-07-16 19:23:46 +02:00
ea89c2235d
[-] BO : Fix bug #PSCFV-9722, do not propose adding root categories in categories when there is only one shop
2013-07-16 19:01:05 +02:00
d66f407fcb
[-] BO : Use only 0% reduction from category in group
2013-07-16 18:28:11 +02:00
ae5b6b79ee
[*] BO : #PSCFV-8498 You can now use 0% in groups category rules in order to not apply discount on this category
2013-07-16 17:42:38 +02:00
e7eae03508
Merge pull request #575 from dreammeup/development
...
[-] BO : Correcting errors in order graph at admin home
2013-07-16 07:17:03 -07:00
82c7e3eeff
Correcting errors in order graph at admin home
...
The SQL request was returning multiple lines for every days. This modification change the request to have one line for the 7 days of the week.
So it corrects the number who was totally wrong.
2013-07-16 15:34:52 +02:00
145df5a26e
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-16 13:08:36 +00:00
8d39f32506
[-] BO: Fix tax rule edition - unique tax rule can't be edited
2013-07-16 11:52:05 +02:00
d2ff50ddb7
[*] CORE : Fix bug #PSCFV-9811 doc on display404Error
2013-07-16 10:50:27 +02:00
Rémi Gaillard