 Rémi Gaillard
|
8be339463d
|
// small fix
|
2013-11-12 12:36:51 +01:00 |
|
|
Rémi Gaillard
|
ef5779f63f
|
// d321b9a5bc
|
2013-11-06 17:11:31 +01:00 |
|
|
Rémi Gaillard
|
50c95f568c
|
Merge pull request #935 from jeckyl/patch-4
Update cart-summary.js
|
2013-11-06 07:01:02 -08:00 |
|
|
Rémi Gaillard
|
d4253b9849
|
// small fix
|
2013-11-05 15:33:21 +01:00 |
|
|
Rémi Gaillard
|
9817ef6840
|
// small fix on profiling
|
2013-11-05 11:54:22 +01:00 |
|
|
Rémi Gaillard
|
f5cc6862cb
|
// don't die on autoload
|
2013-11-04 18:08:24 +01:00 |
|
|
Rémi Gaillard
|
0a65de5e5f
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-11-04 17:22:21 +01:00 |
|
|
Rémi Gaillard
|
f4740088c1
|
// small fix
|
2013-11-04 17:22:08 +01:00 |
|
|
Rémi Gaillard
|
bf8cd29868
|
// validator on message field
|
2013-11-04 14:21:42 +01:00 |
|
|
Rémi Gaillard
|
b3c54a59dd
|
// typo
|
2013-11-04 11:48:30 +01:00 |
|
|
Rémi Gaillard
|
06d73554be
|
// preg instead strpos
|
2013-11-04 11:39:48 +01:00 |
|
|
Rémi Gaillard
|
e000f8c627
|
// something is missing in the last commit
|
2013-11-04 11:00:21 +01:00 |
|
|
Rémi Gaillard
|
6ef7f258ea
|
// small fix
|
2013-11-04 10:34:58 +01:00 |
|
|
Rémi Gaillard
|
d49c4cf62e
|
[-] BO: Fix from name when replying to customer threads
|
2013-11-04 09:38:12 +01:00 |
|
|
Rémi Gaillard
|
1b019dffc5
|
// Fix lang detection on dispatcher
|
2013-10-31 15:28:19 +01:00 |
|
|
Rémi Gaillard
|
9611ea1f70
|
[-] BO: Fix empty group list on changing opt or newsletter on customers listing
|
2013-10-31 11:22:40 +01:00 |
|
|
Rémi Gaillard
|
d17515a728
|
// don't format currency on input
|
2013-10-31 10:22:38 +01:00 |
|
|
Rémi Gaillard
|
a0f4eab4c1
|
// typo
|
2013-10-30 15:40:40 +01:00 |
|
|
Rémi Gaillard
|
f9b1545037
|
// missing file
|
2013-10-30 14:59:08 +01:00 |
|
|
Rémi Gaillard
|
c56e8471c2
|
[-] BO: fix the checkbox of shop activation on modules configuration
|
2013-10-30 14:57:15 +01:00 |
|
|
Rémi Gaillard
|
6d5ca9969e
|
// js error
|
2013-10-29 17:56:29 +01:00 |
|
|
Rémi Gaillard
|
64706075d5
|
// Fix default language on BO forms
|
2013-10-29 15:32:31 +01:00 |
|
|
Rémi Gaillard
|
07222be5dd
|
// demo mode on ajaxfilemanager
|
2013-10-29 10:53:00 +01:00 |
|
|
Rémi Gaillard
|
2b67d7072c
|
// type of logger field
|
2013-10-29 10:18:29 +01:00 |
|
|
Rémi Gaillard
|
edf54eb2ca
|
// re-generate class_index on the first step of install
|
2013-10-28 18:43:02 +01:00 |
|
|
Rémi Gaillard
|
cc3363011e
|
// rewrited urls for feeder module
|
2013-10-24 17:54:44 +02:00 |
|
|
Rémi Gaillard
|
3cd702da42
|
[-] WS: Fix stockavailables list when stock is shared between shops #PSCFV-10793
|
2013-10-24 16:30:02 +02:00 |
|
|
Rémi Gaillard
|
971722a13f
|
// note updated by ajax in admincustomers should be url encoded
|
2013-10-24 11:56:50 +02:00 |
|
|
Rémi Gaillard
|
554ab9414f
|
[-] BO: product listing should call Product::getPriceStatic() with the product default shop in the context when it is not a shop context
|
2013-10-23 15:08:02 +02:00 |
|
|
Rémi Gaillard
|
747ec9a2c4
|
// notice on carrierwizard when step back
|
2013-10-23 14:50:30 +02:00 |
|
|
Rémi Gaillard
|
6cddb57ce3
|
[-] BO: Synchronize stock available after receipt supply order items #PSCFV-10724
|
2013-10-23 10:34:00 +02:00 |
|
|
Rémi Gaillard
|
198e75245d
|
[-] FO: Don't auto detect language if it not associated to the shop #PSCFV-10273
|
2013-10-21 09:41:00 +02:00 |
|
|
Rémi Gaillard
|
8a682081de
|
// typo
|
2013-10-18 12:17:51 +02:00 |
|
|
Rémi Gaillard
|
6747d3bbac
|
[-] BO: Default country should be overriden in the context in multishop
|
2013-10-18 10:23:06 +02:00 |
|
|
Rémi Gaillard
|
b8273a13e6
|
//
|
2013-10-17 18:30:22 +02:00 |
|
|
Rémi Gaillard
|
eb14e25e2a
|
// small fix for some order by on listing
|
2013-10-17 11:33:05 +02:00 |
|
|
Rémi Gaillard
|
e4faa2bb75
|
[-] Core: Out of stock status should be setted after the first order history
|
2013-10-17 10:28:14 +02:00 |
|
|
Rémi Gaillard
|
22fd1b84c4
|
Merge pull request #847 from MustangZhong/patch-1
[-] WS: Missing field on Cart::getWsCartRows()
|
2013-10-16 00:58:16 -07:00 |
|
|
Rémi Gaillard
|
6ee538c710
|
// fix on ps_cleaner
|
2013-10-15 19:53:59 +02:00 |
|
|
Rémi Gaillard
|
837ca34e7e
|
[-] Core: Product::getPriceStatic called with 1 quantity return the specific price for 1 qty if called with id_cart = 0
|
2013-10-15 10:30:48 +02:00 |
|
|
Rémi Gaillard
|
6f4b85430c
|
// Fix listings and sort
|
2013-10-14 18:52:48 +02:00 |
|
|
Rémi Gaillard
|
3bc02bbe10
|
// fields are already correctly formated when they are in a object coming from the database
|
2013-10-14 10:56:38 +02:00 |
|
|
Rémi Gaillard
|
06c62c1684
|
[-] WS: Fix #PSCFV-10672 order by ID for non multishop entities
|
2013-10-11 17:53:15 +02:00 |
|
|
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 |
|