dlage
81ca3ac1f9
BO: Modules - show update button even if module is not installed but don't
...
warn for modules with updates available but not installed.
2013-09-24 17:42:43 +01:00
5e7dbea970
//
2013-09-24 17:22:50 +02:00
beb0a74135
// use ObjectModel::validateField on validaterules
2013-09-24 17:12:28 +02:00
3d477c62eb
// remove notice
2013-09-24 16:03:39 +02:00
4c399875d9
Merge pull request #737 from codeurWeb/patch-3
...
[-] BO : fix postProcess override on AdminImportController
2013-09-24 01:54:18 -07:00
92b987c0f8
Merge pull request #736 from codeurWeb/patch-2
...
[-] BO : fix ovverride of constructor when PS_ADVANCED_STOCK_MANAGEMENT is off
2013-09-24 01:40:16 -07:00
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
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
6796b64e18
Merge pull request #691 from djfm/development
...
// fixed translation of modules descriptions containing quotes
2013-09-23 07:51:57 -07:00
c6222c51c8
// commit 6b47f5713e is missing
2013-09-23 11:36:15 +02:00
a1555c3fc8
Merge remote-tracking branch 'origin/development' into development
2013-09-23 11:24:26 +02:00
31697fde3c
[-] MO productcomments: confirmation message takes moderation mode into account
2013-09-23 11:24:14 +02:00
5206496f64
[-] BO : Fix Bug For new Fancy Box events
2013-09-23 11:22:51 +02:00
cf82157d47
// oops
2013-09-23 10:48:56 +02:00
7dbb6088a4
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-23 10:42:30 +02:00
50bbf1a547
// small fix
2013-09-23 10:46:41 +02:00
32a7a28567
[-] MO : FixBug #PNM-1683 - Treeview problem
2013-09-23 10:42:10 +02:00
a578cfb2e2
[-] FO: Fix #PSCFV-10461
2013-09-23 10:20:22 +02:00
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
214b844ef7
// Removed useless tiny mce src
2013-09-20 18:52:42 +02:00
5c3b8015e5
[-] BO : fixed the redirection to a 404 page when loging in in the updater
2013-09-20 18:21:10 +02:00
7aa348eb93
// bad char
2013-09-20 15:48:22 +02:00
e2a1f5101c
[-] BO : Bad input radio names
2013-09-20 15:27:31 +02:00
7d05da1618
[-] IN : Lower by two flush limit in migrate_orders
2013-09-20 15:12:57 +02:00
429c9442a3
[*] CORE : bad else if in getTemplatePath
2013-09-20 15:10:14 +02:00
2dc91758c3
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-20 14:12:56 +02:00
9b878a33a8
// fix canonical and ssl page without ssl
2013-09-20 14:12:41 +02:00
7eb3b22829
[-] Installer : added the missing default tab in the employee
2013-09-20 14:06:38 +02:00
e2ac223f4e
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-20 11:34:54 +02:00
5b7580d487
[-] MO: Fix time of smarty cache invalidation
2013-09-20 11:33:30 +02:00
1cebd5920e
[*] Installer : added file check in order to check if everyhting has been successfuly uploaded
2013-09-20 11:09:22 +02:00
4f639329e9
Merge remote-tracking branch 'origin/development' into development
2013-09-20 10:47:17 +02:00
91ae972655
[-] MO mailalert : products alerts can be registered for multiple guests
...
#PNM-1669
2013-09-20 10:46:56 +02:00
f8ca06d927
// Better cache depth management for smarty
2013-09-20 10:26:58 +02:00
eb6600e840
// Blockcustomerprivacy should not be installed by default
2013-09-20 10:26:58 +02:00
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
42cdc988ac
Send noindex header to avoid ghost carts by bots
2013-09-19 22:15:00 -07:00
8c6aaa3c7d
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-19 17:31:42 +02:00
63f4743134
[-] MO : PNM-1715 - Bug fix accented chars & ajax-cart
2013-09-19 17:31:35 +02:00
e0b59082f9
[-] BO : Issue with domready on adminImport
2013-09-19 17:19:51 +02:00
0361d5db8d
[-] BO : do not reaffect import_type for categories
2013-09-19 16:59:04 +02:00
ea6ea955bb
// licence
2013-09-19 16:39:21 +02:00
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
0c511dead5
[*] FIX #PSCFV-8106 do not regenerate thumbnails if not
2013-09-19 16:28:19 +02:00
6b47f5713e
// another fix for multishop fields in context all on product page
2013-09-19 09:48:46 +02:00
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
0a9f425281
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-18 16:08:44 +00:00
65559c5cf4
// small improvement to Brazilian translations
2013-09-18 16:08:23 +00:00
e7286c44f2
// typo
2013-09-18 18:08:22 +02:00
4e1d6de9b0
[-] FO : Fix bug #PSCFV-10328 Set country currency if defined when geolocated
2013-09-18 17:57:00 +02:00
dlage
Rémi Gaillard