 Rémi Gaillard
|
2899dfba5e
|
// Fix AdminTranslationsController::addNewTabs()
|
2013-10-08 14:53:02 +02:00 |
|
|
Rémi Gaillard
|
7d0e9a5f06
|
// Fix double entities on AdminLog listing #PSCFV-10472
|
2013-10-07 19:37:58 +02:00 |
|
|
Rémi Gaillard
|
1ed26e2d4e
|
// default perms profiles
|
2013-10-07 12:13:59 +02:00 |
|
|
Rémi Gaillard
|
3477cac1e0
|
Merge pull request #800 from Ha99y/20131004_retro-compat.js.php
__DIR__ is available since PHP 5.3
|
2013-10-07 00:35:02 -07:00 |
|
|
Rémi Gaillard
|
b2b0c4f00b
|
// remove debug
|
2013-10-04 18:45:18 +02:00 |
|
|
Rémi Gaillard
|
2aee99c0b0
|
[-] FO: Fix display of quantity discounts on product pages if the customer is allowable for multiple discount for the same quantity #PSCFV-10580
|
2013-10-04 18:37:30 +02:00 |
|
|
Rémi Gaillard
|
fef8d2beac
|
// Fix group reduction per category
|
2013-10-04 14:00:42 +02:00 |
|
|
Rémi Gaillard
|
6dacc07e62
|
// sometimes, translations files could not exist
|
2013-10-04 13:19:34 +02:00 |
|
|
Rémi Gaillard
|
f100027e5d
|
[-] FO: packages should be splitted with advanced stock management when carrier is not associated to multiple warehouse
|
2013-10-03 19:21:49 +02:00 |
|
|
Rémi Gaillard
|
0662cd3b12
|
// don't need to clear smarty cache while installation
|
2013-10-03 16:29:31 +02:00 |
|
|
Rémi Gaillard
|
f2e39488b6
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-10-03 10:33:58 +02:00 |
|
|
Rémi Gaillard
|
e190c8df9f
|
// small fix on import
|
2013-10-03 10:33:43 +02:00 |
|
|
Rémi Gaillard
|
f4cadbdfd6
|
Merge pull request #770 from urecheatu007/development
[-] LO: updated localization pack for Romania / romanian - added states
|
2013-10-02 05:47:17 -07:00 |
|
|
Rémi Gaillard
|
99f325dc3c
|
// validation of carrierwizard
|
2013-10-02 11:24:08 +02:00 |
|
|
Rémi Gaillard
|
9ad046677c
|
[*] BO: Allow to breakdown the taxes when they are computed
|
2013-10-01 11:55:56 +02:00 |
|
|
Rémi Gaillard
|
4fcbde878d
|
[-] BO: Fix total without tax in breakdown taxes when taxes are combined #PSCFV-10394 on the invoices
|
2013-10-01 11:18:11 +02:00 |
|
|
Rémi Gaillard
|
ecb4ccfdda
|
// Fix product visibility on Product::getAccessories and ProductSale::getBestSales #PSCFV-9760
|
2013-10-01 09:56:26 +02:00 |
|
|
Rémi Gaillard
|
b6f13648db
|
[-] WS: Fix order by on id field on multishop entities
|
2013-09-30 10:29:54 +02:00 |
|
|
Rémi Gaillard
|
22173355a5
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-09-30 09:59:51 +02:00 |
|
|
Rémi Gaillard
|
06b6facc2d
|
[-] BO: Fix #PSCFV-10488 filter by employee on logs tab
|
2013-09-30 09:59:33 +02:00 |
|
|
Rémi Gaillard
|
252ab56d75
|
// error message in double
|
2013-09-26 13:47:42 +02:00 |
|
|
Rémi Gaillard
|
5e7dbea970
|
//
|
2013-09-24 17:22:50 +02:00 |
|
|
Rémi Gaillard
|
beb0a74135
|
// use ObjectModel::validateField on validaterules
|
2013-09-24 17:12:28 +02:00 |
|
|
Rémi Gaillard
|
41af17e06b
|
[-] BO: Fix data validation when iframe is allowed on some entities like CMS
|
2013-09-24 10:28:04 +02:00 |
|
|
Rémi Gaillard
|
c6222c51c8
|
// commit 6b47f5713e is missing
|
2013-09-23 11:36:15 +02:00 |
|
|
Rémi Gaillard
|
50bbf1a547
|
// small fix
|
2013-09-23 10:46:41 +02:00 |
|
|
Rémi Gaillard
|
a578cfb2e2
|
[-] FO: Fix #PSCFV-10461
|
2013-09-23 10:20:22 +02:00 |
|
|
Rémi Gaillard
|
7aa348eb93
|
// bad char
|
2013-09-20 15:48:22 +02:00 |
|
|
Rémi Gaillard
|
2dc91758c3
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-20 14:12:56 +02:00 |
|
|
Rémi Gaillard
|
9b878a33a8
|
// fix canonical and ssl page without ssl
|
2013-09-20 14:12:41 +02:00 |
|
|
Rémi Gaillard
|
e2ac223f4e
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-20 11:34:54 +02:00 |
|
|
Rémi Gaillard
|
5b7580d487
|
[-] MO: Fix time of smarty cache invalidation
|
2013-09-20 11:33:30 +02:00 |
|
|
Rémi Gaillard
|
6b47f5713e
|
// another fix for multishop fields in context all on product page
|
2013-09-19 09:48:46 +02:00 |
|
|
Rémi Gaillard
|
5eb4c93b8c
|
[-] BO: Bad id for multishop checkbox on admin products - weird bug with active flag #PSCFV-9935
|
2013-09-18 19:35:56 +02:00 |
|
|
Rémi Gaillard
|
e7286c44f2
|
// typo
|
2013-09-18 18:08:22 +02:00 |
|
|
Rémi Gaillard
|
70d48d0af1
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-18 17:19:18 +02:00 |
|
|
Rémi Gaillard
|
f6dc81d0f1
|
// small fix for SSL
|
2013-09-18 17:19:03 +02:00 |
|
|
Rémi Gaillard
|
0452979ce7
|
[*] FO: Allow to enable SSL on all the pages
|
2013-09-18 16:30:34 +02:00 |
|
|
Rémi Gaillard
|
66f46eee03
|
// Avoid exception if amount is null on addind an orderpayment
|
2013-09-18 14:29:01 +02:00 |
|
|
Rémi Gaillard
|
47c5f400ee
|
// Add gender on order view
|
2013-09-17 16:30:47 +02:00 |
|
|
Rémi Gaillard
|
e6e8efc19a
|
[-] FO: Fix Product::getAttributesGroups() minimal_quantity/weight/available_date should be multishop
|
2013-09-17 11:58:12 +02:00 |
|
|
Rémi Gaillard
|
6ee6317fee
|
// orderby position
|
2013-09-17 11:07:29 +02:00 |
|
|
Rémi Gaillard
|
5363e75238
|
// small fix
|
2013-09-13 12:13:12 +02:00 |
|
|
Rémi Gaillard
|
30591b7c28
|
// Typo
|
2013-09-12 15:04:47 +02:00 |
|
|
Rémi Gaillard
|
f9b1f0ab5e
|
[*] Core: don't re-generate the class_index.php file if a class is not known to avoid misuse of class_exists()
|
2013-09-12 15:03:23 +02:00 |
|
|
Rémi Gaillard
|
ea1bdbc849
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-12 10:01:39 +02:00 |
|
|
Rémi Gaillard
|
9fa6c86a94
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-11 20:05:13 +02:00 |
|
|
Rémi Gaillard
|
f4f3084c35
|
[-] Core: Set a remote addr with php-cli #PSCFV-10372
|
2013-09-11 16:40:33 +02:00 |
|
|
Rémi Gaillard
|
a4d131eac9
|
[-] WS: Fix entities retrieve for some cases
|
2013-09-11 16:32:11 +02:00 |
|
|
Rémi Gaillard
|
31c94caebc
|
[-] BO: Fix out of stock creation with multishop and stock sharing
|
2013-09-11 16:22:13 +02:00 |
|
|
Rémi Gaillard
|
c42d71b8f5
|
// oups
|
2013-09-11 16:06:23 +02:00 |
|
|
Rémi Gaillard
|
669c3791b5
|
[-] BO: Fix preview url with multishop
|
2013-09-11 15:55:25 +02:00 |
|
|
Rémi Gaillard
|
3e750490fe
|
// chmod class_index 666 instead of 664
|
2013-09-11 15:16:15 +02:00 |
|
|
Rémi Gaillard
|
3c090535a9
|
// small fix for image SSL links
|
2013-09-10 10:39:03 +02:00 |
|
|
Rémi Gaillard
|
021790a3e2
|
[-] FO: Fix SSL links on domain_ssl instead domain
|
2013-09-10 10:15:52 +02:00 |
|
|
Rémi Gaillard
|
242556e176
|
[-] MO: Fix unifunc smarty errors if module is displayed on multiplehook without cache
|
2013-09-09 15:12:26 +02:00 |
|
|
Rémi Gaillard
|
0f81518ba2
|
// Add a buton to erase all log
|
2013-09-05 15:58:36 +02:00 |
|
|
Rémi Gaillard
|
00c1860d22
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-04 15:08:41 +02:00 |
|
|
Rémi Gaillard
|
9348768ceb
|
[-] MO: Fix blocklayered sort by quantity #PSCFV-10300
|
2013-09-04 15:05:55 +02:00 |
|
|
Rémi Gaillard
|
6059b4301a
|
// states list
|
2013-09-02 17:10:20 +02:00 |
|
|
Rémi Gaillard
|
f7fefe789d
|
// typo fix
|
2013-08-30 11:21:00 +02:00 |
|
|
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 |
|
|
Rémi Gaillard
|
eec8aaa4f8
|
// php noti
|
2013-08-29 18:15:51 +02:00 |
|
|
Rémi Gaillard
|
08b8277a7a
|
/////
|
2013-08-29 17:21:27 +02:00 |
|
|
Rémi Gaillard
|
51083e17af
|
//
|
2013-08-29 17:18:05 +02:00 |
|
|
Rémi Gaillard
|
ffdc7b51b7
|
// php 5.2
|
2013-08-29 16:41:15 +02:00 |
|
|
Rémi Gaillard
|
1196c5d736
|
// php 5.2
|
2013-08-29 16:39:45 +02:00 |
|
|
Rémi Gaillard
|
01cbffad9b
|
//miss on last commit
|
2013-08-29 16:11:24 +02:00 |
|
|
Rémi Gaillard
|
c736c28ab5
|
// small ajax.php clean
|
2013-08-29 11:47:11 +02:00 |
|
|
Rémi Gaillard
|
6d1c8c54af
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-08-29 10:49:53 +02:00 |
|
|
Rémi Gaillard
|
fb397d3163
|
Merge pull request #662 from djfm/localization
// updated Czech localization pack
|
2013-08-29 01:43:33 -07:00 |
|
|
Rémi Gaillard
|
ddc16a2f65
|
[-] BO: Fix fatal error on customer edition when email is not valid
|
2013-08-28 17:46:05 +02:00 |
|
|
Rémi Gaillard
|
c72fd867fe
|
// git checkout controllers/
|
2013-08-28 12:24:10 +02:00 |
|
|
Rémi Gaillard
|
63d9005a10
|
// liveedit
|
2013-08-28 12:21:01 +02:00 |
|
|
Rémi Gaillard
|
6a4680b4f0
|
[-] WS: Bad xlink for tax_rules_group in product
|
2013-08-27 18:58:21 +02:00 |
|
|
Rémi Gaillard
|
30a914b148
|
// typo
|
2013-08-27 15:41:00 +02:00 |
|
|
Rémi Gaillard
|
598469e41e
|
// typo debug
|
2013-08-27 15:38:29 +02:00 |
|
|
Rémi Gaillard
|
2620242176
|
// Fix cms_block creation loop on shop addition
|
2013-08-27 09:52:14 +02:00 |
|
|
Rémi Gaillard
|
6fd7f0114e
|
// small fix
|
2013-08-27 09:52:05 +02:00 |
|
|
Rémi Gaillard
|
1a5b9de372
|
// small fix
|
2013-08-27 09:51:56 +02:00 |
|
|
Rémi Gaillard
|
a964162a01
|
// Fix cms_block creation loop on shop addition
|
2013-08-26 18:31:45 +02:00 |
|
|
Rémi Gaillard
|
2435edc98c
|
// small fix
|
2013-08-26 17:17:26 +02:00 |
|
|
Rémi Gaillard
|
1033c61ced
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-08-26 17:13:51 +02:00 |
|
|
Rémi Gaillard
|
1b26cfffd9
|
// small fix
|
2013-08-26 17:13:29 +02:00 |
|
|
Rémi Gaillard
|
b7a03bdffa
|
// sometimes image was not the cover one for blocklayered
|
2013-08-26 10:37:59 +02:00 |
|
|
Rémi Gaillard
|
a23772dfb7
|
// small change in blockstore logo name
|
2013-08-26 10:33:25 +02:00 |
|
|
Rémi Gaillard
|
8ff8ea416d
|
// fix weird bug
|
2013-08-22 17:37:46 +02:00 |
|
|
Rémi Gaillard
|
a21d3fd22e
|
// shipping block was missplaced on order-detail
|
2013-08-22 15:41:34 +02:00 |
|
|
Rémi Gaillard
|
f476b34139
|
[-] BO: Fix multishop association for tax rules group - #PSCFV-9967
|
2013-08-22 11:13:11 +02:00 |
|
|
Rémi Gaillard
|
9d261b8f1f
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-08-22 10:54:07 +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
|
099baaef70
|
// small change on specific price rules after condition deletion
|
2013-08-21 19:14:59 +02:00 |
|
|
Rémi Gaillard
|
3fcf166a9d
|
// small fix
|
2013-08-21 18:24:10 +02:00 |
|
|
Rémi Gaillard
|
dd9aa9fdb5
|
// disable log deletion
|
2013-08-21 17:43:34 +02:00 |
|
|
Rémi Gaillard
|
600b027efd
|
// fix root categories addition
|
2013-08-21 14:37:39 +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 |
|
|
Rémi Gaillard
|
d40d841cf3
|
// something is missing in 3d591be8c6
|
2013-08-14 15:15:41 +02:00 |
|
|
Rémi Gaillard
|
24ac8582bf
|
[*] BO: Warehouse name is now displayed on each product line orders
|
2013-08-14 15:02:30 +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 |
|