 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 |
|
|
gRoussac
|
0c511dead5
|
[*] FIX #PSCFV-8106 do not regenerate thumbnails if not
|
2013-09-19 16:28:19 +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 |
|
|
gRoussac
|
4e1d6de9b0
|
[-] FO : Fix bug #PSCFV-10328 Set country currency if defined when geolocated
|
2013-09-18 17:57:00 +02:00 |
|
|
gRoussac
|
75a9629b8a
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-18 17:23:23 +02:00 |
|
|
gRoussac
|
27f14b9a31
|
[-] BO : Fix proces and save buttons for Modules and AdminControllers
|
2013-09-18 17:23:08 +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 |
|
|
gRoussac
|
2e311410b2
|
[*] BO : Set import entity in cookie (#PSCFV-8214)
|
2013-09-18 17:02:00 +02:00 |
|
|
Rémi Gaillard
|
0452979ce7
|
[*] FO: Allow to enable SSL on all the pages
|
2013-09-18 16:30:34 +02:00 |
|
|
gRoussac
|
3aec242600
|
[-] MO : Editorial could not delete image
|
2013-09-18 16:16:36 +02:00 |
|
|
gRoussac
|
93aae26269
|
[-] Bo : Modules 'save' button not active
|
2013-09-18 15:41:30 +02:00 |
|
|
gRoussac
|
f293562ea4
|
[-] BO : Fix bug #PSCFV-8214 import entity pre selected
|
2013-09-18 15:03:16 +02:00 |
|
|
Rémi Gaillard
|
66f46eee03
|
// Avoid exception if amount is null on addind an orderpayment
|
2013-09-18 14:29:01 +02:00 |
|
|
Vincent Augagneur
|
672da852c5
|
[-] BO - fixed bug #PSCFV-10178
|
2013-09-18 11:40:58 +02:00 |
|
|
Vincent Augagneur
|
965b8a1bf3
|
[-] BO - fixed bug #PSCFV-10286 - End range in summary of shipping wizard not correct when range number is a float
|
2013-09-18 11:18:26 +02:00 |
|
|
Rémi Gaillard
|
47c5f400ee
|
// Add gender on order view
|
2013-09-17 16:30:47 +02:00 |
|
|
Vincent Augagneur
|
322654cacf
|
//small fix with mode catalog and cart button
|
2013-09-17 14:54:38 +02:00 |
|