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
Julien
6acebca8fa
[-] BO : fix postProcess override on AdminImportController
...
When we override the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
Default case of switch is never used.
2013-09-23 21:04:55 +02:00
Julien
6850db0612
[-] BO : fix contructor override on AdminImportController
...
When we overload the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
2013-09-23 20:23:45 +02:00
Gregory Roussac
aefab21a62
Merge pull request #735 from djfm/release
...
[*] LO : Use single quote as thousands separator for CHF currency
2013-09-23 09:54:01 -07:00
djfm
d9a24d61ac
// change comment
2013-09-23 16:37:13 +00:00
djfm
6195d0c319
[*] LO : Use single quote as thousands separator for CHF currency
2013-09-23 16:32:40 +00:00
gRoussac
b3a425c73a
[-] MO : Blockcart, wrong tbody
2013-09-23 18:20:35 +02:00
gRoussac
ccb3179c1a
[-] CORE : Partial fix for #PSCFV-10482 getCacheId is different in back office
2013-09-23 18:07:46 +02:00
Gregory Roussac
b4547568a5
Merge pull request #734 from djfm/release
...
// no quotes around 1 in js=1 please
2013-09-23 08:38:57 -07:00
gRoussac
d37f545058
[-] MO : Fix buig #PSCFV-10480 Blockcart too long cart_block_product_name
2013-09-23 17:26:36 +02:00
djfm
5c4de83e91
// no quotes around 1 in js=1 please
2013-09-23 15:20:26 +00:00
Damien Metzger
6796b64e18
Merge pull request #691 from djfm/development
...
// fixed translation of modules descriptions containing quotes
2013-09-23 07:51:57 -07:00
gRoussac
3b075e049b
// bad commit
2013-09-23 16:33:44 +02:00
gRoussac
84dc75f57e
[-] CORE : Fix bug #PSCFV-10471 Cart item count problem, unique_id grouping error for id_product and id_product_attribute
2013-09-23 16:32:38 +02:00
gRoussac
92382e347c
[-] FO : Fix bug #PSCFV-10478 could not see auto added cart rule voucher on product page
2013-09-23 16:08:44 +02:00
gRoussac
dedc59f1db
[-] IN : FIX #PSCFV-10246 errors in stricts sql-mode, thanks @enumag
2013-09-23 15:17:15 +02:00
Rémi Gaillard
c6222c51c8
// commit 6b47f5713e is missing
2013-09-23 11:36:15 +02:00
Fabio Chelly
a1555c3fc8
Merge remote-tracking branch 'origin/development' into development
2013-09-23 11:24:26 +02:00
Fabio Chelly
31697fde3c
[-] MO productcomments: confirmation message takes moderation mode into account
2013-09-23 11:24:14 +02:00
Jerome Nadaud
5206496f64
[-] BO : Fix Bug For new Fancy Box events
2013-09-23 11:22:51 +02:00
Jerome Nadaud
cf82157d47
// oops
2013-09-23 10:48:56 +02:00
Jerome Nadaud
7dbb6088a4
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-23 10:42:30 +02:00
Rémi Gaillard
50bbf1a547
// small fix
2013-09-23 10:46:41 +02:00
Jerome Nadaud
32a7a28567
[-] MO : FixBug #PNM-1683 - Treeview problem
2013-09-23 10:42:10 +02:00
Rémi Gaillard
a578cfb2e2
[-] FO: Fix #PSCFV-10461
2013-09-23 10:20:22 +02:00
gRoussac
39468476ab
[-] CORE : #PSCFV-10461 customer group in getPriceStatic, pull request https://github.com/kpodemski/kp-PrestaShop/commit/361ebc72e09d00463bb7a7b7af670e3235ab6a5a
2013-09-23 09:50:12 +02:00
Damien Metzger
214b844ef7
// Removed useless tiny mce src
2013-09-20 18:52:42 +02:00
Damien Metzger
5c3b8015e5
[-] BO : fixed the redirection to a 404 page when loging in in the updater
2013-09-20 18:21:10 +02:00
Rémi Gaillard
7aa348eb93
// bad char
2013-09-20 15:48:22 +02:00
gRoussac
e2a1f5101c
[-] BO : Bad input radio names
2013-09-20 15:27:31 +02:00
gRoussac
7d05da1618
[-] IN : Lower by two flush limit in migrate_orders
2013-09-20 15:12:57 +02:00
gRoussac
429c9442a3
[*] CORE : bad else if in getTemplatePath
2013-09-20 15:10:14 +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
Damien Metzger
7eb3b22829
[-] Installer : added the missing default tab in the employee
2013-09-20 14:06:38 +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
Damien Metzger
1cebd5920e
[*] Installer : added file check in order to check if everyhting has been successfuly uploaded
2013-09-20 11:09:22 +02:00
Fabio Chelly
4f639329e9
Merge remote-tracking branch 'origin/development' into development
2013-09-20 10:47:17 +02:00
Fabio Chelly
91ae972655
[-] MO mailalert : products alerts can be registered for multiple guests
...
#PNM-1669
2013-09-20 10:46:56 +02:00
Damien Metzger
f8ca06d927
// Better cache depth management for smarty
2013-09-20 10:26:58 +02:00
Damien Metzger
eb6600e840
// Blockcustomerprivacy should not be installed by default
2013-09-20 10:26:58 +02:00
Gregory Roussac
14cd72121a
Merge pull request #732 from Ha99y/20130919_X-Robots
...
[*] CORE : Send noindex header to avoid ghost carts by bots
2013-09-20 00:52:49 -07:00
ha99y
42cdc988ac
Send noindex header to avoid ghost carts by bots
2013-09-19 22:15:00 -07:00
Francois Gaillard
8c6aaa3c7d
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-19 17:31:42 +02:00
Francois Gaillard
63f4743134
[-] MO : PNM-1715 - Bug fix accented chars & ajax-cart
2013-09-19 17:31:35 +02:00
gRoussac
e0b59082f9
[-] BO : Issue with domready on adminImport
2013-09-19 17:19:51 +02:00
gRoussac
0361d5db8d
[-] BO : do not reaffect import_type for categories
2013-09-19 16:59:04 +02:00
gRoussac
ea6ea955bb
// licence
2013-09-19 16:39:21 +02:00
gRoussac
803b6ce8ec
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
...
Conflicts:
controllers/admin/AdminImportController.php
2013-09-19 16:38:01 +02:00
Rémi Gaillard